From b9598ffaa16169e5d7206c749b4e747a69070f46 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Fri, 19 Jun 2015 00:23:55 -0400
Subject: [PATCH] update components

---
 dashboard-ui/channelslatest.html              |   2 -
 dashboard-ui/collections.html                 |   4 +-
 dashboard-ui/connectlogin.html                |   2 -
 dashboard-ui/css/card.css                     |  22 +-
 dashboard-ui/css/librarybrowser.css           |  20 +-
 dashboard-ui/css/livetv.css                   |   8 +-
 dashboard-ui/css/tileitem.css                 | 323 +-----------------
 dashboard-ui/favorites.html                   |   1 -
 dashboard-ui/homelatest.html                  |   2 -
 dashboard-ui/index.html                       |   2 -
 dashboard-ui/itembynamedetails.html           |   2 +-
 dashboard-ui/itemdetails.html                 |   2 -
 dashboard-ui/livetvrecordings.html            |   1 -
 dashboard-ui/livetvsuggested.html             |   1 -
 dashboard-ui/login.html                       |   1 -
 dashboard-ui/moviesrecommended.html           |   2 -
 dashboard-ui/mypreferencesdisplay.html        |   1 -
 dashboard-ui/mypreferenceslanguages.html      |   1 -
 dashboard-ui/mypreferenceswebclient.html      |   1 -
 dashboard-ui/myprofile.html                   |   2 -
 dashboard-ui/playlistedit.html                |  24 +-
 dashboard-ui/scripts/actionsheet.js           |  15 +
 dashboard-ui/scripts/backdrops.js             |   2 +-
 dashboard-ui/scripts/channelitems.js          |   2 +-
 dashboard-ui/scripts/channels.js              |   2 +-
 dashboard-ui/scripts/channelslatest.js        |   2 +-
 dashboard-ui/scripts/episodes.js              |   2 +-
 dashboard-ui/scripts/favorites.js             |   2 +-
 dashboard-ui/scripts/gamegenrepage.js         |   2 +-
 dashboard-ui/scripts/gamespage.js             |   2 +-
 dashboard-ui/scripts/gamesrecommendedpage.js  |   2 +-
 dashboard-ui/scripts/gamestudiospage.js       |   2 +-
 dashboard-ui/scripts/gamesystemspage.js       |   2 +-
 dashboard-ui/scripts/indexpage.js             |   2 +-
 dashboard-ui/scripts/itembynamedetailpage.js  |   2 +-
 dashboard-ui/scripts/itemdetailpage.js        |   2 +-
 dashboard-ui/scripts/itemlistpage.js          |   2 +-
 dashboard-ui/scripts/librarybrowser.js        |  24 +-
 dashboard-ui/scripts/livetvchannel.js         |   2 +-
 dashboard-ui/scripts/livetvchannels.js        |   2 +-
 dashboard-ui/scripts/livetvguide.js           |   2 +-
 dashboard-ui/scripts/livetvitems.js           |   2 +-
 dashboard-ui/scripts/livetvprogram.js         |   2 +-
 dashboard-ui/scripts/livetvrecordinglist.js   |   2 +-
 dashboard-ui/scripts/livetvrecordings.js      |   2 +-
 dashboard-ui/scripts/livetvseriestimers.js    |   2 +-
 dashboard-ui/scripts/livetvsuggested.js       |   2 +-
 dashboard-ui/scripts/livetvtimers.js          |   2 +-
 dashboard-ui/scripts/mediacontroller.js       |   5 +-
 dashboard-ui/scripts/moviecollections.js      |   7 +-
 dashboard-ui/scripts/moviegenres.js           |   2 +-
 dashboard-ui/scripts/moviepeople.js           |   2 +-
 dashboard-ui/scripts/movies.js                |   2 +-
 dashboard-ui/scripts/moviesrecommended.js     |   2 +-
 dashboard-ui/scripts/moviestudios.js          |   2 +-
 dashboard-ui/scripts/movietrailers.js         |   2 +-
 dashboard-ui/scripts/musicalbumartists.js     |   2 +-
 dashboard-ui/scripts/musicalbums.js           |   2 +-
 dashboard-ui/scripts/musicartists.js          |   2 +-
 dashboard-ui/scripts/musicgenres.js           |   2 +-
 dashboard-ui/scripts/musicrecommended.js      |   2 +-
 dashboard-ui/scripts/musicvideos.js           |   2 +-
 .../scripts/mypreferenceswebclient.js         |   2 +-
 dashboard-ui/scripts/nowplayingpage.js        |   2 +-
 dashboard-ui/scripts/photos.js                |   2 +-
 dashboard-ui/scripts/playlistedit.js          |  15 +-
 dashboard-ui/scripts/playlists.js             |   2 +-
 dashboard-ui/scripts/sections.js              |   8 +-
 dashboard-ui/scripts/site.js                  |  18 +-
 dashboard-ui/scripts/songs.js                 |   2 +-
 dashboard-ui/scripts/tvgenres.js              |   2 +-
 dashboard-ui/scripts/tvlatest.js              |   2 +-
 dashboard-ui/scripts/tvpeople.js              |   2 +-
 dashboard-ui/scripts/tvshows.js               |   2 +-
 dashboard-ui/scripts/tvstudios.js             |   2 +-
 dashboard-ui/selectserver.html                |   2 -
 dashboard-ui/themes/android.css               |  15 +
 dashboard-ui/themes/ios.css                   |  16 +
 .../thirdparty/apiclient/connectionmanager.js |  13 +-
 dashboard-ui/thirdparty/cordova/chromecast.js |  19 +-
 .../thirdparty/cordova/generaldevice.js       |   1 +
 .../thirdparty/iron-icons/emby-icons.html     |   5 +
 .../thirdparty/jquery.unveil-custom.js        |   2 +-
 .../paper-button/paper-button-style.css       |   4 +-
 .../thirdparty/paper-fab/paper-fab.html       | 175 ++++++++++
 dashboard-ui/tvlatest.html                    |   1 -
 dashboard-ui/tvrecommended.html               |   2 -
 dashboard-ui/wizardstart.html                 |   2 -
 88 files changed, 366 insertions(+), 501 deletions(-)
 create mode 100644 dashboard-ui/scripts/actionsheet.js
 create mode 100644 dashboard-ui/themes/android.css
 create mode 100644 dashboard-ui/thirdparty/paper-fab/paper-fab.html

diff --git a/dashboard-ui/channelslatest.html b/dashboard-ui/channelslatest.html
index b17aadae73..6bf8a4881b 100644
--- a/dashboard-ui/channelslatest.html
+++ b/dashboard-ui/channelslatest.html
@@ -6,8 +6,6 @@
 <body>
     <div id="channelsLatestPage" data-role="page" class="page libraryPage channelsPage" data-contextname="${HeaderChannels}" data-require="scripts/sections,scripts/channelslatest,paperbuttonstyle">
 
-        <link rel="import" href="thirdparty/paper-button/paper-button.html">
-
         <div class="libraryViewNav scopedLibraryViewNav">
             <a href="#" class="ui-btn-active latestChannelItemsTab"><i class="material-icons">new_releases</i>${TabLatest}</a>
             <a href="channels.html"><i class="material-icons">live_tv</i>${TabChannels}</a>
diff --git a/dashboard-ui/collections.html b/dashboard-ui/collections.html
index 547e809901..94d3de9ab6 100644
--- a/dashboard-ui/collections.html
+++ b/dashboard-ui/collections.html
@@ -33,6 +33,8 @@
             <div class="noItemsMessage" style="display: none; text-align: center;">
                 <p>${MessageNoCollectionsAvailable}</p>
             </div>
+
+            <paper-fab class="btnNewCollection" icon="add" style="position:fixed;bottom:60px;right:30px;background-color:#db4437;"></paper-fab>
         </div>
 
         <div data-role="panel" class="viewPanel" data-theme="a" data-position="right" data-display="overlay" data-position-fixed="true">
@@ -54,7 +56,7 @@
                             <option value="List">${OptionList}</option>
                             <option value="Thumb">${OptionThumb}</option>
                             <option value="ThumbCard">${OptionThumbCard}</option>
-                       </select>
+                        </select>
                     </div>
                     <br />
                     <div>
diff --git a/dashboard-ui/connectlogin.html b/dashboard-ui/connectlogin.html
index 844087b29e..2856a1d21d 100644
--- a/dashboard-ui/connectlogin.html
+++ b/dashboard-ui/connectlogin.html
@@ -6,8 +6,6 @@
 <body class="serverlessPage">
     <div id="connectLoginPage" data-role="page" class="page standalonePage connectLoginPage" data-theme="b" data-require="scripts/connectlogin,paperbuttonstyle">
 
-        <link rel="import" href="thirdparty/paper-button/paper-button.html">
-
         <div data-role="content">
 
             <form class="connectLoginForm" style="text-align: center; margin: 0 auto;display:none;">
diff --git a/dashboard-ui/css/card.css b/dashboard-ui/css/card.css
index fce1c301b1..e11c390262 100644
--- a/dashboard-ui/css/card.css
+++ b/dashboard-ui/css/card.css
@@ -55,6 +55,10 @@
     margin: 4px;
 }
 
+.defaultBackground .cardImage {
+    background-color: #333;
+}
+
 @media all and (max-width: 800px) {
 
     .cardBox {
@@ -261,15 +265,15 @@
     position: relative;
 }
 
-.iconCardImage .fa {
-    color: rgb(255, 255, 255);
-    position: absolute;
-    left: 0;
-    right: 0;
-    font-size: 50px;
-    margin: auto;
-    top: 25%;
-}
+    .iconCardImage .fa {
+        color: rgb(255, 255, 255);
+        position: absolute;
+        left: 0;
+        right: 0;
+        font-size: 50px;
+        margin: auto;
+        top: 25%;
+    }
 
 .bannerCard {
     width: 100%;
diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css
index 4cedaf23ee..1604b75eb5 100644
--- a/dashboard-ui/css/librarybrowser.css
+++ b/dashboard-ui/css/librarybrowser.css
@@ -13,25 +13,17 @@
 }
 
 .backdropPage.ui-page-theme-a {
-    background-color: rgba(240, 240,240, .90) !important;
+    background-color: rgba(240, 240,240, .94) !important;
 }
 
-    .backdropPage.ui-page-theme-a:not(.lightBackdropPage) {
-        background-color: rgba(240, 240,240, .94) !important;
-    }
-
 .ui-page-theme-b {
     background-color: #1f1f1f;
 }
 
 .backdropPage.ui-page-theme-b {
-    background-color: rgba(20, 20,20, .90) !important;
+    background-color: rgba(20, 20,20, .94) !important;
 }
 
-    .backdropPage.ui-page-theme-b:not(.lightBackdropPage) {
-        background-color: rgba(20, 20,20, .94) !important;
-    }
-
 .backdropContainer {
     position: fixed;
     top: 0;
@@ -999,10 +991,10 @@ span.itemCommunityRating:not(:empty) + .userDataIcons {
         display: inline-block;
     }
 
-    .textIndicator {
-        height: 22px;
-        padding-top: 2px;
-    }
+.textIndicator {
+    height: 22px;
+    padding-top: 2px;
+}
 
 .mediaSourceIndicator {
     display: block;
diff --git a/dashboard-ui/css/livetv.css b/dashboard-ui/css/livetv.css
index 4120d4a45a..4ebfbf5342 100644
--- a/dashboard-ui/css/livetv.css
+++ b/dashboard-ui/css/livetv.css
@@ -111,7 +111,7 @@
     border-bottom: 2px solid #0B487D;
 }
 
-.tvProgram:hover, .tvProgram:hover .tvProgramInfo {
+.pointerInput .tvProgram:hover, .pointerInput .tvProgram:hover .tvProgramInfo {
     background-color: #444;
 }
 
@@ -231,7 +231,7 @@
     position: relative;
 }
 
-.channelHeaderCell:hover {
+.pointerInput .channelHeaderCell:hover {
     background-color: #444;
 }
 
@@ -269,7 +269,7 @@
     overflow: hidden;
 }
 
-    .programCellInner:hover {
+    .pointerInput .programCellInner:hover {
         background-color: #444;
     }
 
@@ -366,4 +366,4 @@
 
 .channelList, .programGrid {
     height: auto !important;
-}
+}
\ No newline at end of file
diff --git a/dashboard-ui/css/tileitem.css b/dashboard-ui/css/tileitem.css
index f2b54d72b6..5f609fff26 100644
--- a/dashboard-ui/css/tileitem.css
+++ b/dashboard-ui/css/tileitem.css
@@ -1,7 +1,5 @@
 .tileItem {
-    background: rgba(30, 30, 30, .7);
-    padding: 10px 7px 5px;
-    margin: 3px 0;
+    padding: 5px 7px 5px;
     font-weight: normal !important;
     display: block;
     position: relative;
@@ -51,26 +49,8 @@
     overflow: hidden;
 }
 
-.backdropTileItem .tileImage {
-    height: 90px;
-    width: 45%;
-}
-
-.backdropTileItem .tileContent {
-    width: 50%;
-}
-
-.posterTileItem .tileImage {
-    height: 120px;
-    width: 30%;
-}
-
-.posterTileItem .tileContent {
-    width: 65%;
-}
-
 .smallPosterTileItem .tileImage {
-    height: 110px;
+    height: 150px;
     width: 35%;
 }
 
@@ -78,24 +58,6 @@
     width: 60%;
 }
 
-.smallBackdropTileItem .tileImage {
-    height: 125px;
-    width: 45%;
-}
-
-.smallBackdropTileItem .tileContent {
-    width: 50%;
-}
-
-.squareTileItem .tileImage {
-    height: 100px;
-    width: 35%;
-}
-
-.squareTileItem .tileContent {
-    width: 60%;
-}
-
 @media all and (min-width: 540px) {
 
     .tileItem {
@@ -104,296 +66,17 @@
         margin-right: 3px;
     }
 
-    .backdropTileItem {
-        display: block;
-    }
-
-    .posterTileItem, .squareTileItem {
-        width: 45%;
-    }
-
-        .posterTileItem .tileImage {
-            height: 120px;
-        }
-
-        .squareTileItem .tileImage {
-            height: 115px;
-        }
-
     .smallPosterTileItem {
         width: 46%;
         display: inline-block;
-        margin: 3px;
-    }
-
-    .smallBackdropTileItem {
-        display: block;
     }
 }
 
 @media all and (min-width: 750px) {
-    .smallBackdropTileItem {
-        display: block;
-    }
-
-    .backdropTileItem {
-        display: inline-block;
-    }
-
 
     .smallPosterTileItem {
-        width: 30%;
-    }
-
-    .backdropTileItem, .posterTileItem, .squareTileItem {
-        width: 46%;
-    }
-
-        .backdropTileItem .tileImage {
-            height: 88px;
-        }
-
-        .posterTileItem .tileImage {
-            height: 120px;
-        }
-
-        .squareTileItem .tileImage {
-            height: 115px;
-        }
-}
-
-@media all and (min-width: 850px) {
-
-    .smallBackdropTileItem {
-        width: 47%;
-        display: inline-block;
-    }
-
-    .backdropTileItem .tileImage {
-        height: 105px;
-    }
-
-    .posterTileItem .tileImage {
-        height: 120px;
-    }
-
-    .posterTileItem {
-        width: 30.5%;
-    }
-}
-
-@media all and (min-width: 1000px) {
-    .backdropTileItem, .posterTileItem, .squareTileItem {
-        width: 47.5%;
-    }
-
-    .posterTileItem {
         width: 31%;
     }
-
-    .backdropTileItem .tileImage {
-        height: 110px;
-    }
-
-    .posterTileItem .tileImage {
-        height: 136px;
-    }
-
-    .squareTileItem {
-        width: 31%;
-    }
-
-        .squareTileItem .tileImage {
-            height: 105px;
-        }
-}
-
-@media all and (min-width: 1200px) {
-    .backdropTileItem .tileImage {
-        height: 100px;
-    }
-
-    .posterTileItem .tileImage {
-        height: 160px;
-    }
-
-    .backdropTileItem, .posterTileItem, .squareTileItem {
-        width: 31.5%;
-    }
-
-        .squareTileItem .tileImage {
-            height: 130px;
-        }
-}
-
-@media all and (min-width: 1440px) {
-    .backdropTileItem .tileImage {
-        height: 110px;
-    }
-
-    .posterTileItem .tileImage {
-        height: 150px;
-    }
-
-    .backdropTileItem, .squareTileItem, .backdropTileItem.posterTileItem {
-        width: 31.5%;
-    }
-
-        .squareTileItem .tileImage {
-            height: 155px;
-        }
-
-    .posterTileItem {
-        width: 23.5%;
-    }
-}
-
-@media all and (min-width: 1700px) {
-
-    .backdropTileItem .tileImage {
-        height: 132px;
-    }
-
-    .posterTileItem .tileImage {
-        height: 170px;
-    }
-
-    .backdropTileItem, .backdropTileItem.posterTileItem {
-        width: 32%;
-    }
-
-    .posterTileItem {
-        width: 23.5%;
-    }
-
-    .squareTileItem {
-        width: 23.5%;
-    }
-
-        .squareTileItem .tileImage {
-            height: 140px;
-        }
-}
-
-
-@media all and (min-width: 1920px) {
-    .backdropTileItem, .backdropTileItem.posterTileItem {
-        width: 31.5%;
-    }
-
-    .tileImage {
-        height: 155px;
-    }
-
-    .posterTileItem {
-        width: 18.8%;
-    }
-
-        .posterTileItem .tileImage {
-            height: 160px;
-        }
-
-    .squareTileItem {
-        width: 18.8%;
-    }
-
-        .squareTileItem .tileImage {
-            height: 120px;
-        }
-}
-
-@media all and (min-width: 2000px) {
-    .backdropTileItem, .backdropTileItem.posterTileItem {
-        width: 23.5%;
-    }
-
-    .tileImage {
-        height: 117px;
-    }
-
-    .posterTileItem {
-        width: 18.8%;
-    }
-
-        .posterTileItem .tileImage {
-            height: 160px;
-        }
-
-    .squareTileItem {
-        width: 18.8%;
-    }
-
-        .squareTileItem .tileImage {
-            height: 130px;
-        }
-}
-
-@media all and (min-width: 2200px) {
-    .backdropTileItem, .backdropTileItem.posterTileItem {
-        width: 24%;
-    }
-
-    .tileImage {
-        height: 145px;
-    }
-
-    .posterTileItem {
-        width: 18.8%;
-    }
-
-        .posterTileItem .tileImage {
-            height: 185px;
-        }
-
-    .squareTileItem {
-        width: 18.8%;
-    }
-
-        .squareTileItem .tileImage {
-            height: 140px;
-        }
-}
-
-@media all and (min-width: 2540px) {
-    .backdropTileItem, .backdropTileItem.posterTileItem {
-        width: 18.75%;
-    }
-
-    .tileImage {
-        height: 120px;
-    }
-
-    .posterTileItem {
-        width: 15.8%;
-    }
-
-        .posterTileItem .tileImage {
-            height: 180px;
-        }
-
-    .squareTileItem {
-        width: 15.8%;
-    }
-
-        .squareTileItem .tileImage {
-            height: 140px;
-        }
-}
-
-
-.posterItem {
-    margin: 5px 5px;
-    font-weight: normal !important;
-    display: inline-block;
-    position: relative;
-    color: #fff !important;
-    text-decoration: none;
-    text-align: left;
-    -webkit-transition: all 500ms ease;
-    -moz-transition: all 500ms ease;
-    -o-transition: all 500ms ease;
-    -ms-transition: all 500ms ease;
-    transition: all 500ms ease;
 }
 
 .posterItemText {
@@ -403,4 +86,4 @@
     white-space: nowrap;
     padding: 5px 4px 4px;
     font-weight: 400;
-}
\ No newline at end of file
+}
diff --git a/dashboard-ui/favorites.html b/dashboard-ui/favorites.html
index 01139f7f60..85128e61c0 100644
--- a/dashboard-ui/favorites.html
+++ b/dashboard-ui/favorites.html
@@ -6,7 +6,6 @@
 <body>
     <div id="favoritesPage" data-role="page" class="page type-home libraryPage allLibraryPage backdropPage" data-backdroptype="movie,series,game,book" data-require="scripts/favorites,paperbuttonstyle">
 
-        <link rel="import" href="thirdparty/paper-button/paper-button.html">
         <div class="libraryViewNav scopedLibraryViewNav">
             <a href="index.html"><i class="material-icons">home</i>${TabHome}</a>
             <a href="homelatest.html"><i class="material-icons">new_releases</i>${TabLatest}</a>
diff --git a/dashboard-ui/homelatest.html b/dashboard-ui/homelatest.html
index e44debadc8..f228405ed1 100644
--- a/dashboard-ui/homelatest.html
+++ b/dashboard-ui/homelatest.html
@@ -6,8 +6,6 @@
 <body>
     <div id="homeLatestPage" data-role="page" class="page type-home libraryPage allLibraryPage backdropPage" data-backdroptype="movie,series,game,book" data-require="scripts/sections,scripts/homelatest,paperbuttonstyle">
 
-        <link rel="import" href="thirdparty/paper-button/paper-button.html">
-
         <div class="libraryViewNav scopedLibraryViewNav">
             <a href="index.html"><i class="material-icons">home</i>${TabHome}</a>
             <a href="#" class="ui-btn-active"><i class="material-icons">new_releases</i>${TabLatest}</a>
diff --git a/dashboard-ui/index.html b/dashboard-ui/index.html
index 18c4bff31b..846e96b2f0 100644
--- a/dashboard-ui/index.html
+++ b/dashboard-ui/index.html
@@ -6,8 +6,6 @@
 <body>
     <div id="indexPage" data-role="page" class="page type-home libraryPage allLibraryPage backdropPage" data-backdroptype="movie,series,game,book" data-require="scripts/sections,scripts/indexpage,paperbuttonstyle">
 
-        <link rel="import" href="thirdparty/paper-button/paper-button.html">
-
         <div class="libraryViewNav scopedLibraryViewNav">
             <a href="#" class="ui-btn-active"><i class="material-icons">home</i>${TabHome}</a>
             <a href="homelatest.html"><i class="material-icons">new_releases</i>${TabLatest}</a>
diff --git a/dashboard-ui/itembynamedetails.html b/dashboard-ui/itembynamedetails.html
index 9e91f968b9..18e672fcbd 100644
--- a/dashboard-ui/itembynamedetails.html
+++ b/dashboard-ui/itembynamedetails.html
@@ -5,7 +5,7 @@
 </head>
 <body>
 
-    <div id="itemByNameDetailPage" data-role="page" class="page libraryPage itemDetailPage lightBackdropPage" data-require="scripts/itembynamedetailpage">
+    <div id="itemByNameDetailPage" data-role="page" class="page libraryPage itemDetailPage backdropPage" data-require="scripts/itembynamedetailpage">
         <div id="movieGenreTabs" class="itemTabs" style="display: none;">
             <div class="libraryViewNav scopedLibraryViewNav">
                 <a href="moviesrecommended.html"><i class="material-icons">info</i>${TabSuggestions}</a>
diff --git a/dashboard-ui/itemdetails.html b/dashboard-ui/itemdetails.html
index f8250587c1..096cdafb38 100644
--- a/dashboard-ui/itemdetails.html
+++ b/dashboard-ui/itemdetails.html
@@ -6,8 +6,6 @@
 <body>
     <div id="itemDetailPage" data-role="page" class="page libraryPage itemDetailPage" data-theme="b" data-require="scripts/itemdetailpage,paperbuttonstyle">
 
-        <link rel="import" href="thirdparty/paper-button/paper-button.html">
-
         <div class="itemTabs homeTabs" style="display: none;">
             <div class="libraryViewNav scopedLibraryViewNav">
                 <a href="index.html" class="lnkHomeHome"><i class="material-icons">home</i>${TabHome}</a>
diff --git a/dashboard-ui/livetvrecordings.html b/dashboard-ui/livetvrecordings.html
index 9ba639df7f..d9d68be882 100644
--- a/dashboard-ui/livetvrecordings.html
+++ b/dashboard-ui/livetvrecordings.html
@@ -5,7 +5,6 @@
 </head>
 <body>
     <div id="liveTvRecordingsPage" data-role="page" class="page libraryPage liveTvPage" data-contextname="${HeaderLiveTv}" data-require="scripts/livetvrecordings,paperbuttonstyle">
-        <link rel="import" href="thirdparty/paper-button/paper-button.html">
 
         <div class="libraryViewNav">
             <a href="livetvsuggested.html"><i class="material-icons">info</i>${TabSuggestions}</a>
diff --git a/dashboard-ui/livetvsuggested.html b/dashboard-ui/livetvsuggested.html
index 35b90fb282..20fc1bc701 100644
--- a/dashboard-ui/livetvsuggested.html
+++ b/dashboard-ui/livetvsuggested.html
@@ -5,7 +5,6 @@
 </head>
 <body>
     <div id="liveTvSuggestedPage" data-role="page" class="page libraryPage liveTvPage backdropPage globalBackdropPage" data-contextname="${HeaderLiveTv}" data-backdroptype="series,movie" data-require="scripts/livetvsuggested,paperbuttonstyle">
-        <link rel="import" href="thirdparty/paper-button/paper-button.html">
 
         <div class="libraryViewNav">
             <a href="#" class="ui-btn-active"><i class="material-icons">info</i>${TabSuggestions}</a>
diff --git a/dashboard-ui/login.html b/dashboard-ui/login.html
index 9362fd23cc..f3027c5080 100644
--- a/dashboard-ui/login.html
+++ b/dashboard-ui/login.html
@@ -6,7 +6,6 @@
 <body>
     <div id="loginPage" data-role="page" class="page standalonePage" data-theme="b" data-require="scripts/loginpage,paperbuttonstyle">
 
-        <link rel="import" href="thirdparty/paper-button/paper-button.html">
         <div data-role="content">
 
             <form class="manualLoginForm" style="display: none; text-align: center; margin: 0 auto;">
diff --git a/dashboard-ui/moviesrecommended.html b/dashboard-ui/moviesrecommended.html
index 0e4fa46a76..24ba337177 100644
--- a/dashboard-ui/moviesrecommended.html
+++ b/dashboard-ui/moviesrecommended.html
@@ -6,8 +6,6 @@
 <body>
     <div id="moviesRecommendedPage" data-role="page" class="page libraryPage backdropPage" data-backdroptype="movie" data-require="scripts/moviesrecommended,paperbuttonstyle">
 
-        <link rel="import" href="thirdparty/paper-button/paper-button.html">
-
         <div class="libraryViewNav scopedLibraryViewNav">
             <a href="#" class="ui-btn-active"><i class="material-icons">info</i>${TabSuggestions}</a>
             <a href="movies.html"><i class="material-icons">local_movies</i>${TabMovies}</a>
diff --git a/dashboard-ui/mypreferencesdisplay.html b/dashboard-ui/mypreferencesdisplay.html
index 80b783a929..2bdaccc68f 100644
--- a/dashboard-ui/mypreferencesdisplay.html
+++ b/dashboard-ui/mypreferencesdisplay.html
@@ -6,7 +6,6 @@
 </head>
 <body>
     <div id="displayPreferencesPage" data-role="page" class="page libraryPage userPreferencesPage" data-contextname="${HeaderPreferences}" data-require="scripts/mypreferencesdisplay,scripts/mypreferencescommon,paperbuttonstyle,jqmicons">
-        <link rel="import" href="thirdparty/paper-button/paper-button.html">
 
         <div class="libraryViewNav">
             <a href="#" class="ui-btn-active lnkDisplayPreferences">${TabDisplay}</a>
diff --git a/dashboard-ui/mypreferenceslanguages.html b/dashboard-ui/mypreferenceslanguages.html
index b66e43aa21..623ec1ad4f 100644
--- a/dashboard-ui/mypreferenceslanguages.html
+++ b/dashboard-ui/mypreferenceslanguages.html
@@ -6,7 +6,6 @@
 </head>
 <body>
     <div id="languagePreferencesPage" data-role="page" class="page libraryPage userPreferencesPage" data-contextname="${HeaderPreferences}" data-require="scripts/mypreferenceslanguages,scripts/mypreferencescommon,paperbuttonstyle,jqmicons">
-        <link rel="import" href="thirdparty/paper-button/paper-button.html">
 
         <div class="libraryViewNav">
             <a href="#" class="lnkDisplayPreferences">${TabDisplay}</a>
diff --git a/dashboard-ui/mypreferenceswebclient.html b/dashboard-ui/mypreferenceswebclient.html
index 6a1c63c094..0b4d98b29a 100644
--- a/dashboard-ui/mypreferenceswebclient.html
+++ b/dashboard-ui/mypreferenceswebclient.html
@@ -6,7 +6,6 @@
 </head>
 <body>
     <div id="webClientPreferencesPage" data-role="page" class="page libraryPage userPreferencesPage" data-contextname="${HeaderPreferences}" data-require="scripts/mypreferenceswebclient,scripts/mypreferencescommon,paperbuttonstyle,jqmicons">
-        <link rel="import" href="thirdparty/paper-button/paper-button.html">
 
         <div class="libraryViewNav">
             <a href="#" class="lnkDisplayPreferences">${TabDisplay}</a>
diff --git a/dashboard-ui/myprofile.html b/dashboard-ui/myprofile.html
index 5d9cd4d0fd..e3194a1323 100644
--- a/dashboard-ui/myprofile.html
+++ b/dashboard-ui/myprofile.html
@@ -6,8 +6,6 @@
 <body>
     <div id="userImagePage" data-role="page" class="page libraryPage userPreferencesPage userPasswordPage" data-contextname="${HeaderPreferences}" data-require="scripts/myprofile,scripts/mypreferencescommon,paperbuttonstyle,jqmicons">
 
-        <link rel="import" href="thirdparty/paper-button/paper-button.html">
-
         <div class="libraryViewNav">
             <a href="#" class="lnkDisplayPreferences">${TabDisplay}</a>
             <a href="#" class="lnkLanguagePreferences">${TabPlayback}</a>
diff --git a/dashboard-ui/playlistedit.html b/dashboard-ui/playlistedit.html
index dd8613f3b3..c55ef483b4 100644
--- a/dashboard-ui/playlistedit.html
+++ b/dashboard-ui/playlistedit.html
@@ -13,34 +13,14 @@
         <div data-role="content">
             <h2 style="text-align:center;" class="playlistName"></h2>
             <div class="viewSettings">
-                <div class="listTopPaging">
-                    &nbsp;
-                </div>
-                <button class="btnPlay hide" type="button" data-icon="play" data-inline="true" data-mini="true" style="margin-left:1em;">${ButtonPlay}</button>
+                <div class="listTopPaging"></div>
+                <paper-button raised class="secondary btnPlay hide"><iron-icon icon="play-arrow"></iron-icon><span>${ButtonPlay}</span></paper-button>
             </div>
             <div id="items" class="itemsContainer"></div>
             <div class="noItemsMessage" style="display: none; text-align: center;">
                 <p>${MessageNoPlaylistItemsAvailable}</p>
             </div>
         </div>
-
-        <div data-role="panel" class="viewPanel" data-theme="a" data-position="right" data-display="overlay" data-position-fixed="true">
-            <form>
-
-                <div data-role="controlgroup" data-type="horizontal" data-mini="true" class="viewPanelTabs">
-                    <a href="#" data-role="button" class="viewTabButton" data-tab="tabView">${TabView}</a>
-                </div>
-
-                <div class="tabView viewTab">
-
-                    <div>
-                        <label for="selectPageSize">${LabelPageSize}</label>
-                        <select id="selectPageSize"></select>
-                    </div>
-
-                </div>
-            </form>
-        </div>
     </div>
 </body>
 </html>
diff --git a/dashboard-ui/scripts/actionsheet.js b/dashboard-ui/scripts/actionsheet.js
new file mode 100644
index 0000000000..0b812566bb
--- /dev/null
+++ b/dashboard-ui/scripts/actionsheet.js
@@ -0,0 +1,15 @@
+(function () {
+
+    function show(options) {
+
+        // items
+        // positionTo
+        // showCancel
+
+    }
+
+    window.ActionSheet = {
+        show: show
+    };
+
+})();
\ No newline at end of file
diff --git a/dashboard-ui/scripts/backdrops.js b/dashboard-ui/scripts/backdrops.js
index 5f2e81588c..646a781c2a 100644
--- a/dashboard-ui/scripts/backdrops.js
+++ b/dashboard-ui/scripts/backdrops.js
@@ -129,7 +129,7 @@
         }
 
         if ($.browser.android && AppInfo.isNativeApp) {
-            return true;
+            return screen.availWidth >= 1200;
         }
 
         if ($.browser.mobile) {
diff --git a/dashboard-ui/scripts/channelitems.js b/dashboard-ui/scripts/channelitems.js
index 5b5a4f5c6a..8d97c44426 100644
--- a/dashboard-ui/scripts/channelitems.js
+++ b/dashboard-ui/scripts/channelitems.js
@@ -256,7 +256,7 @@
             reloadItems(page);
         });
 
-    }).on('pageshowready', "#channelItemsPage", function () {
+    }).on('pagebeforeshowready', "#channelItemsPage", function () {
 
         var page = this;
         var limit = LibraryBrowser.getDefaultPageSize();
diff --git a/dashboard-ui/scripts/channels.js b/dashboard-ui/scripts/channels.js
index 6f615ae7b8..04ad855e73 100644
--- a/dashboard-ui/scripts/channels.js
+++ b/dashboard-ui/scripts/channels.js
@@ -61,7 +61,7 @@
 
     }
 
-    $(document).on('pageshowready', "#channelsPage", function () {
+    $(document).on('pagebeforeshowready', "#channelsPage", function () {
 
         LibraryBrowser.loadSavedQueryValues('channels', query);
 
diff --git a/dashboard-ui/scripts/channelslatest.js b/dashboard-ui/scripts/channelslatest.js
index 63eca5776f..6e5dc2615c 100644
--- a/dashboard-ui/scripts/channelslatest.js
+++ b/dashboard-ui/scripts/channelslatest.js
@@ -5,7 +5,7 @@
         Sections.loadLatestChannelItems($(".items", page), Dashboard.getCurrentUserId());
     }
 
-    $(document).on('pageshowready', "#channelsLatestPage", function () {
+    $(document).on('pagebeforeshowready', "#channelsLatestPage", function () {
 
         reloadItems(this);
 
diff --git a/dashboard-ui/scripts/episodes.js b/dashboard-ui/scripts/episodes.js
index 7b40ed76a1..b9329a7600 100644
--- a/dashboard-ui/scripts/episodes.js
+++ b/dashboard-ui/scripts/episodes.js
@@ -321,7 +321,7 @@
             reloadItems(page);
         });
 
-    }).on('pageshowready', "#episodesPage", function () {
+    }).on('pagebeforeshowready', "#episodesPage", function () {
 
         var page = this;
         query.ParentId = LibraryMenu.getTopParentId();
diff --git a/dashboard-ui/scripts/favorites.js b/dashboard-ui/scripts/favorites.js
index 24f8dddc2b..1ad2255aed 100644
--- a/dashboard-ui/scripts/favorites.js
+++ b/dashboard-ui/scripts/favorites.js
@@ -109,7 +109,7 @@
         });
     }
 
-    $(document).on('pageshowready', "#favoritesPage", function () {
+    $(document).on('pagebeforeshowready', "#favoritesPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/gamegenrepage.js b/dashboard-ui/scripts/gamegenrepage.js
index 802683800d..4ac17609a6 100644
--- a/dashboard-ui/scripts/gamegenrepage.js
+++ b/dashboard-ui/scripts/gamegenrepage.js
@@ -96,7 +96,7 @@
             reloadItems(page);
         });
 
-    }).on('pageshowready', "#gameGenresPage", function () {
+    }).on('pagebeforeshowready', "#gameGenresPage", function () {
 
         query.ParentId = LibraryMenu.getTopParentId();
 
diff --git a/dashboard-ui/scripts/gamespage.js b/dashboard-ui/scripts/gamespage.js
index d082261e4d..d29e3006f7 100644
--- a/dashboard-ui/scripts/gamespage.js
+++ b/dashboard-ui/scripts/gamespage.js
@@ -239,7 +239,7 @@
             reloadItems(page);
         });
 
-    }).on('pageshowready', "#gamesPage", function () {
+    }).on('pagebeforeshowready', "#gamesPage", function () {
 
         var page = this;
         query.ParentId = LibraryMenu.getTopParentId();
diff --git a/dashboard-ui/scripts/gamesrecommendedpage.js b/dashboard-ui/scripts/gamesrecommendedpage.js
index d8f4655996..6d82262f20 100644
--- a/dashboard-ui/scripts/gamesrecommendedpage.js
+++ b/dashboard-ui/scripts/gamesrecommendedpage.js
@@ -1,6 +1,6 @@
 (function ($, document) {
 
-    $(document).on('pageshowready', "#gamesRecommendedPage", function () {
+    $(document).on('pagebeforeshowready', "#gamesRecommendedPage", function () {
 
         var parentId = LibraryMenu.getTopParentId();
         var userId = Dashboard.getCurrentUserId();
diff --git a/dashboard-ui/scripts/gamestudiospage.js b/dashboard-ui/scripts/gamestudiospage.js
index f85bf82aac..b926ae5347 100644
--- a/dashboard-ui/scripts/gamestudiospage.js
+++ b/dashboard-ui/scripts/gamestudiospage.js
@@ -98,7 +98,7 @@
             reloadItems(page);
         });
 
-    }).on('pageshowready', "#gameStudiosPage", function () {
+    }).on('pagebeforeshowready', "#gameStudiosPage", function () {
 
         query.ParentId = LibraryMenu.getTopParentId();
 
diff --git a/dashboard-ui/scripts/gamesystemspage.js b/dashboard-ui/scripts/gamesystemspage.js
index 1b7cba7f7b..ec0a8a95ff 100644
--- a/dashboard-ui/scripts/gamesystemspage.js
+++ b/dashboard-ui/scripts/gamesystemspage.js
@@ -52,7 +52,7 @@
         // Reset form values using the last used query
     }
 
-    $(document).on('pageshowready', "#gamesystemsPage", function () {
+    $(document).on('pagebeforeshowready', "#gamesystemsPage", function () {
 
         query.ParentId = LibraryMenu.getTopParentId();
 
diff --git a/dashboard-ui/scripts/indexpage.js b/dashboard-ui/scripts/indexpage.js
index 5ef6ce070e..ad50c70ba1 100644
--- a/dashboard-ui/scripts/indexpage.js
+++ b/dashboard-ui/scripts/indexpage.js
@@ -170,7 +170,7 @@
             takeTour(page, Dashboard.getCurrentUserId());
         });
 
-    }).on('pageshowready', "#indexPage", function () {
+    }).on('pagebeforeshowready', "#indexPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/itembynamedetailpage.js b/dashboard-ui/scripts/itembynamedetailpage.js
index 7cad7f798f..8796b9edfc 100644
--- a/dashboard-ui/scripts/itembynamedetailpage.js
+++ b/dashboard-ui/scripts/itembynamedetailpage.js
@@ -587,7 +587,7 @@
             });
         });
 
-    }).on('pageshowready', "#itemByNameDetailPage", function () {
+    }).on('pagebeforeshowready', "#itemByNameDetailPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/itemdetailpage.js b/dashboard-ui/scripts/itemdetailpage.js
index e0041aa782..6af94ec863 100644
--- a/dashboard-ui/scripts/itemdetailpage.js
+++ b/dashboard-ui/scripts/itemdetailpage.js
@@ -1627,7 +1627,7 @@
 
         });
 
-    }).on('pageshowready', "#itemDetailPage", function () {
+    }).on('pagebeforeshowready', "#itemDetailPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/itemlistpage.js b/dashboard-ui/scripts/itemlistpage.js
index a0dcc0dbe6..a132d773cc 100644
--- a/dashboard-ui/scripts/itemlistpage.js
+++ b/dashboard-ui/scripts/itemlistpage.js
@@ -244,7 +244,7 @@
 
         $(page).on('click', '.mediaItem', onListItemClick);
 
-    }).on('pageshowready', "#itemListPage", function () {
+    }).on('pagebeforeshowready', "#itemListPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js
index 536bd22b76..895fd193e9 100644
--- a/dashboard-ui/scripts/librarybrowser.js
+++ b/dashboard-ui/scripts/librarybrowser.js
@@ -2,8 +2,6 @@
 
     var pageSizeKey = 'pagesize_v4';
 
-    var defaultBackground = "#333";
-
     return {
         getDefaultPageSize: function (key, defaultValue) {
 
@@ -1214,7 +1212,6 @@
             var html = '';
             var imgUrl = null;
             var icon;
-            var background = null;
             var width = null;
             var height = null;
 
@@ -1222,6 +1219,8 @@
 
             var enableImageEnhancers = options.enableImageEnhancers !== false;
 
+            var cssClass = "card";
+
             if (options.autoThumb && item.ImageTags && item.ImageTags.Primary && item.PrimaryImageAspectRatio && item.PrimaryImageAspectRatio >= 1.5) {
 
                 width = posterWidth;
@@ -1386,7 +1385,7 @@
                 if (item.Name && options.showTitle) {
                     icon = 'fa-music';
                 }
-                background = defaultBackground;
+                cssClass += " defaultBackground";
 
             } else if (item.Type == "Recording" || item.Type == "Program" || item.Type == "TvChannel") {
 
@@ -1394,28 +1393,26 @@
                     icon = 'fa-folder-open';
                 }
 
-                background = defaultBackground;
+                cssClass += " defaultBackground";
             } else if (item.MediaType == "Video" || item.Type == "Season" || item.Type == "Series") {
 
                 if (item.Name && options.showTitle) {
                     icon = 'fa-video-camera';
                 }
-                background = defaultBackground;
+                cssClass += " defaultBackground";
             } else if (item.Type == "Person") {
 
                 if (item.Name && options.showTitle) {
                     icon = 'fa-user';
                 }
-                background = defaultBackground;
+                cssClass += " defaultBackground";
             } else {
                 if (item.Name && options.showTitle) {
                     icon = 'fa-folder-open';
                 }
-                background = defaultBackground;
+                cssClass += " defaultBackground";
             }
 
-            var cssClass = "card";
-
             cssClass += ' ' + options.shape + 'Card';
 
             var mediaSourceCount = item.MediaSourceCount || 1;
@@ -1453,10 +1450,6 @@
                 style += 'background-image:url(\'' + imgUrl + '\');';
             }
 
-            if (background) {
-                style += "background-color:" + background + ";";
-            }
-
             var imageCssClass = 'cardImage';
 
             if (icon) {
@@ -2129,12 +2122,15 @@
 
                 if (options.viewButton) {
 
+                    //html += '<paper-button raised class="subdued notext"><iron-icon icon="view-comfy"></iron-icon></paper-button>';
                     html += '<paper-button raised class="subdued notext" onclick="require([\'jqmicons\']);jQuery(\'.viewPanel\', jQuery(this).parents(\'.page\')).panel(\'toggle\');"><iron-icon icon="more-vert"></iron-icon></paper-button>';
                 }
 
                 html += '</div>';
 
                 if (showControls && options.showLimit !== false) {
+
+                    require(['jqmicons']);
                     var id = "selectPageSize";
 
                     var pageSizes = options.pageSizes || LibraryBrowser.getDefaultPageSizeSelections();
diff --git a/dashboard-ui/scripts/livetvchannel.js b/dashboard-ui/scripts/livetvchannel.js
index 056681dd96..bf286af509 100644
--- a/dashboard-ui/scripts/livetvchannel.js
+++ b/dashboard-ui/scripts/livetvchannel.js
@@ -176,7 +176,7 @@
             Dashboard.navigate("edititemmetadata.html?channelid=" + currentItem.Id);
         });
 
-    }).on('pageshowready', "#liveTvChannelPage", function () {
+    }).on('pagebeforeshowready', "#liveTvChannelPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/livetvchannels.js b/dashboard-ui/scripts/livetvchannels.js
index 7418e9ede7..377579f1f5 100644
--- a/dashboard-ui/scripts/livetvchannels.js
+++ b/dashboard-ui/scripts/livetvchannels.js
@@ -109,7 +109,7 @@
             reloadItems(page);
         });
 
-    }).on('pageshowready', "#liveTvChannelsPage", function () {
+    }).on('pagebeforeshowready', "#liveTvChannelsPage", function () {
 
         // Can't use pagebeforeshow here or the loading popup won't center correctly
         var page = this;
diff --git a/dashboard-ui/scripts/livetvguide.js b/dashboard-ui/scripts/livetvguide.js
index 2a862352e7..2c7a75d936 100644
--- a/dashboard-ui/scripts/livetvguide.js
+++ b/dashboard-ui/scripts/livetvguide.js
@@ -478,7 +478,7 @@
             reloadPage(page);
         });
 
-    }).on('pageshowready', "#liveTvGuidePage", function () {
+    }).on('pagebeforeshowready', "#liveTvGuidePage", function () {
 
         var page = this;
         reloadPage(page);
diff --git a/dashboard-ui/scripts/livetvitems.js b/dashboard-ui/scripts/livetvitems.js
index 83e5388353..1ed17e4d6d 100644
--- a/dashboard-ui/scripts/livetvitems.js
+++ b/dashboard-ui/scripts/livetvitems.js
@@ -137,7 +137,7 @@
             reloadItems(page);
         });
 
-    }).on('pageshowready', "#liveTvItemsPage", function () {
+    }).on('pagebeforeshowready', "#liveTvItemsPage", function () {
 
         query.ParentId = LibraryMenu.getTopParentId();
 
diff --git a/dashboard-ui/scripts/livetvprogram.js b/dashboard-ui/scripts/livetvprogram.js
index 40483d1876..0ac8499a46 100644
--- a/dashboard-ui/scripts/livetvprogram.js
+++ b/dashboard-ui/scripts/livetvprogram.js
@@ -121,7 +121,7 @@
             deleteTimer(page, currentItem.TimerId);
         });
 
-    }).on('pageshowready', "#liveTvProgramPage", function () {
+    }).on('pagebeforeshowready', "#liveTvProgramPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/livetvrecordinglist.js b/dashboard-ui/scripts/livetvrecordinglist.js
index ae367fe963..bdee1fba0b 100644
--- a/dashboard-ui/scripts/livetvrecordinglist.js
+++ b/dashboard-ui/scripts/livetvrecordinglist.js
@@ -84,7 +84,7 @@
         var page = this;
 
 
-    }).on('pageshowready', "#liveTvRecordingListPage", function () {
+    }).on('pagebeforeshowready', "#liveTvRecordingListPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/livetvrecordings.js b/dashboard-ui/scripts/livetvrecordings.js
index 3e8dc548ca..16f9b62983 100644
--- a/dashboard-ui/scripts/livetvrecordings.js
+++ b/dashboard-ui/scripts/livetvrecordings.js
@@ -102,7 +102,7 @@
         });
     }
 
-    $(document).on('pageshowready', "#liveTvRecordingsPage", function () {
+    $(document).on('pagebeforeshowready', "#liveTvRecordingsPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/livetvseriestimers.js b/dashboard-ui/scripts/livetvseriestimers.js
index fc363ef21b..4992375b36 100644
--- a/dashboard-ui/scripts/livetvseriestimers.js
+++ b/dashboard-ui/scripts/livetvseriestimers.js
@@ -116,7 +116,7 @@
         }).checkboxradio('refresh');
     }
 
-    $(document).on('pageshowready', "#liveTvSeriesTimersPage", function () {
+    $(document).on('pagebeforeshowready', "#liveTvSeriesTimersPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/livetvsuggested.js b/dashboard-ui/scripts/livetvsuggested.js
index b3649f6789..6dc391f4ad 100644
--- a/dashboard-ui/scripts/livetvsuggested.js
+++ b/dashboard-ui/scripts/livetvsuggested.js
@@ -104,7 +104,7 @@
         });
     }
 
-    $(document).on('pageshowready', "#liveTvSuggestedPage", function () {
+    $(document).on('pagebeforeshowready', "#liveTvSuggestedPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/livetvtimers.js b/dashboard-ui/scripts/livetvtimers.js
index d318ea12db..4a93c45bfd 100644
--- a/dashboard-ui/scripts/livetvtimers.js
+++ b/dashboard-ui/scripts/livetvtimers.js
@@ -107,7 +107,7 @@
         });
     }
 
-    $(document).on('pageshowready', "#liveTvTimersPage", function () {
+    $(document).on('pagebeforeshowready', "#liveTvTimersPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/mediacontroller.js b/dashboard-ui/scripts/mediacontroller.js
index cb2e475063..15f7743cac 100644
--- a/dashboard-ui/scripts/mediacontroller.js
+++ b/dashboard-ui/scripts/mediacontroller.js
@@ -122,6 +122,7 @@
                 throw new Error('null player');
             }
 
+            currentPairingId = null;
             currentPlayer = player;
             currentTargetInfo = targetInfo;
 
@@ -745,12 +746,14 @@
         html += '<div class="players"></div>';
 
         html += '<br/>';
-        html += '<p><a href="nowplaying.html" data-role="button" data-icon="remote" data-transition="slideup">' + Globalize.translate('ButtonRemoteControl') + '</a></p>';
+        html += '<p><a href="nowplaying.html" data-transition="slideup" class="clearLink"><paper-button raised class="block"><iron-icon icon="tablet-android"></iron-icon><span>' + Globalize.translate('ButtonRemoteControl') + '</span></paper-button></a></p>';
 
         html += '</div>';
 
         $(document.body).append(html);
 
+        require(['jqmicons']);
+
         var elem = $('#playerSelectionPanel').panel({}).trigger('create').panel("open").on("panelclose", function () {
 
             $(this).off("panelclose").remove();
diff --git a/dashboard-ui/scripts/moviecollections.js b/dashboard-ui/scripts/moviecollections.js
index 639f815ac4..a3a425f093 100644
--- a/dashboard-ui/scripts/moviecollections.js
+++ b/dashboard-ui/scripts/moviecollections.js
@@ -37,17 +37,12 @@
 
             var html = '';
 
-            var addiontalButtonsHtml = user.Policy.IsAdministrator ?
-                ('<button class="btnNewCollection" data-mini="true" data-icon="plus" data-inline="true" data-iconpos="notext">' + Globalize.translate('ButtonNew') + '</button>') :
-                '';
-
             $('.listTopPaging', page).html(LibraryBrowser.getQueryPagingHtml({
                 startIndex: query.StartIndex,
                 limit: query.Limit,
                 totalRecordCount: result.TotalRecordCount,
                 viewButton: true,
                 showLimit: false,
-                additionalButtonsHtml: addiontalButtonsHtml
             })).trigger('create');
 
             updateFilterControls(page);
@@ -257,7 +252,7 @@
             reloadItems(page);
         });
 
-    }).on('pageshowready', "#boxsetsPage", function () {
+    }).on('pagebeforeshowready', "#boxsetsPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/moviegenres.js b/dashboard-ui/scripts/moviegenres.js
index b81a8b8c44..ebddc2e359 100644
--- a/dashboard-ui/scripts/moviegenres.js
+++ b/dashboard-ui/scripts/moviegenres.js
@@ -154,7 +154,7 @@
             LibraryBrowser.saveViewSetting(getSavedQueryKey(), view);
         });
 
-    }).on('pageshowready', "#movieGenresPage", function () {
+    }).on('pagebeforeshowready', "#movieGenresPage", function () {
 
         var page = this;
         query.ParentId = LibraryMenu.getTopParentId();
diff --git a/dashboard-ui/scripts/moviepeople.js b/dashboard-ui/scripts/moviepeople.js
index 36176ce991..32027e2b54 100644
--- a/dashboard-ui/scripts/moviepeople.js
+++ b/dashboard-ui/scripts/moviepeople.js
@@ -140,7 +140,7 @@
             reloadItems(page);
         });
 
-    }).on('pageshowready', "#moviePeoplePage", function () {
+    }).on('pagebeforeshowready', "#moviePeoplePage", function () {
 
         query.ParentId = LibraryMenu.getTopParentId();
 
diff --git a/dashboard-ui/scripts/movies.js b/dashboard-ui/scripts/movies.js
index af90dd7961..a60c5ffd0b 100644
--- a/dashboard-ui/scripts/movies.js
+++ b/dashboard-ui/scripts/movies.js
@@ -399,7 +399,7 @@
             reloadItems(page);
         });
 
-    }).on('pageshowready', "#moviesPage", function () {
+    }).on('pagebeforeshowready', "#moviesPage", function () {
 
         query.ParentId = LibraryMenu.getTopParentId();
 
diff --git a/dashboard-ui/scripts/moviesrecommended.js b/dashboard-ui/scripts/moviesrecommended.js
index 397e1b6d62..f20efcfe04 100644
--- a/dashboard-ui/scripts/moviesrecommended.js
+++ b/dashboard-ui/scripts/moviesrecommended.js
@@ -235,7 +235,7 @@
 
         $('.recommendations', page).createCardMenus();
 
-    }).on('pageshowready', "#moviesRecommendedPage", function () {
+    }).on('pagebeforeshowready', "#moviesRecommendedPage", function () {
 
         var parentId = LibraryMenu.getTopParentId();
 
diff --git a/dashboard-ui/scripts/moviestudios.js b/dashboard-ui/scripts/moviestudios.js
index e973ba517b..3842c6a756 100644
--- a/dashboard-ui/scripts/moviestudios.js
+++ b/dashboard-ui/scripts/moviestudios.js
@@ -99,7 +99,7 @@
             reloadItems(page);
         });
 
-    }).on('pageshowready', "#movieStudiosPage", function () {
+    }).on('pagebeforeshowready', "#movieStudiosPage", function () {
 
         query.ParentId = LibraryMenu.getTopParentId();
 
diff --git a/dashboard-ui/scripts/movietrailers.js b/dashboard-ui/scripts/movietrailers.js
index 53683433ec..1806f58c25 100644
--- a/dashboard-ui/scripts/movietrailers.js
+++ b/dashboard-ui/scripts/movietrailers.js
@@ -212,7 +212,7 @@
 
         $('.popupTrailerReelForm').off('submit', onSubmit).on('submit', onSubmit);
 
-    }).on('pageshowready', "#movieTrailersPage", function () {
+    }).on('pagebeforeshowready', "#movieTrailersPage", function () {
 
         query.ParentId = LibraryMenu.getTopParentId();
 
diff --git a/dashboard-ui/scripts/musicalbumartists.js b/dashboard-ui/scripts/musicalbumartists.js
index b34b9cd684..a17c1c94ea 100644
--- a/dashboard-ui/scripts/musicalbumartists.js
+++ b/dashboard-ui/scripts/musicalbumartists.js
@@ -190,7 +190,7 @@
             reloadItems(page);
         });
 
-    }).on('pageshowready', "#musicAlbumArtistsPage", function () {
+    }).on('pagebeforeshowready', "#musicAlbumArtistsPage", function () {
 
         var page = this;
         query.ParentId = LibraryMenu.getTopParentId();
diff --git a/dashboard-ui/scripts/musicalbums.js b/dashboard-ui/scripts/musicalbums.js
index d94abeb3cb..17fcdc7798 100644
--- a/dashboard-ui/scripts/musicalbums.js
+++ b/dashboard-ui/scripts/musicalbums.js
@@ -242,7 +242,7 @@
             reloadItems(page);
         });
 
-    }).on('pageshowready', "#musicAlbumsPage", function () {
+    }).on('pagebeforeshowready', "#musicAlbumsPage", function () {
 
         query.ParentId = LibraryMenu.getTopParentId();
 
diff --git a/dashboard-ui/scripts/musicartists.js b/dashboard-ui/scripts/musicartists.js
index a4214a9fed..90839a9c3e 100644
--- a/dashboard-ui/scripts/musicartists.js
+++ b/dashboard-ui/scripts/musicartists.js
@@ -191,7 +191,7 @@
             reloadItems(page);
         });
 
-    }).on('pageshowready', "#musicArtistsPage", function () {
+    }).on('pagebeforeshowready', "#musicArtistsPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/musicgenres.js b/dashboard-ui/scripts/musicgenres.js
index a737e18c82..1748c14714 100644
--- a/dashboard-ui/scripts/musicgenres.js
+++ b/dashboard-ui/scripts/musicgenres.js
@@ -115,7 +115,7 @@
             reloadItems(page);
         });
 
-    }).on('pageshowready', "#musicGenresPage", function () {
+    }).on('pagebeforeshowready', "#musicGenresPage", function () {
 
         query.ParentId = LibraryMenu.getTopParentId();
 
diff --git a/dashboard-ui/scripts/musicrecommended.js b/dashboard-ui/scripts/musicrecommended.js
index 45a3d33e05..67f88d1cdf 100644
--- a/dashboard-ui/scripts/musicrecommended.js
+++ b/dashboard-ui/scripts/musicrecommended.js
@@ -167,7 +167,7 @@
         });
     }
 
-    $(document).on('pageshowready', "#musicRecommendedPage", function () {
+    $(document).on('pagebeforeshowready', "#musicRecommendedPage", function () {
 
         var parentId = LibraryMenu.getTopParentId();
 
diff --git a/dashboard-ui/scripts/musicvideos.js b/dashboard-ui/scripts/musicvideos.js
index 05a27a2684..28f4146c71 100644
--- a/dashboard-ui/scripts/musicvideos.js
+++ b/dashboard-ui/scripts/musicvideos.js
@@ -183,7 +183,7 @@
             reloadItems(page);
         });
 
-    }).on('pageshowready', "#musicVideosPage", function () {
+    }).on('pagebeforeshowready', "#musicVideosPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/mypreferenceswebclient.js b/dashboard-ui/scripts/mypreferenceswebclient.js
index aab149c7a2..48bade203c 100644
--- a/dashboard-ui/scripts/mypreferenceswebclient.js
+++ b/dashboard-ui/scripts/mypreferenceswebclient.js
@@ -41,7 +41,7 @@
         ApiClient.updateDisplayPreferences('home', displayPreferences, userId, 'webclient').done(function () {
 
             Dashboard.alert(Globalize.translate('SettingsSaved'));
-
+            Dashboard.hideLoadingMsg();
         });
     }
 
diff --git a/dashboard-ui/scripts/nowplayingpage.js b/dashboard-ui/scripts/nowplayingpage.js
index 17e00add2e..3ec6cf54cf 100644
--- a/dashboard-ui/scripts/nowplayingpage.js
+++ b/dashboard-ui/scripts/nowplayingpage.js
@@ -722,7 +722,7 @@
         $('.sendMessageForm').off('submit', NowPlayingPage.onMessageSubmit).on('submit', NowPlayingPage.onMessageSubmit);
         $('.typeTextForm').off('submit', NowPlayingPage.onSendStringSubmit).on('submit', NowPlayingPage.onSendStringSubmit);
 
-    }).on('pageshowready', "#nowPlayingPage", function () {
+    }).on('pagebeforeshowready', "#nowPlayingPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/photos.js b/dashboard-ui/scripts/photos.js
index 328166f603..16b75cc61b 100644
--- a/dashboard-ui/scripts/photos.js
+++ b/dashboard-ui/scripts/photos.js
@@ -282,7 +282,7 @@
             reloadItems(page);
         });
 
-    }).on('pageshowready', "#photosPage", function () {
+    }).on('pagebeforeshowready', "#photosPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/playlistedit.js b/dashboard-ui/scripts/playlistedit.js
index 5cb5d5ee4b..c3517ce2ae 100644
--- a/dashboard-ui/scripts/playlistedit.js
+++ b/dashboard-ui/scripts/playlistedit.js
@@ -81,8 +81,9 @@
                 startIndex: query.StartIndex,
                 limit: query.Limit,
                 totalRecordCount: result.TotalRecordCount,
-                viewButton: true,
-                showLimit: false
+                showLimit: false,
+                updatePageSizeSetting: false
+
             })).trigger('create');
 
             updateFilterControls(page);
@@ -171,20 +172,12 @@
         }).checkboxradio('refresh');
 
         $('#selectView', page).val(view).selectmenu('refresh');
-
-        $('#selectPageSize', page).val(query.Limit).selectmenu('refresh');
     }
 
     $(document).on('pageinitdepends', "#playlistEditorPage", function () {
 
         var page = this;
 
-        $('#selectPageSize', page).on('change', function () {
-            query.Limit = parseInt(this.value);
-            query.StartIndex = 0;
-            reloadItems(page);
-        });
-
         $('.btnPlay', page).on('click', function () {
             var userdata = currentItem.UserData || {};
 
@@ -215,7 +208,7 @@
 
         });
 
-    }).on('pageshowready', "#playlistEditorPage", function () {
+    }).on('pagebeforeshowready', "#playlistEditorPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/playlists.js b/dashboard-ui/scripts/playlists.js
index f834e77eac..7fb95735c9 100644
--- a/dashboard-ui/scripts/playlists.js
+++ b/dashboard-ui/scripts/playlists.js
@@ -183,7 +183,7 @@
             reloadItems(page);
         });
 
-    }).on('pageshowready', "#playlistsPage", function () {
+    }).on('pagebeforeshowready', "#playlistsPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/sections.js b/dashboard-ui/scripts/sections.js
index b512f270d8..33cd511db6 100644
--- a/dashboard-ui/scripts/sections.js
+++ b/dashboard-ui/scripts/sections.js
@@ -321,13 +321,11 @@
 
     function handleLibraryLinkNavigations(elem) {
 
-        $('a.posterItem', elem).on('click', function () {
+        $('a', elem).on('click', function () {
 
-            var textElem = $('.posterItemText span', this);
+            var card = $(this).parents('.card');
+            var textElem = $('.cardText', card);
 
-            if (!textElem.length) {
-                textElem = $('.posterItemText', this);
-            }
             var text = textElem.html();
 
             LibraryMenu.setText(text);
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index 27984de668..3b311b13f2 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -50,7 +50,7 @@ var Dashboard = {
 
         $.event.special.swipe.verticalDistanceThreshold = 40;
         $.mobile.loader.prototype.options.disabled = true;
-        $.mobile.page.prototype.options.domCache = true;
+        //$.mobile.page.prototype.options.domCache = true;
 
         $.mobile.loadingMessage = false;
         $.mobile.loader.prototype.options.html = "";
@@ -1735,6 +1735,10 @@ var AppInfo = {};
 
         window.ConnectionManager = new MediaBrowser.ConnectionManager(Logger, credentialProvider, AppInfo.appName, AppInfo.appVersion, AppInfo.deviceName, AppInfo.deviceId, capabilities);
 
+        if (getWindowUrl().toLowerCase().indexOf('wizardstart.html') != -1) {
+            window.ConnectionManager.clearData();
+        }
+
         $(ConnectionManager).on('apiclientcreated', function (e, newApiClient) {
 
             initializeApiClient(newApiClient);
@@ -1795,6 +1799,8 @@ var AppInfo = {};
 
         if (AppInfo.isTouchPreferred) {
             elem.addClass('touch');
+        } else {
+            elem.addClass('pointerInput');
         }
 
         if (AppInfo.cardMargin) {
@@ -1829,8 +1835,13 @@ var AppInfo = {};
     function onDocumentReady() {
 
         // Do these now to prevent a flash of content
-        if (AppInfo.isNativeApp && $.browser.safari) {
-            Dashboard.importCss('themes/ios.css');
+        if (AppInfo.isNativeApp) {
+            if ($.browser.android) {
+                Dashboard.importCss('themes/android.css');
+            }
+            else if ($.browser.safari) {
+                Dashboard.importCss('themes/ios.css');
+            }
         }
 
         if ($.browser.safari && $.browser.mobile) {
@@ -2038,6 +2049,7 @@ var AppInfo = {};
             Dashboard.importCss('thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.icons.css');
             return {};
         });
+        define("actionsheet", ["scripts/actionsheet"]);
 
         //requirejs(['http://viblast.com/player/free-version/qy2fdwajo1/viblast.js']);
 
diff --git a/dashboard-ui/scripts/songs.js b/dashboard-ui/scripts/songs.js
index de696a1ff7..9c60835826 100644
--- a/dashboard-ui/scripts/songs.js
+++ b/dashboard-ui/scripts/songs.js
@@ -174,7 +174,7 @@
             reloadItems(page);
         });
 
-    }).on('pageshowready', "#songsPage", function () {
+    }).on('pagebeforeshowready', "#songsPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/tvgenres.js b/dashboard-ui/scripts/tvgenres.js
index d9ebc4cb8d..0c0aa3b4eb 100644
--- a/dashboard-ui/scripts/tvgenres.js
+++ b/dashboard-ui/scripts/tvgenres.js
@@ -169,7 +169,7 @@
             LibraryBrowser.saveViewSetting(getSavedQueryKey(), view);
         });
 
-    }).on('pageshowready', "#tvGenresPage", function () {
+    }).on('pagebeforeshowready', "#tvGenresPage", function () {
 
         query.ParentId = LibraryMenu.getTopParentId();
         var page = this;
diff --git a/dashboard-ui/scripts/tvlatest.js b/dashboard-ui/scripts/tvlatest.js
index a6b2643ece..ab673fd518 100644
--- a/dashboard-ui/scripts/tvlatest.js
+++ b/dashboard-ui/scripts/tvlatest.js
@@ -5,7 +5,7 @@
         return 'Thumb';
     }
 
-    $(document).on('pageshowready', "#tvNextUpPage", function () {
+    $(document).on('pagebeforeshowready', "#tvNextUpPage", function () {
 
         var userId = Dashboard.getCurrentUserId();
 
diff --git a/dashboard-ui/scripts/tvpeople.js b/dashboard-ui/scripts/tvpeople.js
index f846e679f9..06220ad0f7 100644
--- a/dashboard-ui/scripts/tvpeople.js
+++ b/dashboard-ui/scripts/tvpeople.js
@@ -147,7 +147,7 @@
             reloadItems(page);
         });
 
-    }).on('pageshowready', "#tvPeoplePage", function () {
+    }).on('pagebeforeshowready', "#tvPeoplePage", function () {
 
         query.ParentId = LibraryMenu.getTopParentId();
 
diff --git a/dashboard-ui/scripts/tvshows.js b/dashboard-ui/scripts/tvshows.js
index c01ff8c2ba..0c132dfa08 100644
--- a/dashboard-ui/scripts/tvshows.js
+++ b/dashboard-ui/scripts/tvshows.js
@@ -360,7 +360,7 @@
             reloadItems(page);
         });
 
-    }).on('pageshowready', "#tvShowsPage", function () {
+    }).on('pagebeforeshowready', "#tvShowsPage", function () {
 
         query.ParentId = LibraryMenu.getTopParentId();
 
diff --git a/dashboard-ui/scripts/tvstudios.js b/dashboard-ui/scripts/tvstudios.js
index 1fea2042de..202d7d4513 100644
--- a/dashboard-ui/scripts/tvstudios.js
+++ b/dashboard-ui/scripts/tvstudios.js
@@ -108,7 +108,7 @@
             reloadItems(page);
         });
 
-    }).on('pageshowready', "#tvStudiosPage", function () {
+    }).on('pagebeforeshowready', "#tvStudiosPage", function () {
 
         query.ParentId = LibraryMenu.getTopParentId();
 
diff --git a/dashboard-ui/selectserver.html b/dashboard-ui/selectserver.html
index f7eac4065b..a2d2b6798e 100644
--- a/dashboard-ui/selectserver.html
+++ b/dashboard-ui/selectserver.html
@@ -6,8 +6,6 @@
 <body>
     <div id="selectServerPage" data-role="page" class="page libraryPage noSecondaryNavPage" data-theme="b" data-require="scripts/selectserver,paperbuttonstyle">
 
-        <link rel="import" href="thirdparty/paper-button/paper-button.html">
-
         <div data-role="content">
 
             <div class="ehsContent" style="margin: 0 auto;">
diff --git a/dashboard-ui/themes/android.css b/dashboard-ui/themes/android.css
new file mode 100644
index 0000000000..7ca8f3e7b2
--- /dev/null
+++ b/dashboard-ui/themes/android.css
@@ -0,0 +1,15 @@
+.viewMenuBar, .libraryViewNav {
+    background-color: #181818;
+}
+
+.ui-page-theme-b {
+    background-color: #282828;
+}
+
+.backdropPage.ui-page-theme-b {
+    background-color: rgba(20, 20,20, .94) !important;
+}
+
+.defaultBackground .cardImage {
+    background-color: #383838;
+}
\ No newline at end of file
diff --git a/dashboard-ui/themes/ios.css b/dashboard-ui/themes/ios.css
index c22ae5c594..175d3cdc09 100644
--- a/dashboard-ui/themes/ios.css
+++ b/dashboard-ui/themes/ios.css
@@ -8,6 +8,10 @@
     background-color: rgba(28,28,28,.97);
 }
 
+.backdropPage.ui-page-theme-b {
+    background-color: rgba(28,28,28,.92) !important;
+}
+
 .ui-page-theme-b {
     background-color: #1c1c1c;
 }
@@ -130,3 +134,15 @@ h1, h1 a {
 .libraryViewNav a:not(.ui-btn-active):hover {
     color: #539FFD !important;
 }
+
+@media (min-width: 600px) {
+
+    /* This needs a little extra space to account for the longer date format */
+    .channelHeaderCell, .channelTimeslotHeader {
+        width: 209px;
+    }
+
+    .programGrid, .timeslotHeaders {
+        margin-left: 210px;
+    }
+}
diff --git a/dashboard-ui/thirdparty/apiclient/connectionmanager.js b/dashboard-ui/thirdparty/apiclient/connectionmanager.js
index 709e1a89e2..6d9162ec12 100644
--- a/dashboard-ui/thirdparty/apiclient/connectionmanager.js
+++ b/dashboard-ui/thirdparty/apiclient/connectionmanager.js
@@ -171,7 +171,6 @@
             });
 
             var existingServer = existingServers.length ? existingServers[0] : {};
-
             existingServer.DateLastAccessed = new Date().getTime();
             existingServer.LastConnectionMode = MediaBrowser.ConnectionMode.Manual;
             existingServer.ManualAddress = apiClient.serverAddress();
@@ -204,6 +203,18 @@
             });
         };
 
+        self.clearData = function () {
+
+            logger.log('connection manager clearing data');
+
+            connectUser = null;
+            var credentials = credentialProvider.credentials();
+            credentials.ConnectAccessToken = null;
+            credentials.ConnectUserId = null;
+            credentials.Servers = [];
+            credentialProvider.credentials(credentials);
+        };
+
         function onConnectUserSignIn(user) {
 
             connectUser = user;
diff --git a/dashboard-ui/thirdparty/cordova/chromecast.js b/dashboard-ui/thirdparty/cordova/chromecast.js
index f7ee4cf26a..1590f953ae 100644
--- a/dashboard-ui/thirdparty/cordova/chromecast.js
+++ b/dashboard-ui/thirdparty/cordova/chromecast.js
@@ -634,14 +634,13 @@
 
         $(MediaController).on('playerchange', function (e, newPlayer, newTarget) {
 
-            if (currentDevice) {
-                if (newTarget.id != currentDeviceId) {
-                    if (currentWebAppSession) {
-                        console.log('Disconnecting from chromecast');
-                        //currentDevice.disconnect();
-                        currentDevice = null;
-                        currentDeviceId = null;
-                    }
+            if (newTarget.id != currentDeviceId) {
+                if (currentWebAppSession) {
+                    console.log('Disconnecting from chromecast');
+                    //currentDevice.disconnect();
+                    cleanupSession();
+                    currentDevice = null;
+                    currentDeviceId = null;
                 }
             }
         });
@@ -657,9 +656,7 @@
             }
         }
 
-        if (!$.browser.safari) {
-            document.addEventListener("resume", onResume, false);
-        }
+        document.addEventListener("resume", onResume, false);
     }
 
     MediaController.registerPlayer(new chromecastPlayer());
diff --git a/dashboard-ui/thirdparty/cordova/generaldevice.js b/dashboard-ui/thirdparty/cordova/generaldevice.js
index 5943ae1a76..ce035f1966 100644
--- a/dashboard-ui/thirdparty/cordova/generaldevice.js
+++ b/dashboard-ui/thirdparty/cordova/generaldevice.js
@@ -647,6 +647,7 @@
                     if (currentDevice) {
                         console.log('Disconnecting from connect device');
                         //currentDevice.disconnect();
+                        cleanupSession();
                         currentDevice = null;
                         currentDeviceId = null;
                         currentMediaControl = null;
diff --git a/dashboard-ui/thirdparty/iron-icons/emby-icons.html b/dashboard-ui/thirdparty/iron-icons/emby-icons.html
index 34d7bde822..7beff542b3 100644
--- a/dashboard-ui/thirdparty/iron-icons/emby-icons.html
+++ b/dashboard-ui/thirdparty/iron-icons/emby-icons.html
@@ -38,6 +38,7 @@ See [iron-iconset](#iron-iconset) and [iron-iconset-svg](#iron-iconset-svg) for
 <g id="add"><path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/></g>
 <g id="check"><path d="M9 16.17L4.83 12l-1.42 1.41L9 19 21 7l-1.41-1.41z" /></g>
 <g id="close"><path d="M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12z" /></g>
+         <g id="add"><path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" /></g>
          <g id="arrow-back"><path d="M20 11H7.83l5.59-5.59L12 4l-8 8 8 8 1.41-1.41L7.83 13H20v-2z" /></g>
          <g id="arrow-forward"><path d="M12 4l-1.41 1.41L16.17 11H4v2h12.17l-5.58 5.59L12 20l8-8z" /></g>
          <g id="info"><path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm1 15h-2v-6h2v6zm0-8h-2V7h2v2z" /></g>
@@ -48,5 +49,9 @@ See [iron-iconset](#iron-iconset) and [iron-iconset-svg](#iron-iconset-svg) for
          <g id="folder-open"><path d="M20 6h-8l-2-2H4c-1.1 0-1.99.9-1.99 2L2 18c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V8c0-1.1-.9-2-2-2zm0 12H4V8h16v10z" /></g>
          <g id="mode-edit"><path d="M3 17.25V21h3.75L17.81 9.94l-3.75-3.75L3 17.25zM20.71 7.04c.39-.39.39-1.02 0-1.41l-2.34-2.34c-.39-.39-1.02-.39-1.41 0l-1.83 1.83 3.75 3.75 1.83-1.83z" /></g>
          <g id="more-vert"><path d="M12 8c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2zm0 2c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2zm0 6c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2z" /></g>
+         <g id="cast"><path d="M21 3H3c-1.1 0-2 .9-2 2v3h2V5h18v14h-7v2h7c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zM1 18v3h3c0-1.66-1.34-3-3-3zm0-4v2c2.76 0 5 2.24 5 5h2c0-3.87-3.13-7-7-7zm0-4v2c4.97 0 9 4.03 9 9h2c0-6.08-4.93-11-11-11z" /></g>
+         <g id="cast-connected"><path d="M1 18v3h3c0-1.66-1.34-3-3-3zm0-4v2c2.76 0 5 2.24 5 5h2c0-3.87-3.13-7-7-7zm18-7H5v1.63c3.96 1.28 7.09 4.41 8.37 8.37H19V7zM1 10v2c4.97 0 9 4.03 9 9h2c0-6.08-4.93-11-11-11zm20-7H3c-1.1 0-2 .9-2 2v3h2V5h18v14h-7v2h7c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2z" /></g>
+         <g id="tablet-android"><path d="M18 0H6C4.34 0 3 1.34 3 3v18c0 1.66 1.34 3 3 3h12c1.66 0 3-1.34 3-3V3c0-1.66-1.34-3-3-3zm-4 22h-4v-1h4v1zm5.25-3H4.75V3h14.5v16z" /></g>
+         <g id="view-comfy"><path d="M3 9h4V5H3v4zm0 5h4v-4H3v4zm5 0h4v-4H8v4zm5 0h4v-4h-4v4zM8 9h4V5H8v4zm5-4v4h4V5h-4zm5 9h4v-4h-4v4zM3 19h4v-4H3v4zm5 0h4v-4H8v4zm5 0h4v-4h-4v4zm5 0h4v-4h-4v4zm0-14v4h4V5h-4z" /></g>
      </defs></svg>
 </iron-iconset-svg>
diff --git a/dashboard-ui/thirdparty/jquery.unveil-custom.js b/dashboard-ui/thirdparty/jquery.unveil-custom.js
index b7ff745df2..3bb47b54c4 100644
--- a/dashboard-ui/thirdparty/jquery.unveil-custom.js
+++ b/dashboard-ui/thirdparty/jquery.unveil-custom.js
@@ -20,7 +20,7 @@
         // Need to fix those before this can be set to 0
 
         if (window.AppInfo && AppInfo.isNativeApp && $.browser.safari) {
-            return 10000;
+            return 8000;
         }
 
         var screens = $.browser.mobile ? 2 : 1;
diff --git a/dashboard-ui/thirdparty/paper-button/paper-button-style.css b/dashboard-ui/thirdparty/paper-button/paper-button-style.css
index 0c97bb8655..7a9d347fde 100644
--- a/dashboard-ui/thirdparty/paper-button/paper-button-style.css
+++ b/dashboard-ui/thirdparty/paper-button/paper-button-style.css
@@ -55,11 +55,11 @@
     }
 
 .ui-page-theme-b paper-button.subdued:not([disabled]) {
-    color: #555;
+    color: #484848;
 }
 
 .ui-page-theme-b paper-button[raised].subdued:not([disabled]) {
-    background: #555;
+    background: #484848;
     color: #fff;
 }
 
diff --git a/dashboard-ui/thirdparty/paper-fab/paper-fab.html b/dashboard-ui/thirdparty/paper-fab/paper-fab.html
new file mode 100644
index 0000000000..f607ca4711
--- /dev/null
+++ b/dashboard-ui/thirdparty/paper-fab/paper-fab.html
@@ -0,0 +1,175 @@
+<!--
+@license
+Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+Code distributed by Google as part of the polymer project is also
+subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+-->
+
+<link rel="import" href="../polymer/polymer.html">
+<link rel="import" href="../iron-icon/iron-icon.html">
+<link rel="import" href="../iron-flex-layout/classes/iron-flex-layout.html">
+<link rel="import" href="../paper-styles/default-theme.html">
+<link rel="import" href="../paper-styles/color.html">
+<link rel="import" href="../paper-material/paper-material.html">
+<link rel="import" href="../paper-ripple/paper-ripple.html">
+<link rel="import" href="../paper-behaviors/paper-button-behavior.html">
+
+<!--
+Material Design: <a href="http://www.google.com/design/spec/components/buttons.html">Button</a>
+
+`paper-fab` is a floating action button. It contains an image placed in the center and
+comes in two sizes: regular size and a smaller size by applying the attribute `mini`. When
+the user touches the button, a ripple effect emanates from the center of the button.
+
+You may import `iron-icons` to use with this element, or provide a URL to a custom icon.
+See `iron-iconset` for more information about how to use a custom icon set.
+
+Example:
+
+    <link href="path/to/iron-icons/iron-icons.html" rel="import">
+
+    <paper-fab icon="add"></paper-fab>
+    <paper-fab mini icon="favorite"></paper-fab>
+    <paper-fab src="star.png"></paper-fab>
+
+
+### Styling
+
+The following custom properties and mixins are available for styling:
+
+Custom property | Description | Default
+----------------|-------------|----------
+`--paper-fab-background` | The background color of the button | `--accent-color`
+`--paper-fab-keyboard-focus-background` | The background color of the button when focused | `--paper-pink-900`
+`--paper-fab-disabled-background` | The background color of the button when it's disabled | `--paper-grey-300`
+`--paper-fab-disabled-text` | The text color of the button when it's disabled | `--paper-grey-500`
+`--paper-fab` | Mixin applied to the button | `{}`
+`--paper-fab-mini` | Mixin applied to a mini button | `{}`
+`--paper-fab-disabled` | Mixin applied to a disabled button | `{}`
+
+@group Paper Elements
+@demo demo/index.html
+
+-->
+
+<dom-module id="paper-fab">
+  <style>
+
+    :host {
+      display: inline-block;
+      position: relative;
+      outline: none;
+      -moz-user-select: none;
+      -ms-user-select: none;
+      -webkit-user-select: none;
+      user-select: none;
+      cursor: pointer;
+
+      box-sizing: border-box;
+      min-width: 0;
+      width: 56px;
+      height: 56px;
+      background: var(--paper-fab-background, --accent-color);
+      color: var(--text-primary-color);
+      border-radius: 50%;
+      padding: 16px;
+
+      z-index: 0;
+
+      @apply(--paper-fab);
+    }
+
+    :host([mini]) {
+      width: 40px;
+      height: 40px;
+      padding: 8px;
+
+      @apply(--paper-fab-mini);
+    }
+
+    :host([disabled]) {
+      color: var(--paper-fab-disabled-text, --paper-grey-500);
+      background: var(--paper-fab-disabled-background, --paper-grey-300);
+      @apply(--paper-fab-disabled);
+    }
+
+    paper-material {
+      border-radius: inherit;
+      @apply(--layout-fit);
+      @apply(--layout-vertical);
+      @apply(--layout-center-center);
+    }
+
+    .keyboard-focus {
+      background: var(--paper-fab-keyboard-focus-background, --paper-pink-900);
+    }
+  </style>
+  <template>
+    <paper-ripple></paper-ripple>
+    <paper-material class$="[[_computeContentClass(receivedFocusFromKeyboard)]]" elevation="[[_elevation]]" animated>
+      <iron-icon id="icon" src="[[src]]" icon="[[icon]]"></iron-icon>
+    </paper-material>
+  </template>
+</dom-module>
+<script>
+  Polymer({
+    is: 'paper-fab',
+
+    behaviors: [
+      Polymer.PaperButtonBehavior
+    ],
+
+    properties: {
+      /**
+       * The URL of an image for the icon. If the src property is specified,
+       * the icon property should not be.
+       *
+       * @attribute src
+       * @type string
+       * @default ''
+       */
+      src: {
+        type: String,
+        value: ''
+      },
+
+      /**
+       * Specifies the icon name or index in the set of icons available in
+       * the icon's icon set. If the icon property is specified,
+       * the src property should not be.
+       *
+       * @attribute icon
+       * @type string
+       * @default ''
+       */
+      icon: {
+        type: String,
+        value: ''
+      },
+
+      /**
+       * Set this to true to style this is a "mini" FAB.
+       *
+       * @attribute mini
+       * @type boolean
+       * @default false
+       */
+      mini: {
+        type: Boolean,
+        value: false
+      }
+    },
+
+    _computeContentClass: function(receivedFocusFromKeyboard) {
+      var className = 'content';
+      if (receivedFocusFromKeyboard) {
+        className += ' keyboard-focus';
+      }
+      return className;
+    }
+
+  });
+</script>
diff --git a/dashboard-ui/tvlatest.html b/dashboard-ui/tvlatest.html
index f4920aa1d0..5b44d5efe4 100644
--- a/dashboard-ui/tvlatest.html
+++ b/dashboard-ui/tvlatest.html
@@ -5,7 +5,6 @@
 </head>
 <body>
     <div id="tvNextUpPage" data-role="page" class="page libraryPage backdropPage" data-backdroptype="series" data-require="scripts/tvlatest,paperbuttonstyle">
-        <link rel="import" href="thirdparty/paper-button/paper-button.html">
 
         <div class="libraryViewNav scopedLibraryViewNav">
             <a href="tvrecommended.html"><i class="material-icons">info</i>${TabSuggestions}</a>
diff --git a/dashboard-ui/tvrecommended.html b/dashboard-ui/tvrecommended.html
index bdaedccf36..ca4e297173 100644
--- a/dashboard-ui/tvrecommended.html
+++ b/dashboard-ui/tvrecommended.html
@@ -6,8 +6,6 @@
 <body>
     <div id="tvRecommendedPage" data-role="page" class="page libraryPage backdropPage" data-backdroptype="series" data-require="scripts/tvrecommended,paperbuttonstyle">
 
-        <link rel="import" href="thirdparty/paper-button/paper-button.html">
-
         <div class="libraryViewNav globalNav" style="display: none;">
             <a href="index.html"><i class="material-icons">home</i>${TabHome}</a>
             <a href="homelatest.html"><i class="material-icons">new_releases</i>${TabLatest}</a>
diff --git a/dashboard-ui/wizardstart.html b/dashboard-ui/wizardstart.html
index 4c60a188bd..15e17b8ca8 100644
--- a/dashboard-ui/wizardstart.html
+++ b/dashboard-ui/wizardstart.html
@@ -6,8 +6,6 @@
 <body>
     <div id="wizardStartPage" data-role="page" class="page standalonePage wizardPage" data-require="scripts/wizardstartpage,paperbuttonstyle">
 
-        <link rel="import" href="thirdparty/paper-button/paper-button.html">
-
         <div data-role="content">
 
             <div class="ui-corner-all ui-shadow wizardContent" style="position:relative;">