diff --git a/dashboard-ui/bower_components/emby-webcomponents/.bower.json b/dashboard-ui/bower_components/emby-webcomponents/.bower.json
index 4384ce6124..53db44bfea 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/.bower.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/.bower.json
@@ -14,12 +14,12 @@
   },
   "devDependencies": {},
   "ignore": [],
-  "version": "1.4.277",
-  "_release": "1.4.277",
+  "version": "1.4.278",
+  "_release": "1.4.278",
   "_resolution": {
     "type": "version",
-    "tag": "1.4.277",
-    "commit": "721497f3b6225061614ee301e8b38a5eb5f34eb2"
+    "tag": "1.4.278",
+    "commit": "d22da1b6808a6102794830c9c749c8f74ff50647"
   },
   "_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
   "_target": "^1.2.1",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/cardbuilder.js b/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/cardbuilder.js
index a744d2f9ea..dc6b9ff5f1 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/cardbuilder.js
+++ b/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/cardbuilder.js
@@ -784,24 +784,21 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo
                     }
                 }
 
-                if (options.showChannelName) {
-
-                    lines.push(item.ChannelName || '');
-                }
-
                 if (options.showAirTime) {
 
-                    var airTimeText;
+                    var airTimeText = '';
                     if (item.StartDate) {
 
                         try {
                             var date = datetime.parseISO8601Date(item.StartDate);
 
-                            airTimeText = datetime.toLocaleDateString(date, { weekday: 'short', month: 'short', day: 'numeric' });
+                            if (options.showAirDateTime) {
+                                airTimeText += datetime.toLocaleDateString(date, { weekday: 'short', month: 'short', day: 'numeric' }) + ' ';
+                            }
 
-                            airTimeText += ' ' + datetime.getDisplayTime(date);
+                            airTimeText += datetime.getDisplayTime(date);
 
-                            if (item.EndDate) {
+                            if (item.EndDate && options.showAirEndTime) {
                                 date = datetime.parseISO8601Date(item.EndDate);
                                 airTimeText += ' - ' + datetime.getDisplayTime(date);
                             }
@@ -814,38 +811,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo
                     lines.push(airTimeText || '');
                 }
 
-                if (options.showCurrentProgram && item.Type == 'TvChannel') {
-
-                    if (item.CurrentProgram) {
-                        lines.push(item.CurrentProgram.Name);
-                    } else {
-                        lines.push('');
-                    }
-                }
-
-                if (options.showSeriesYear) {
-
-                    if (item.Status == "Continuing") {
-
-                        lines.push(globalize.translate('sharedcomponents#SeriesYearToPresent', item.ProductionYear || ''));
-
-                    } else {
-                        lines.push(item.ProductionYear || '');
-                    }
-
-                }
-
-                if (options.showProgramAirInfo) {
-
-                    var text;
-                    if (item.StartDate) {
-                        var startDate = datetime.parseISO8601Date(item.StartDate, true);
-                        text = datetime.toLocaleDateString(startDate, { weekday: 'short', month: 'short', day: 'numeric' }) + ' ' + datetime.getDisplayTime(startDate);
-                    } else {
-                        text = '';
-                    }
-
-                    lines.push(text || ' ');
+                if (options.showChannelName) {
 
                     if (item.ChannelId) {
 
@@ -875,6 +841,27 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo
                         lines.push(item.ChannelName || ' ');
                     }
                 }
+
+                if (options.showCurrentProgram && item.Type == 'TvChannel') {
+
+                    if (item.CurrentProgram) {
+                        lines.push(item.CurrentProgram.Name);
+                    } else {
+                        lines.push('');
+                    }
+                }
+
+                if (options.showSeriesYear) {
+
+                    if (item.Status == "Continuing") {
+
+                        lines.push(globalize.translate('sharedcomponents#SeriesYearToPresent', item.ProductionYear || ''));
+
+                    } else {
+                        lines.push(item.ProductionYear || '');
+                    }
+
+                }
             }
 
             if ((showTitle || !imgUrl) && forceName && overlayText && lines.length == 1) {
@@ -1048,7 +1035,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo
             if (options.coverImage || imgInfo.coverImage) {
                 cardImageContainerClass += ' coveredImage';
 
-                if (item.MediaType == 'Photo' || item.Type == 'PhotoAlbum' || item.Type == 'Folder' || item.Type == 'Program') {
+                if (item.MediaType == 'Photo' || item.Type == 'PhotoAlbum' || item.Type == 'Folder' || item.ProgramInfo || item.Type == 'Program') {
                     cardImageContainerClass += ' coveredImage-noScale';
                 }
             }
@@ -1422,7 +1409,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo
         }
 
         function onTimerCreated(programId, newTimerId, itemsContainer) {
-            
+
             var cells = itemsContainer.querySelectorAll('.card[data-id="' + programId + '"]');
 
             for (var i = 0, length = cells.length; i < length; i++) {
diff --git a/dashboard-ui/bower_components/emby-webcomponents/emby-radio/emby-radio.css b/dashboard-ui/bower_components/emby-webcomponents/emby-radio/emby-radio.css
index f8023128f9..c10d89acb0 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/emby-radio/emby-radio.css
+++ b/dashboard-ui/bower_components/emby-webcomponents/emby-radio/emby-radio.css
@@ -21,8 +21,9 @@
 .mdl-radio__button {
     line-height: 24px;
     position: absolute;
-    width: 0;
-    height: 0;
+    /* 1px is for focusing purposes, so the focusManager doesn't skip over it */
+    width: 1px;
+    height: 1px;
     margin: 0;
     padding: 0;
     opacity: 0;
@@ -89,6 +90,10 @@
 }
 
 .mdl-radio__button:focus + .mdl-radio__label + .mdl-radio__outer-circle + .mdl-radio__inner-circle {
+    box-shadow: 0 0 0px 10px rgba(255, 255, 255, 0.76);
+}
+
+.mdl-radio__button:checked:focus + .mdl-radio__label + .mdl-radio__outer-circle + .mdl-radio__inner-circle {
     box-shadow: 0 0 0px 10px rgba(82, 181, 75, 0.26);
 }
 
diff --git a/dashboard-ui/bower_components/emby-webcomponents/guide/tvguide.template.html b/dashboard-ui/bower_components/emby-webcomponents/guide/tvguide.template.html
index c886316b25..2021c19227 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/guide/tvguide.template.html
+++ b/dashboard-ui/bower_components/emby-webcomponents/guide/tvguide.template.html
@@ -14,10 +14,11 @@
     <div class="timeslotHeaders smoothScrollX guideScroller" style="scroll-behavior: auto;"></div>
 </div>
 
-<div style="display: flex;">
+<div style="display: flex;flex-grow:1;overflow:hidden;">
 
     <button is="emby-button" type="button" class="btnCategories">
-        <div class="btnCategoriesText">${Categories}</div></button>
+        <div class="btnCategoriesText">${Categories}</div>
+    </button>
     <div class="smoothScrollY guideVerticalScroller programContainer guideScroller" style="flex-grow: 1;">
 
         <div class="channelsContainer">
diff --git a/dashboard-ui/bower_components/emby-webcomponents/recordingcreator/seriesrecordingeditor.js b/dashboard-ui/bower_components/emby-webcomponents/recordingcreator/seriesrecordingeditor.js
index 78801319de..a91d31a8c3 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/recordingcreator/seriesrecordingeditor.js
+++ b/dashboard-ui/bower_components/emby-webcomponents/recordingcreator/seriesrecordingeditor.js
@@ -151,6 +151,50 @@
         context.querySelector('.selectKeepUpTo').innerHTML = html;
     }
 
+    function embed(itemId, serverId, options) {
+
+        recordingUpdated = false;
+        recordingDeleted = false;
+        currentServerId = serverId;
+        loading.show();
+        options = options || {};
+
+        require(['text!./seriesrecordingeditor.template.html'], function (template) {
+
+            var dialogOptions = {
+                removeOnClose: true,
+                scrollY: false
+            };
+
+            if (layoutManager.tv) {
+                dialogOptions.size = 'fullscreen';
+            } else {
+                dialogOptions.size = 'small';
+            }
+
+            var dlg = options.context;
+
+            dlg.classList.add('hide');
+            dlg.innerHTML = globalize.translateDocument(template, 'sharedcomponents');
+
+            dlg.querySelector('.formDialogHeader').classList.add('hide');
+            dlg.querySelector('.formDialogFooter').classList.add('hide');
+            dlg.querySelector('.formDialogContent').className = '';
+            dlg.querySelector('.dialogContentInner').className = '';
+            dlg.classList.remove('hide');
+
+            dlg.addEventListener('change', function () {
+                dlg.querySelector('.btnSubmit').click();
+            });
+
+            currentDialog = dlg;
+
+            init(dlg);
+
+            reload(dlg, itemId);
+        });
+    }
+
     function showEditor(itemId, serverId, options) {
 
         return new Promise(function (resolve, reject) {
@@ -195,7 +239,7 @@
 
                 currentDialog = dlg;
 
-                dlg.addEventListener('close', function () {
+                dlg.addEventListener('closing', function () {
 
                     if (!recordingDeleted) {
                         this.querySelector('.btnSubmit').click();
@@ -228,6 +272,7 @@
     }
 
     return {
-        show: showEditor
+        show: showEditor,
+        embed: embed
     };
 });
\ No newline at end of file
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/ar.json b/dashboard-ui/bower_components/emby-webcomponents/strings/ar.json
index 651aff77cd..2e449cd810 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/ar.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/ar.json
@@ -1,4 +1,8 @@
 {
+    "SortChannelsBy": "Sort channels by:",
+    "ChannelNumber": "Channel number",
+    "RecentlyWatched": "Recently watched",
+    "PlaceFavoriteChannelsAtBeginning": "Place favorite channels at the beginning",
     "ValueSpecialEpisodeName": "Special - {0}",
     "Share": "Share",
     "Add": "Add",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/bg-BG.json b/dashboard-ui/bower_components/emby-webcomponents/strings/bg-BG.json
index 39aa56f425..04f6e335f5 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/bg-BG.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/bg-BG.json
@@ -1,4 +1,8 @@
 {
+    "SortChannelsBy": "Sort channels by:",
+    "ChannelNumber": "Channel number",
+    "RecentlyWatched": "Recently watched",
+    "PlaceFavoriteChannelsAtBeginning": "Place favorite channels at the beginning",
     "ValueSpecialEpisodeName": "Special - {0}",
     "Share": "Share",
     "Add": "\u0414\u043e\u0431\u0430\u0432\u0438",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/ca.json b/dashboard-ui/bower_components/emby-webcomponents/strings/ca.json
index 8cee94e2dd..1abed1e1f1 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/ca.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/ca.json
@@ -1,4 +1,8 @@
 {
+    "SortChannelsBy": "Sort channels by:",
+    "ChannelNumber": "Channel number",
+    "RecentlyWatched": "Recently watched",
+    "PlaceFavoriteChannelsAtBeginning": "Place favorite channels at the beginning",
     "ValueSpecialEpisodeName": "Special - {0}",
     "Share": "Share",
     "Add": "Afegeix",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/cs.json b/dashboard-ui/bower_components/emby-webcomponents/strings/cs.json
index 0e101c12dc..3ac84790df 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/cs.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/cs.json
@@ -1,4 +1,8 @@
 {
+    "SortChannelsBy": "Sort channels by:",
+    "ChannelNumber": "Channel number",
+    "RecentlyWatched": "Recently watched",
+    "PlaceFavoriteChannelsAtBeginning": "Place favorite channels at the beginning",
     "ValueSpecialEpisodeName": "Special - {0}",
     "Share": "Share",
     "Add": "P\u0159idat",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/da.json b/dashboard-ui/bower_components/emby-webcomponents/strings/da.json
index c8042e5448..4df28676c9 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/da.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/da.json
@@ -1,4 +1,8 @@
 {
+    "SortChannelsBy": "Sort channels by:",
+    "ChannelNumber": "Channel number",
+    "RecentlyWatched": "Recently watched",
+    "PlaceFavoriteChannelsAtBeginning": "Place favorite channels at the beginning",
     "ValueSpecialEpisodeName": "Special - {0}",
     "Share": "Del",
     "Add": "Tilf\u00f8j",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/de.json b/dashboard-ui/bower_components/emby-webcomponents/strings/de.json
index 56cafd504b..a6a4bad058 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/de.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/de.json
@@ -1,4 +1,8 @@
 {
+    "SortChannelsBy": "Sort channels by:",
+    "ChannelNumber": "Channel number",
+    "RecentlyWatched": "Recently watched",
+    "PlaceFavoriteChannelsAtBeginning": "Place favorite channels at the beginning",
     "ValueSpecialEpisodeName": "Special - {0}",
     "Share": "Teilen",
     "Add": "Hinzuf\u00fcgen",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/el.json b/dashboard-ui/bower_components/emby-webcomponents/strings/el.json
index 31901cc056..80836dd5c0 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/el.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/el.json
@@ -1,4 +1,8 @@
 {
+    "SortChannelsBy": "Sort channels by:",
+    "ChannelNumber": "Channel number",
+    "RecentlyWatched": "Recently watched",
+    "PlaceFavoriteChannelsAtBeginning": "Place favorite channels at the beginning",
     "ValueSpecialEpisodeName": "Special - {0}",
     "Share": "Share",
     "Add": "\u03a0\u03c1\u03cc\u03c3\u03b8\u03b5\u03c3\u03b5",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/en-GB.json b/dashboard-ui/bower_components/emby-webcomponents/strings/en-GB.json
index a253f0be99..b1b8c72a47 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/en-GB.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/en-GB.json
@@ -1,4 +1,8 @@
 {
+    "SortChannelsBy": "Sort channels by:",
+    "ChannelNumber": "Channel number",
+    "RecentlyWatched": "Recently watched",
+    "PlaceFavoriteChannelsAtBeginning": "Place favorite channels at the beginning",
     "ValueSpecialEpisodeName": "Special - {0}",
     "Share": "Share",
     "Add": "Add",
@@ -313,5 +317,5 @@
     "News": "News",
     "Movies": "Movies",
     "Kids": "Kids",
-    "EnableColorCodedBackgrounds": "Enable color coded backgrounds"
+    "EnableColorCodedBackgrounds": "Enable colour-coded backgrounds"
 }
\ No newline at end of file
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/es-AR.json b/dashboard-ui/bower_components/emby-webcomponents/strings/es-AR.json
index 2acd4f4431..ec410ac4ed 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/es-AR.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/es-AR.json
@@ -1,4 +1,8 @@
 {
+    "SortChannelsBy": "Sort channels by:",
+    "ChannelNumber": "Channel number",
+    "RecentlyWatched": "Recently watched",
+    "PlaceFavoriteChannelsAtBeginning": "Place favorite channels at the beginning",
     "ValueSpecialEpisodeName": "Special - {0}",
     "Share": "Share",
     "Add": "Add",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/es-MX.json b/dashboard-ui/bower_components/emby-webcomponents/strings/es-MX.json
index 444b2bc4af..2b75b56d19 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/es-MX.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/es-MX.json
@@ -1,4 +1,8 @@
 {
+    "SortChannelsBy": "Sort channels by:",
+    "ChannelNumber": "Channel number",
+    "RecentlyWatched": "Recently watched",
+    "PlaceFavoriteChannelsAtBeginning": "Place favorite channels at the beginning",
     "ValueSpecialEpisodeName": "Especial - {0}",
     "Share": "Compartir",
     "Add": "Agregar",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/es.json b/dashboard-ui/bower_components/emby-webcomponents/strings/es.json
index 482b56f282..91207aa67e 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/es.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/es.json
@@ -1,4 +1,8 @@
 {
+    "SortChannelsBy": "Sort channels by:",
+    "ChannelNumber": "Channel number",
+    "RecentlyWatched": "Recently watched",
+    "PlaceFavoriteChannelsAtBeginning": "Place favorite channels at the beginning",
     "ValueSpecialEpisodeName": "Special - {0}",
     "Share": "Compartir",
     "Add": "A\u00f1adir",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/fi.json b/dashboard-ui/bower_components/emby-webcomponents/strings/fi.json
index c927f1e30d..45185e0ef2 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/fi.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/fi.json
@@ -1,4 +1,8 @@
 {
+    "SortChannelsBy": "Sort channels by:",
+    "ChannelNumber": "Channel number",
+    "RecentlyWatched": "Recently watched",
+    "PlaceFavoriteChannelsAtBeginning": "Place favorite channels at the beginning",
     "ValueSpecialEpisodeName": "Special - {0}",
     "Share": "Share",
     "Add": "Add",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/fr-CA.json b/dashboard-ui/bower_components/emby-webcomponents/strings/fr-CA.json
index 7bff72e3bf..d600a39bad 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/fr-CA.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/fr-CA.json
@@ -1,4 +1,8 @@
 {
+    "SortChannelsBy": "Sort channels by:",
+    "ChannelNumber": "Channel number",
+    "RecentlyWatched": "Recently watched",
+    "PlaceFavoriteChannelsAtBeginning": "Place favorite channels at the beginning",
     "ValueSpecialEpisodeName": "Special - {0}",
     "Share": "Share",
     "Add": "Add",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/fr.json b/dashboard-ui/bower_components/emby-webcomponents/strings/fr.json
index b2275f0f81..7724a6a25c 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/fr.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/fr.json
@@ -1,4 +1,8 @@
 {
+    "SortChannelsBy": "Sort channels by:",
+    "ChannelNumber": "Channel number",
+    "RecentlyWatched": "Recently watched",
+    "PlaceFavoriteChannelsAtBeginning": "Place favorite channels at the beginning",
     "ValueSpecialEpisodeName": "Sp\u00e9cial - {0}",
     "Share": "Partager",
     "Add": "Ajouter",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/gsw.json b/dashboard-ui/bower_components/emby-webcomponents/strings/gsw.json
index 7b8ee11cb4..9aec96a0f5 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/gsw.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/gsw.json
@@ -1,4 +1,8 @@
 {
+    "SortChannelsBy": "Sort channels by:",
+    "ChannelNumber": "Channel number",
+    "RecentlyWatched": "Recently watched",
+    "PlaceFavoriteChannelsAtBeginning": "Place favorite channels at the beginning",
     "ValueSpecialEpisodeName": "Special - {0}",
     "Share": "Share",
     "Add": "Add",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/he.json b/dashboard-ui/bower_components/emby-webcomponents/strings/he.json
index 345105b7eb..37dd83e248 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/he.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/he.json
@@ -1,4 +1,8 @@
 {
+    "SortChannelsBy": "Sort channels by:",
+    "ChannelNumber": "Channel number",
+    "RecentlyWatched": "Recently watched",
+    "PlaceFavoriteChannelsAtBeginning": "Place favorite channels at the beginning",
     "ValueSpecialEpisodeName": "Special - {0}",
     "Share": "Share",
     "Add": "\u05d4\u05d5\u05e1\u05e3",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/hr.json b/dashboard-ui/bower_components/emby-webcomponents/strings/hr.json
index 15e42c4ba9..48a7a2359b 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/hr.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/hr.json
@@ -1,4 +1,8 @@
 {
+    "SortChannelsBy": "Sort channels by:",
+    "ChannelNumber": "Channel number",
+    "RecentlyWatched": "Recently watched",
+    "PlaceFavoriteChannelsAtBeginning": "Place favorite channels at the beginning",
     "ValueSpecialEpisodeName": "Specijal - {0}",
     "Share": "Dijeli",
     "Add": "Dodaj",
@@ -308,10 +312,10 @@
     "LabelKeep:": "Zadr\u017ei:",
     "UntilIDelete": "Dok ne izbri\u0161em",
     "UntilSpaceNeeded": "Dok ne treba prostora",
-    "Categories": "Categories",
-    "Sports": "Sports",
-    "News": "News",
-    "Movies": "Movies",
-    "Kids": "Kids",
-    "EnableColorCodedBackgrounds": "Enable color coded backgrounds"
+    "Categories": "Kategorije",
+    "Sports": "Sportovi",
+    "News": "Vijesti",
+    "Movies": "Filmovi",
+    "Kids": "Djeca",
+    "EnableColorCodedBackgrounds": "Omogu\u0107i kodirane boje pozadine"
 }
\ No newline at end of file
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/hu.json b/dashboard-ui/bower_components/emby-webcomponents/strings/hu.json
index 8ecc014fd2..a9e6029f4f 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/hu.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/hu.json
@@ -1,4 +1,8 @@
 {
+    "SortChannelsBy": "Sort channels by:",
+    "ChannelNumber": "Channel number",
+    "RecentlyWatched": "Recently watched",
+    "PlaceFavoriteChannelsAtBeginning": "Place favorite channels at the beginning",
     "ValueSpecialEpisodeName": "Special - {0}",
     "Share": "Megoszt\u00e1s",
     "Add": "Hozz\u00e1ad",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/id.json b/dashboard-ui/bower_components/emby-webcomponents/strings/id.json
index a215b3522d..c7f4c81a9f 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/id.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/id.json
@@ -1,4 +1,8 @@
 {
+    "SortChannelsBy": "Sort channels by:",
+    "ChannelNumber": "Channel number",
+    "RecentlyWatched": "Recently watched",
+    "PlaceFavoriteChannelsAtBeginning": "Place favorite channels at the beginning",
     "ValueSpecialEpisodeName": "Special - {0}",
     "Share": "Share",
     "Add": "Add",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/it.json b/dashboard-ui/bower_components/emby-webcomponents/strings/it.json
index 238dbea8fc..4b4d0ece81 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/it.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/it.json
@@ -1,4 +1,8 @@
 {
+    "SortChannelsBy": "Sort channels by:",
+    "ChannelNumber": "Channel number",
+    "RecentlyWatched": "Recently watched",
+    "PlaceFavoriteChannelsAtBeginning": "Place favorite channels at the beginning",
     "ValueSpecialEpisodeName": "Special - {0}",
     "Share": "Share",
     "Add": "Aggiungi",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/kk.json b/dashboard-ui/bower_components/emby-webcomponents/strings/kk.json
index 95c9ae07ee..01520ef296 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/kk.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/kk.json
@@ -1,4 +1,8 @@
 {
+    "SortChannelsBy": "Sort channels by:",
+    "ChannelNumber": "Channel number",
+    "RecentlyWatched": "Recently watched",
+    "PlaceFavoriteChannelsAtBeginning": "Place favorite channels at the beginning",
     "ValueSpecialEpisodeName": "\u0410\u0440\u043d\u0430\u0439\u044b - {0}",
     "Share": "\u041e\u0440\u0442\u0430\u049b\u0442\u0430\u0441\u0443",
     "Add": "\u04ae\u0441\u0442\u0435\u0443",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/ko.json b/dashboard-ui/bower_components/emby-webcomponents/strings/ko.json
index 4e7f3b29b4..7eed55f08d 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/ko.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/ko.json
@@ -1,4 +1,8 @@
 {
+    "SortChannelsBy": "Sort channels by:",
+    "ChannelNumber": "Channel number",
+    "RecentlyWatched": "Recently watched",
+    "PlaceFavoriteChannelsAtBeginning": "Place favorite channels at the beginning",
     "ValueSpecialEpisodeName": "Special - {0}",
     "Share": "Share",
     "Add": "\ucd94\uac00",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/ms.json b/dashboard-ui/bower_components/emby-webcomponents/strings/ms.json
index 7bff72e3bf..d600a39bad 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/ms.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/ms.json
@@ -1,4 +1,8 @@
 {
+    "SortChannelsBy": "Sort channels by:",
+    "ChannelNumber": "Channel number",
+    "RecentlyWatched": "Recently watched",
+    "PlaceFavoriteChannelsAtBeginning": "Place favorite channels at the beginning",
     "ValueSpecialEpisodeName": "Special - {0}",
     "Share": "Share",
     "Add": "Add",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/nb.json b/dashboard-ui/bower_components/emby-webcomponents/strings/nb.json
index 3ce7729808..b6f868686a 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/nb.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/nb.json
@@ -1,4 +1,8 @@
 {
+    "SortChannelsBy": "Sort channels by:",
+    "ChannelNumber": "Channel number",
+    "RecentlyWatched": "Recently watched",
+    "PlaceFavoriteChannelsAtBeginning": "Place favorite channels at the beginning",
     "ValueSpecialEpisodeName": "Spesial - {0}",
     "Share": "Del",
     "Add": "Legg til",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/nl.json b/dashboard-ui/bower_components/emby-webcomponents/strings/nl.json
index 6ea529ca7c..9ce2b6f206 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/nl.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/nl.json
@@ -1,4 +1,8 @@
 {
+    "SortChannelsBy": "Sort channels by:",
+    "ChannelNumber": "Channel number",
+    "RecentlyWatched": "Recently watched",
+    "PlaceFavoriteChannelsAtBeginning": "Place favorite channels at the beginning",
     "ValueSpecialEpisodeName": "Speciaal - {0}",
     "Share": "Delen",
     "Add": "Toevoegen",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/pl.json b/dashboard-ui/bower_components/emby-webcomponents/strings/pl.json
index d7e39bcccb..c673a3409e 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/pl.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/pl.json
@@ -1,4 +1,8 @@
 {
+    "SortChannelsBy": "Sort channels by:",
+    "ChannelNumber": "Channel number",
+    "RecentlyWatched": "Recently watched",
+    "PlaceFavoriteChannelsAtBeginning": "Place favorite channels at the beginning",
     "ValueSpecialEpisodeName": "Special - {0}",
     "Share": "Share",
     "Add": "Dodaj",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/pt-BR.json b/dashboard-ui/bower_components/emby-webcomponents/strings/pt-BR.json
index bb73c5a4af..1388aaa319 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/pt-BR.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/pt-BR.json
@@ -1,4 +1,8 @@
 {
+    "SortChannelsBy": "Sort channels by:",
+    "ChannelNumber": "Channel number",
+    "RecentlyWatched": "Recently watched",
+    "PlaceFavoriteChannelsAtBeginning": "Place favorite channels at the beginning",
     "ValueSpecialEpisodeName": "Especial - {0}",
     "Share": "Compartilhar",
     "Add": "Adicionar",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/pt-PT.json b/dashboard-ui/bower_components/emby-webcomponents/strings/pt-PT.json
index 6bc71227c4..437a738859 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/pt-PT.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/pt-PT.json
@@ -1,4 +1,8 @@
 {
+    "SortChannelsBy": "Sort channels by:",
+    "ChannelNumber": "Channel number",
+    "RecentlyWatched": "Recently watched",
+    "PlaceFavoriteChannelsAtBeginning": "Place favorite channels at the beginning",
     "ValueSpecialEpisodeName": "Especial -  {0}",
     "Share": "Partilhar",
     "Add": "Adicionar",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/ro.json b/dashboard-ui/bower_components/emby-webcomponents/strings/ro.json
index 4fcbf8bcaf..f6212a5d17 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/ro.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/ro.json
@@ -1,4 +1,8 @@
 {
+    "SortChannelsBy": "Sort channels by:",
+    "ChannelNumber": "Channel number",
+    "RecentlyWatched": "Recently watched",
+    "PlaceFavoriteChannelsAtBeginning": "Place favorite channels at the beginning",
     "ValueSpecialEpisodeName": "Special - {0}",
     "Share": "Share",
     "Add": "Add",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/ru.json b/dashboard-ui/bower_components/emby-webcomponents/strings/ru.json
index 6db16b0be8..fdb4a46029 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/ru.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/ru.json
@@ -1,4 +1,8 @@
 {
+    "SortChannelsBy": "Sort channels by:",
+    "ChannelNumber": "Channel number",
+    "RecentlyWatched": "Recently watched",
+    "PlaceFavoriteChannelsAtBeginning": "Place favorite channels at the beginning",
     "ValueSpecialEpisodeName": "\u0421\u043f\u0435\u0446\u044d\u043f\u0438\u0437\u043e\u0434 - {0}",
     "Share": "\u041f\u043e\u0434\u0435\u043b\u0438\u0442\u044c\u0441\u044f",
     "Add": "\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/sk.json b/dashboard-ui/bower_components/emby-webcomponents/strings/sk.json
index 7bff72e3bf..d600a39bad 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/sk.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/sk.json
@@ -1,4 +1,8 @@
 {
+    "SortChannelsBy": "Sort channels by:",
+    "ChannelNumber": "Channel number",
+    "RecentlyWatched": "Recently watched",
+    "PlaceFavoriteChannelsAtBeginning": "Place favorite channels at the beginning",
     "ValueSpecialEpisodeName": "Special - {0}",
     "Share": "Share",
     "Add": "Add",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/sl-SI.json b/dashboard-ui/bower_components/emby-webcomponents/strings/sl-SI.json
index 918f7b7c0c..ee88a8d24f 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/sl-SI.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/sl-SI.json
@@ -1,4 +1,8 @@
 {
+    "SortChannelsBy": "Sort channels by:",
+    "ChannelNumber": "Channel number",
+    "RecentlyWatched": "Recently watched",
+    "PlaceFavoriteChannelsAtBeginning": "Place favorite channels at the beginning",
     "ValueSpecialEpisodeName": "Special - {0}",
     "Share": "Share",
     "Add": "Add",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/sv.json b/dashboard-ui/bower_components/emby-webcomponents/strings/sv.json
index c857036ed9..48ddaee04b 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/sv.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/sv.json
@@ -1,4 +1,8 @@
 {
+    "SortChannelsBy": "Sort channels by:",
+    "ChannelNumber": "Channel number",
+    "RecentlyWatched": "Recently watched",
+    "PlaceFavoriteChannelsAtBeginning": "Place favorite channels at the beginning",
     "ValueSpecialEpisodeName": "Specialavsnitt - {0}",
     "Share": "Dela",
     "Add": "L\u00e4gg till",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/tr.json b/dashboard-ui/bower_components/emby-webcomponents/strings/tr.json
index 2a507f7def..0ecd1f5b8d 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/tr.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/tr.json
@@ -1,4 +1,8 @@
 {
+    "SortChannelsBy": "Sort channels by:",
+    "ChannelNumber": "Channel number",
+    "RecentlyWatched": "Recently watched",
+    "PlaceFavoriteChannelsAtBeginning": "Place favorite channels at the beginning",
     "ValueSpecialEpisodeName": "Special - {0}",
     "Share": "Share",
     "Add": "Ekle",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/uk.json b/dashboard-ui/bower_components/emby-webcomponents/strings/uk.json
index 72cb395b44..8c0a1a417d 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/uk.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/uk.json
@@ -1,4 +1,8 @@
 {
+    "SortChannelsBy": "Sort channels by:",
+    "ChannelNumber": "Channel number",
+    "RecentlyWatched": "Recently watched",
+    "PlaceFavoriteChannelsAtBeginning": "Place favorite channels at the beginning",
     "ValueSpecialEpisodeName": "Special - {0}",
     "Share": "Share",
     "Add": "Add",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/vi.json b/dashboard-ui/bower_components/emby-webcomponents/strings/vi.json
index 18ef9ecf44..bf07a4dd32 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/vi.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/vi.json
@@ -1,4 +1,8 @@
 {
+    "SortChannelsBy": "Sort channels by:",
+    "ChannelNumber": "Channel number",
+    "RecentlyWatched": "Recently watched",
+    "PlaceFavoriteChannelsAtBeginning": "Place favorite channels at the beginning",
     "ValueSpecialEpisodeName": "Special - {0}",
     "Share": "Share",
     "Add": "Th\u00eam",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/zh-CN.json b/dashboard-ui/bower_components/emby-webcomponents/strings/zh-CN.json
index 9b2987d352..9e37cc4aa5 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/zh-CN.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/zh-CN.json
@@ -1,4 +1,8 @@
 {
+    "SortChannelsBy": "Sort channels by:",
+    "ChannelNumber": "Channel number",
+    "RecentlyWatched": "Recently watched",
+    "PlaceFavoriteChannelsAtBeginning": "Place favorite channels at the beginning",
     "ValueSpecialEpisodeName": "Special - {0}",
     "Share": "Share",
     "Add": "\u6dfb\u52a0",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/zh-HK.json b/dashboard-ui/bower_components/emby-webcomponents/strings/zh-HK.json
index a8dcc80727..1bc516da22 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/zh-HK.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/zh-HK.json
@@ -1,4 +1,8 @@
 {
+    "SortChannelsBy": "Sort channels by:",
+    "ChannelNumber": "Channel number",
+    "RecentlyWatched": "Recently watched",
+    "PlaceFavoriteChannelsAtBeginning": "Place favorite channels at the beginning",
     "ValueSpecialEpisodeName": "Special - {0}",
     "Share": "Share",
     "Add": "\u65b0\u589e",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/zh-TW.json b/dashboard-ui/bower_components/emby-webcomponents/strings/zh-TW.json
index dd8a1dd627..1d73e14620 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/strings/zh-TW.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/strings/zh-TW.json
@@ -1,4 +1,8 @@
 {
+    "SortChannelsBy": "Sort channels by:",
+    "ChannelNumber": "Channel number",
+    "RecentlyWatched": "Recently watched",
+    "PlaceFavoriteChannelsAtBeginning": "Place favorite channels at the beginning",
     "ValueSpecialEpisodeName": "Special - {0}",
     "Share": "\u5206\u4eab",
     "Add": "\u6dfb\u52a0",
diff --git a/dashboard-ui/livetvseriestimer.html b/dashboard-ui/livetvseriestimer.html
index eff000058b..3bf58d862d 100644
--- a/dashboard-ui/livetvseriestimer.html
+++ b/dashboard-ui/livetvseriestimer.html
@@ -1,79 +1,24 @@
 <div id="liveTvSeriesTimerPage" data-role="page" class="page libraryPage liveTvPage noSecondaryNavPage" data-title="${HeaderLiveTv}" data-menubutton="false">
 
+    <style>
+        @media all and (min-width: 800px) {
+
+            .seriesTimerSchedule .backdropCard {
+                width: 33.333333333333333333333333333333%;
+            }
+        }
+    </style>
     <div data-role="content">
 
-        <div style="margin:auto; max-width: 900px;">
+        <div style="margin:auto; max-width: 700px;">
             <div>
                 <h1 class="itemName"></h1>
             </div>
-            <form class="liveTvSeriesTimerForm" style="max-width: initial;">
-                <div>
-                    <h1>${HeaderDays}</h1>
-                </div>
-                <div class="checkboxList">
-                    <label>
-                        <input type="checkbox" is="emby-checkbox" id="chkSunday" />
-                        <span>${OptionSunday}</span>
-                    </label>
-                    <label>
-                        <input type="checkbox" is="emby-checkbox" id="chkMonday" />
-                        <span>${OptionMonday}</span>
-                    </label>
-                    <label>
-                        <input type="checkbox" is="emby-checkbox" id="chkTuesday" />
-                        <span>${OptionTuesday}</span>
-                    </label>
-                    <label>
-                        <input type="checkbox" is="emby-checkbox" id="chkWednesday" />
-                        <span>${OptionWednesday}</span>
-                    </label>
-                    <label>
-                        <input type="checkbox" is="emby-checkbox" id="chkThursday" />
-                        <span>${OptionThursday}</span>
-                    </label>
-                    <label>
-                        <input type="checkbox" is="emby-checkbox" id="chkFriday" />
-                        <span>${OptionFriday}</span>
-                    </label>
-                    <label>
-                        <input type="checkbox" is="emby-checkbox" id="chkSaturday" />
-                        <span>${OptionSaturday}</span>
-                    </label>
-                </div>
-                <div>
-                    <h1>${HeaderRepeatingOptions}</h1>
-                </div>
-                <div class="checkboxList">
-                    <label>
-                        <input type="checkbox" is="emby-checkbox" id="chkNewOnly" />
-                        <span>${OptionRecordOnlyNewEpisodes}</span>
-                    </label>
-                    <label>
-                        <input type="checkbox" is="emby-checkbox" id="chkAnyTime" />
-                        <span>${OptionRecordAnytime}</span>
-                    </label>
-                    <label>
-                        <input type="checkbox" is="emby-checkbox" id="chkAllChannels" />
-                        <span>${OptionRecordOnAllChannels}</span>
-                    </label>
-                </div>
-                <h1>
-                    ${HeaderAdvanced}
-                </h1>
-                <div class="inputContainer">
-                    <input is="emby-input" type="number" id="txtPrePaddingMinutes" pattern="[0-9]*" required="required" min="0" step="1" label="${LabelPrePaddingMinutes}" />
-                </div>
-                <div class="inputContainer">
-                    <input is="emby-input" id="txtPostPaddingMinutes" type="number" pattern="[0-9]*" required="required" min="0" step="1" label="${LabelPostPaddingMinutes}" />
-                </div>
 
-                <div class="hide">
-                    <button is="emby-button" type="submit" class="raised submit block btnSubmit"><span>${ButtonSave}</span></button>
+            <div class="recordingEditor">
 
-                    <button is="emby-button" type="button" class="raised cancel block btnCancel" onclick="history.back();"><span>${ButtonCancel}</span></button>
-                </div>
-            </form>
-            <div class="scheduleTab"></div>
+            </div>
+            <div class="scheduleTab seriesTimerSchedule"></div>
         </div>
     </div>
 
diff --git a/dashboard-ui/scripts/itembynamedetailpage.js b/dashboard-ui/scripts/itembynamedetailpage.js
index cc0159f19c..8da3d3aa72 100644
--- a/dashboard-ui/scripts/itembynamedetailpage.js
+++ b/dashboard-ui/scripts/itembynamedetailpage.js
@@ -128,7 +128,9 @@
                     overlayMoreButton: true,
                     preferThumb: true,
                     overlayText: false,
-                    showProgramAirInfo: true
+                    showAirTime: true,
+                    showAirDateTime: true,
+                    showChannelName: true
                 });
                 break;
 
diff --git a/dashboard-ui/scripts/livetvcomponents.js b/dashboard-ui/scripts/livetvcomponents.js
index ce5995067c..732019661b 100644
--- a/dashboard-ui/scripts/livetvcomponents.js
+++ b/dashboard-ui/scripts/livetvcomponents.js
@@ -4,8 +4,8 @@
         return browserInfo.mobile && AppInfo.enableAppLayouts;
     }
 
-    function getSquareShape() {
-        return enableScrollX() ? 'overflowSquare' : 'square';
+    function getBackdropShape() {
+        return enableScrollX() ? 'overflowBackdrop' : 'backdrop';
     }
 
     function getTimersHtml(timers, options) {
@@ -83,14 +83,17 @@
 
             html += cardBuilder.getCardsHtml({
                 items: group.items,
-                shape: getSquareShape(),
+                shape: getBackdropShape(),
                 showTitle: true,
                 showAirTime: true,
+                showAirEndTime: true,
                 showChannelName: true,
                 lazy: true,
                 cardLayout: true,
                 action: 'edit',
-                cardFooterAside: 'none'
+                cardFooterAside: 'none',
+                preferThumb: true,
+                coverImage: true
 
             });
             html += '</div>';
diff --git a/dashboard-ui/scripts/livetvitems.js b/dashboard-ui/scripts/livetvitems.js
index e6c2e8b773..9de4f7b10d 100644
--- a/dashboard-ui/scripts/livetvitems.js
+++ b/dashboard-ui/scripts/livetvitems.js
@@ -67,7 +67,9 @@
                     overlayText: false,
                     showTitle: true,
                     showParentTitle: query.IsSeries !== false && !query.IsMovie,
-                    showProgramAirInfo: params.type != 'Recordings' && params.type != 'RecordingSeries',
+                    showAirTime: params.type != 'Recordings' && params.type != 'RecordingSeries',
+                    showAirDateTime: params.type != 'Recordings' && params.type != 'RecordingSeries',
+                    showChannelName: params.type != 'Recordings' && params.type != 'RecordingSeries',
                     overlayMoreButton: true,
                     showYear: query.IsMovie && params.type == 'Recordings',
                     coverImage: true
diff --git a/dashboard-ui/scripts/livetvseriestimer.js b/dashboard-ui/scripts/livetvseriestimer.js
index 8b8dcd9df1..ab29c4a0ca 100644
--- a/dashboard-ui/scripts/livetvseriestimer.js
+++ b/dashboard-ui/scripts/livetvseriestimer.js
@@ -1,45 +1,4 @@
-define(['datetime', 'dom', 'emby-itemscontainer'], function (datetime, dom) {
-
-    function getDaysOfWeek() {
-
-        // Do not localize. These are used as values, not text.
-        return LiveTvHelpers.getDaysOfWeek().map(function (d) {
-            return d.value;
-        });
-
-    }
-
-    function selectDays(page, days) {
-
-        var daysOfWeek = getDaysOfWeek();
-
-        for (var i = 0, length = daysOfWeek.length; i < length; i++) {
-
-            var day = daysOfWeek[i];
-
-            page.querySelector('#chk' + day).checked = days.indexOf(day) != -1;
-
-        }
-
-    }
-
-    function getDays(page) {
-
-        var daysOfWeek = getDaysOfWeek();
-
-        var days = [];
-
-        for (var i = 0, length = daysOfWeek.length; i < length; i++) {
-
-            var day = daysOfWeek[i];
-
-            if (page.querySelector('#chk' + day).checked) {
-                days.push(day);
-            }
-        }
-
-        return days;
-    }
+define(['datetime', 'dom', 'seriesRecordingEditor', 'emby-itemscontainer'], function (datetime, dom, seriesRecordingEditor) {
 
     return function (view, params) {
 
@@ -47,43 +6,9 @@
 
             page.querySelector('.itemName').innerHTML = item.Name;
 
-            page.querySelector('#txtPrePaddingMinutes').value = item.PrePaddingSeconds / 60;
-            page.querySelector('#txtPostPaddingMinutes').value = item.PostPaddingSeconds / 60;
-
-            page.querySelector('#chkNewOnly').checked = item.RecordNewOnly;
-            page.querySelector('#chkAllChannels').checked = item.RecordAnyChannel;
-            page.querySelector('#chkAnyTime').checked = item.RecordAnyTime;
-
-            selectDays(page, item.Days);
-
             Dashboard.hideLoadingMsg();
         }
 
-        function onSubmit(e) {
-
-            var form = this;
-
-            var id = params.id;
-
-            ApiClient.getLiveTvSeriesTimer(id).then(function (item) {
-
-                item.PrePaddingSeconds = form.querySelector('#txtPrePaddingMinutes').value * 60;
-                item.PostPaddingSeconds = form.querySelector('#txtPostPaddingMinutes').value * 60;
-
-                item.RecordNewOnly = form.querySelector('#chkNewOnly').checked;
-                item.RecordAnyChannel = form.querySelector('#chkAllChannels').checked;
-                item.RecordAnyTime = form.querySelector('#chkAnyTime').checked;
-
-                item.Days = getDays(form);
-
-                ApiClient.updateLiveTvSeriesTimer(item);
-            });
-
-            e.preventDefault();
-            // Disable default form submission
-            return false;
-        }
-
         function renderSchedule(page, result) {
 
             var timers = result.Items;
@@ -119,11 +44,10 @@
             });
         }
 
-        view.querySelector('form').addEventListener('change', function () {
-            view.querySelector('.btnSubmit').click();
+        seriesRecordingEditor.embed(params.id, ApiClient.serverId(), {
+            context: view.querySelector('.recordingEditor')
         });
 
-        view.querySelector('.liveTvSeriesTimerForm').addEventListener('submit', onSubmit);
         view.querySelector('.scheduleTab').addEventListener('timercancelled', reload);
         view.addEventListener('viewbeforeshow', reload);
     };
diff --git a/dashboard-ui/scripts/livetvsuggested.js b/dashboard-ui/scripts/livetvsuggested.js
index 2da7911d66..59a60ae3ce 100644
--- a/dashboard-ui/scripts/livetvsuggested.js
+++ b/dashboard-ui/scripts/livetvsuggested.js
@@ -126,7 +126,9 @@
             overlayMoreButton: overlayButton != 'play',
             overlayPlayButton: overlayButton == 'play',
             allowBottomPadding: !enableScrollX(),
-            showProgramAirInfo: true
+            showAirTime: true,
+            showAirDateTime: true,
+            showChannelName: true
             //cardFooterAside: 'logo'
         });