From 9ea282ff394e654b0518f5abba490eb170daf926 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Tue, 1 Sep 2015 10:01:59 -0400
Subject: [PATCH] update tabs

---
 .../bower_components/iron-icon/.bower.json    |   8 +-
 .../bower_components/iron-icon/bower.json     |   2 +-
 .../bower_components/iron-icon/iron-icon.html |   8 +-
 .../paper-radio-button/.bower.json            |  11 +-
 .../paper-radio-button/bower.json             |   5 +-
 .../paper-radio-button/paper-radio-button.css |   3 +-
 .../paper-radio-button.html                   |  60 +++----
 .../paper-radio-button/test/basic.html        |  28 ++--
 .../paper-toggle-button/.bower.json           |  17 +-
 .../paper-toggle-button/bower.json            |  11 +-
 .../paper-toggle-button.css                   | 113 -------------
 .../paper-toggle-button.html                  | 153 +++++++++++++-----
 .../paper-toggle-button/test/basic.html       |  26 +--
 dashboard-ui/channels.html                    |   2 +-
 dashboard-ui/edititemmetadata.html            |   2 +-
 dashboard-ui/index.html                       |   2 +-
 dashboard-ui/livetv.html                      |   2 +-
 dashboard-ui/movies.html                      |   2 +-
 dashboard-ui/nowplaying.html                  |   2 +-
 dashboard-ui/photos.html                      |   2 +-
 dashboard-ui/scripts/addpluginpage.js         |   2 +-
 .../scripts/advancedconfigurationpage.js      |   2 +-
 dashboard-ui/scripts/alphapicker.js           |   2 +-
 dashboard-ui/scripts/autoorganizelog.js       |   2 +-
 dashboard-ui/scripts/autoorganizetv.js        |   2 +-
 dashboard-ui/scripts/channelitems.js          |   2 +-
 dashboard-ui/scripts/channels.js              |   2 +-
 dashboard-ui/scripts/channelsettings.js       |   2 +-
 dashboard-ui/scripts/channelslatest.js        |   2 +-
 .../scripts/cinemamodeconfiguration.js        |   2 +-
 dashboard-ui/scripts/collectioneditor.js      |   2 +-
 dashboard-ui/scripts/connectlogin.js          |   2 +-
 dashboard-ui/scripts/dashboardgeneral.js      |   2 +-
 dashboard-ui/scripts/dashboardhosting.js      |   2 +-
 dashboard-ui/scripts/dashboardpage.js         |   2 +-
 dashboard-ui/scripts/device.js                |   2 +-
 dashboard-ui/scripts/devicesupload.js         |   2 +-
 dashboard-ui/scripts/dlnaprofile.js           |   2 +-
 dashboard-ui/scripts/dlnaserversettings.js    |   2 +-
 dashboard-ui/scripts/dlnasettings.js          |   2 +-
 dashboard-ui/scripts/editcollectionitems.js   |   2 +-
 dashboard-ui/scripts/edititemimages.js        |   2 +-
 dashboard-ui/scripts/edititemmetadata.js      |   2 +-
 dashboard-ui/scripts/edititemsubtitles.js     |   2 +-
 dashboard-ui/scripts/editorsidebar.js         |   2 +-
 dashboard-ui/scripts/encodingsettings.js      |   2 +-
 dashboard-ui/scripts/episodes.js              |   2 +-
 dashboard-ui/scripts/forgotpassword.js        |   2 +-
 dashboard-ui/scripts/forgotpasswordpin.js     |   2 +-
 dashboard-ui/scripts/gamegenrepage.js         |   2 +-
 dashboard-ui/scripts/gamespage.js             |   2 +-
 dashboard-ui/scripts/gamestudiospage.js       |   2 +-
 dashboard-ui/scripts/indexpage.js             |   2 +-
 dashboard-ui/scripts/itemdetailpage.js        |   2 +-
 dashboard-ui/scripts/itemlistpage.js          |   2 +-
 dashboard-ui/scripts/kids.js                  |   2 +-
 dashboard-ui/scripts/librarybrowser.js        |  23 ++-
 dashboard-ui/scripts/librarylist.js           |   2 +-
 dashboard-ui/scripts/librarypathmapping.js    |   2 +-
 dashboard-ui/scripts/librarysettings.js       |   2 +-
 dashboard-ui/scripts/livetvitems.js           |   2 +-
 dashboard-ui/scripts/livetvnewrecording.js    |   2 +-
 dashboard-ui/scripts/livetvrecordinglist.js   |   2 +-
 dashboard-ui/scripts/livetvseriestimer.js     |   2 +-
 dashboard-ui/scripts/livetvsettings.js        |   2 +-
 dashboard-ui/scripts/livetvstatus.js          |   2 +-
 dashboard-ui/scripts/livetvsuggested.js       |   2 +-
 dashboard-ui/scripts/livetvtimer.js           |   2 +-
 .../scripts/livetvtunerprovider-hdhomerun.js  |   2 +-
 .../scripts/livetvtunerprovider-m3u.js        |   2 +-
 dashboard-ui/scripts/loginpage.js             |   2 +-
 dashboard-ui/scripts/medialibrarypage.js      |   2 +-
 dashboard-ui/scripts/metadataadvanced.js      |   2 +-
 .../scripts/metadataconfigurationpage.js      |   2 +-
 dashboard-ui/scripts/metadataimagespage.js    |   2 +-
 dashboard-ui/scripts/metadatanfo.js           |   2 +-
 dashboard-ui/scripts/metadatasubtitles.js     |   2 +-
 dashboard-ui/scripts/moviecollections.js      |   2 +-
 dashboard-ui/scripts/moviesrecommended.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/musicvideos.js           |   2 +-
 dashboard-ui/scripts/mypreferencesdisplay.js  |   2 +-
 dashboard-ui/scripts/mypreferenceshome.js     |   2 +-
 .../scripts/mypreferenceslanguages.js         |   2 +-
 dashboard-ui/scripts/myprofile.js             |   4 +-
 dashboard-ui/scripts/mysync.js                |   2 +-
 dashboard-ui/scripts/mysyncsettings.js        |   2 +-
 dashboard-ui/scripts/notificationsetting.js   |   2 +-
 dashboard-ui/scripts/nowplayingpage.js        |   2 +-
 dashboard-ui/scripts/photos.js                |   2 +-
 dashboard-ui/scripts/playbackconfiguration.js |   2 +-
 dashboard-ui/scripts/plugincatalogpage.js     |   2 +-
 dashboard-ui/scripts/reports.js               |   2 +-
 dashboard-ui/scripts/scheduledtaskpage.js     |   2 +-
 dashboard-ui/scripts/scheduledtaskspage.js    |   2 +-
 dashboard-ui/scripts/secondaryitems.js        |   2 +-
 dashboard-ui/scripts/selectserver.js          |   2 +-
 dashboard-ui/scripts/serversecurity.js        |   2 +-
 dashboard-ui/scripts/shared.js                |   2 +-
 dashboard-ui/scripts/site.js                  |  10 +-
 dashboard-ui/scripts/songs.js                 |   2 +-
 dashboard-ui/scripts/streamingsettings.js     |   2 +-
 dashboard-ui/scripts/supporterkeypage.js      |   2 +-
 dashboard-ui/scripts/supporterpage.js         |   2 +-
 dashboard-ui/scripts/sync.js                  |   2 +-
 dashboard-ui/scripts/syncjob.js               |   2 +-
 dashboard-ui/scripts/syncsettings.js          |   2 +-
 dashboard-ui/scripts/tvpeople.js              |   2 +-
 dashboard-ui/scripts/tvshows.js               |   2 +-
 dashboard-ui/scripts/useredit.js              |   2 +-
 dashboard-ui/scripts/userlibraryaccess.js     |   2 +-
 dashboard-ui/scripts/usernew.js               |   2 +-
 dashboard-ui/scripts/userparentalcontrol.js   |   2 +-
 dashboard-ui/scripts/userpassword.js          |   2 +-
 dashboard-ui/scripts/userprofilespage.js      |   2 +-
 dashboard-ui/scripts/wizardagreement.js       |   2 +-
 dashboard-ui/scripts/wizardfinishpage.js      |   2 +-
 dashboard-ui/scripts/wizardlivetvguide.js     |   2 +-
 dashboard-ui/scripts/wizardlivetvtuner.js     |   2 +-
 dashboard-ui/scripts/wizardservice.js         |   2 +-
 dashboard-ui/scripts/wizardsettings.js        |   2 +-
 dashboard-ui/scripts/wizardstartpage.js       |   2 +-
 dashboard-ui/scripts/wizarduserpage.js        |   2 +-
 dashboard-ui/thirdparty/emby-icons.html       |   1 +
 .../thirdparty/paper-button-style.css         |  15 +-
 dashboard-ui/vulcanize-out.html               |  71 ++++----
 129 files changed, 371 insertions(+), 418 deletions(-)
 delete mode 100644 dashboard-ui/bower_components/paper-toggle-button/paper-toggle-button.css

diff --git a/dashboard-ui/bower_components/iron-icon/.bower.json b/dashboard-ui/bower_components/iron-icon/.bower.json
index 9691e0c3aa..1c3ecd9d63 100644
--- a/dashboard-ui/bower_components/iron-icon/.bower.json
+++ b/dashboard-ui/bower_components/iron-icon/.bower.json
@@ -1,7 +1,7 @@
 {
   "name": "iron-icon",
   "private": true,
-  "version": "1.0.3",
+  "version": "1.0.4",
   "license": "http://polymer.github.io/LICENSE.txt",
   "description": "An element that supports displaying an icon",
   "main": "iron-icon.html",
@@ -31,11 +31,11 @@
     "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
   },
   "homepage": "https://github.com/polymerelements/iron-icon",
-  "_release": "1.0.3",
+  "_release": "1.0.4",
   "_resolution": {
     "type": "version",
-    "tag": "v1.0.3",
-    "commit": "818c2d2af2d3287a444e4cf0a19c2b5717d480e8"
+    "tag": "v1.0.4",
+    "commit": "5a5e6cad097561ff9d182ad2b8e20bb822d6f640"
   },
   "_source": "git://github.com/polymerelements/iron-icon.git",
   "_target": "^1.0.0",
diff --git a/dashboard-ui/bower_components/iron-icon/bower.json b/dashboard-ui/bower_components/iron-icon/bower.json
index 0d1c50bbc8..e51ec4651b 100644
--- a/dashboard-ui/bower_components/iron-icon/bower.json
+++ b/dashboard-ui/bower_components/iron-icon/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "iron-icon",
   "private": true,
-  "version": "1.0.3",
+  "version": "1.0.4",
   "license": "http://polymer.github.io/LICENSE.txt",
   "description": "An element that supports displaying an icon",
   "main": "iron-icon.html",
diff --git a/dashboard-ui/bower_components/iron-icon/iron-icon.html b/dashboard-ui/bower_components/iron-icon/iron-icon.html
index 1b2f57febb..b7dedd14b8 100644
--- a/dashboard-ui/bower_components/iron-icon/iron-icon.html
+++ b/dashboard-ui/bower_components/iron-icon/iron-icon.html
@@ -92,7 +92,6 @@ Custom property | Description | Default
   </style>
 
   <template>
-    <iron-meta id="meta" type="iconset"></iron-meta>
   </template>
 
   <script>
@@ -129,7 +128,12 @@ Custom property | Description | Default
         src: {
           type: String,
           observer: '_srcChanged'
+        },
+        
+        _meta: {
+          value: Polymer.Base.create('iron-meta', {type: 'iconset'})
         }
+        
       },
 
       _DEFAULT_ICONSET: 'icons',
@@ -153,7 +157,7 @@ Custom property | Description | Default
       _updateIcon: function() {
         if (this._usesIconset()) {
           if (this._iconsetName) {
-            this._iconset = this.$.meta.byKey(this._iconsetName);
+            this._iconset = this._meta.byKey(this._iconsetName);
             if (this._iconset) {
               this._iconset.applyIcon(this, this._iconName, this.theme);
             } else {
diff --git a/dashboard-ui/bower_components/paper-radio-button/.bower.json b/dashboard-ui/bower_components/paper-radio-button/.bower.json
index f3116b9722..33b56a8d97 100644
--- a/dashboard-ui/bower_components/paper-radio-button/.bower.json
+++ b/dashboard-ui/bower_components/paper-radio-button/.bower.json
@@ -1,6 +1,6 @@
 {
   "name": "paper-radio-button",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "description": "A material design radio button",
   "authors": [
     "The Polymer Authors"
@@ -23,20 +23,21 @@
     "paper-ripple": "PolymerElements/paper-ripple#^1.0.0",
     "paper-styles": "PolymerLabs/paper-styles#^1.0.0",
     "paper-behaviors": "PolymerElements/paper-behaviors#^1.0.0",
+    "iron-checked-element-behavior": "PolymerElements/iron-checked-element-behavior#^1.0.0",
     "polymer": "Polymer/polymer#^1.0.0"
   },
   "devDependencies": {
-    "web-component-tester": "*",
+    "web-component-tester": "Polymer/web-component-tester#^3.3.0",
     "iron-component-page": "PolymerElements/iron-component-page#^1.0.0",
     "test-fixture": "PolymerElements/test-fixture#^1.0.0",
     "iron-test-helpers": "PolymerElements/iron-test-helpers#^1.0.0",
     "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
   },
-  "_release": "1.0.6",
+  "_release": "1.0.7",
   "_resolution": {
     "type": "version",
-    "tag": "v1.0.6",
-    "commit": "85e8553c117d9ad10e7faa8d94f815455a675bd3"
+    "tag": "v1.0.7",
+    "commit": "63a78475ecc28dfbc849e63001f0c8d001811e44"
   },
   "_source": "git://github.com/PolymerElements/paper-radio-button.git",
   "_target": "~1.0.5",
diff --git a/dashboard-ui/bower_components/paper-radio-button/bower.json b/dashboard-ui/bower_components/paper-radio-button/bower.json
index 675da7a995..2e406ff58f 100644
--- a/dashboard-ui/bower_components/paper-radio-button/bower.json
+++ b/dashboard-ui/bower_components/paper-radio-button/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "paper-radio-button",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "description": "A material design radio button",
   "authors": [
     "The Polymer Authors"
@@ -23,10 +23,11 @@
     "paper-ripple": "PolymerElements/paper-ripple#^1.0.0",
     "paper-styles": "PolymerLabs/paper-styles#^1.0.0",
     "paper-behaviors": "PolymerElements/paper-behaviors#^1.0.0",
+    "iron-checked-element-behavior": "PolymerElements/iron-checked-element-behavior#^1.0.0",
     "polymer": "Polymer/polymer#^1.0.0"
   },
   "devDependencies": {
-    "web-component-tester": "*",
+    "web-component-tester": "Polymer/web-component-tester#^3.3.0",
     "iron-component-page": "PolymerElements/iron-component-page#^1.0.0",
     "test-fixture": "PolymerElements/test-fixture#^1.0.0",
     "iron-test-helpers": "PolymerElements/iron-test-helpers#^1.0.0",
diff --git a/dashboard-ui/bower_components/paper-radio-button/paper-radio-button.css b/dashboard-ui/bower_components/paper-radio-button/paper-radio-button.css
index 01b378ae90..9ae301e50f 100644
--- a/dashboard-ui/bower_components/paper-radio-button/paper-radio-button.css
+++ b/dashboard-ui/bower_components/paper-radio-button/paper-radio-button.css
@@ -1,4 +1,5 @@
-/*
+/**
+@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
diff --git a/dashboard-ui/bower_components/paper-radio-button/paper-radio-button.html b/dashboard-ui/bower_components/paper-radio-button/paper-radio-button.html
index c7ea66d1fc..3e2ff7b8a6 100644
--- a/dashboard-ui/bower_components/paper-radio-button/paper-radio-button.html
+++ b/dashboard-ui/bower_components/paper-radio-button/paper-radio-button.html
@@ -11,6 +11,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 <link rel="import" href="../paper-ripple/paper-ripple.html">
 <link rel="import" href="../paper-styles/default-theme.html">
 <link rel="import" href="../paper-behaviors/paper-inky-focus-behavior.html">
+<link rel="import" href="../iron-checked-element-behavior/iron-checked-element-behavior.html">
 
 <!--
 `paper-radio-button` is a button that can be either checked or unchecked.
@@ -56,7 +57,7 @@ Custom property | Description | Default
       <paper-ripple id="ink" class="circle" center checked$="[[checked]]"></paper-ripple>
     </div>
 
-    <div id="radioLabel" aria-hidden="true"><content></content></div>
+    <div id="radioLabel"><content></content></div>
 
   </template>
 
@@ -65,7 +66,8 @@ Custom property | Description | Default
       is: 'paper-radio-button',
 
       behaviors: [
-        Polymer.PaperInkyFocusBehavior
+        Polymer.PaperInkyFocusBehavior,
+        Polymer.IronCheckedElementBehavior
       ],
 
       hostAttributes: {
@@ -87,38 +89,30 @@ Custom property | Description | Default
          * @event iron-change
          */
 
-        /**
-         * Gets or sets the state, `true` is checked and `false` is unchecked.
-         */
-        checked: {
-          type: Boolean,
-          value: false,
-          reflectToAttribute: true,
-          notify: true,
-          observer: '_checkedChanged'
-        },
-
-        /**
-         * If true, the button toggles the active state with each tap or press
-         * of the spacebar.
-         */
-        toggles: {
-          type: Boolean,
-          value: true,
-          reflectToAttribute: true
-        }
+         ariaActiveAttribute: {
+           value: 'aria-checked'
+         }
       },
 
       attached: function() {
-        var trimmedText = Polymer.dom(this).textContent.trim();
-        if (trimmedText === '') {
-          this.$.radioLabel.hidden = true;
-        }
-        // Don't stomp over a user-set aria-label.
-        if (trimmedText !== '' && !this.getAttribute('aria-label')) {
-          this.setAttribute('aria-label', trimmedText);
-        }
         this._isReady = true;
+
+        // Don't stomp over a user-set aria-label.
+        if (!this.getAttribute('aria-label')) {
+          this.updateAriaLabel();
+        }
+      },
+
+      /**
+       * Update the checkbox aria-label. This is a temporary workaround not
+       * being able to observe changes in <content>
+       * (see: https://github.com/Polymer/polymer/issues/1773)
+       *
+       * Call this if you manually change the contents of the checkbox
+       * and want the aria-label to match the new contents.
+       */
+      updateAriaLabel: function() {
+        this.setAttribute('aria-label', Polymer.dom(this).textContent.trim());
       },
 
       _buttonStateChanged: function() {
@@ -128,12 +122,6 @@ Custom property | Description | Default
         if (this._isReady) {
           this.checked = this.active;
         }
-      },
-
-      _checkedChanged: function() {
-        this.setAttribute('aria-checked', this.checked ? 'true' : 'false');
-        this.active = this.checked;
-        this.fire('iron-change');
       }
     })
   </script>
diff --git a/dashboard-ui/bower_components/paper-radio-button/test/basic.html b/dashboard-ui/bower_components/paper-radio-button/test/basic.html
index 903da5fe1b..54b7a3df6b 100644
--- a/dashboard-ui/bower_components/paper-radio-button/test/basic.html
+++ b/dashboard-ui/bower_components/paper-radio-button/test/basic.html
@@ -50,33 +50,35 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
         r1 = fixture('NoLabel');
       });
 
-      test('check button via click', function() {
+      test('check button via click', function(done) {
         r1.addEventListener('click', function() {
-          assert.isTrue(r1.getAttribute('aria-checked'));
+          assert.isTrue(r1.getAttribute('aria-checked') == 'true');
           assert.isTrue(r1.checked);
           done();
         });
-        MockInteractions.down(r1);
+        MockInteractions.tap(r1);
       });
 
-      test('toggle button via click', function() {
+      test('toggle button via click', function(done) {
         r1.checked = true;
         r1.addEventListener('click', function() {
-          assert.isFalse(r1.getAttribute('aria-checked'));
+          assert.isFalse(r1.getAttribute('aria-checked') == 'true');
           assert.isFalse(r1.checked);
           done();
         });
-        MockInteractions.down(r1);
+        MockInteractions.tap(r1);
       });
 
-      test('disabled button cannot be clicked', function() {
+      test('disabled button cannot be clicked', function(done) {
         r1.disabled = true;
-        r1.addEventListener('click', function() {
-          assert.isTrue(r1.getAttribute('aria-checked'));
+        r1.checked = true;
+        MockInteractions.tap(r1);
+
+        setTimeout(function() {
+          assert.isTrue(r1.getAttribute('aria-checked') == 'true');
           assert.isTrue(r1.checked);
           done();
-        });
-        MockInteractions.down(r1);
+        }, 1);
       });
     });
 
@@ -106,6 +108,10 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
         var c = fixture('AriaLabel');
         assert.isTrue(c.getAttribute('aria-label') == "Batman");
       });
+
+      a11ySuite('NoLabel');
+      a11ySuite('WithLabel');
+      a11ySuite('AriaLabel');
     });
   </script>
 </body>
diff --git a/dashboard-ui/bower_components/paper-toggle-button/.bower.json b/dashboard-ui/bower_components/paper-toggle-button/.bower.json
index 4dadfc1be0..15de9ff1f5 100644
--- a/dashboard-ui/bower_components/paper-toggle-button/.bower.json
+++ b/dashboard-ui/bower_components/paper-toggle-button/.bower.json
@@ -1,6 +1,6 @@
 {
   "name": "paper-toggle-button",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "description": "A material design toggle button control",
   "authors": [
     "The Polymer Authors"
@@ -20,24 +20,25 @@
   "homepage": "https://github.com/PolymerElements/paper-toggle-button",
   "ignore": [],
   "dependencies": {
+    "polymer": "Polymer/polymer#^1.1.0",
     "paper-ripple": "PolymerElements/paper-ripple#^1.0.0",
     "paper-styles": "PolymerElements/paper-styles#^1.0.0",
     "paper-behaviors": "PolymerElements/paper-behaviors#^1.0.0",
-    "polymer": "Polymer/polymer#^1.0.0"
+    "iron-checked-element-behavior": "PolymerElements/iron-checked-element-behavior#^1.0.0"
   },
   "devDependencies": {
-    "web-component-tester": "*",
+    "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0",
+    "web-component-tester": "Polymer/web-component-tester#^3.3.0",
     "test-fixture": "PolymerElements/test-fixture#^1.0.0",
     "iron-component-page": "PolymerElements/iron-component-page#^1.0.0",
     "iron-test-helpers": "PolymerElements/iron-test-helpers#^1.0.0",
-    "iron-flex-layout": "PolymerElements/iron-flex-layout#^1.0.0",
-    "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
+    "iron-flex-layout": "PolymerElements/iron-flex-layout#^1.0.0"
   },
-  "_release": "1.0.6",
+  "_release": "1.0.7",
   "_resolution": {
     "type": "version",
-    "tag": "v1.0.6",
-    "commit": "e0bc6b17079da9487c62aaadeb46e3a199a7a112"
+    "tag": "v1.0.7",
+    "commit": "9abc8568d25c83c77394d141b82ff1630649ee7c"
   },
   "_source": "git://github.com/PolymerElements/paper-toggle-button.git",
   "_target": "~1.0.5",
diff --git a/dashboard-ui/bower_components/paper-toggle-button/bower.json b/dashboard-ui/bower_components/paper-toggle-button/bower.json
index 1ae9d58b99..605324126e 100644
--- a/dashboard-ui/bower_components/paper-toggle-button/bower.json
+++ b/dashboard-ui/bower_components/paper-toggle-button/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "paper-toggle-button",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "description": "A material design toggle button control",
   "authors": [
     "The Polymer Authors"
@@ -20,17 +20,18 @@
   "homepage": "https://github.com/PolymerElements/paper-toggle-button",
   "ignore": [],
   "dependencies": {
+    "polymer": "Polymer/polymer#^1.1.0",
     "paper-ripple": "PolymerElements/paper-ripple#^1.0.0",
     "paper-styles": "PolymerElements/paper-styles#^1.0.0",
     "paper-behaviors": "PolymerElements/paper-behaviors#^1.0.0",
-    "polymer": "Polymer/polymer#^1.0.0"
+    "iron-checked-element-behavior": "PolymerElements/iron-checked-element-behavior#^1.0.0"
   },
   "devDependencies": {
-    "web-component-tester": "*",
+    "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0",
+    "web-component-tester": "Polymer/web-component-tester#^3.3.0",
     "test-fixture": "PolymerElements/test-fixture#^1.0.0",
     "iron-component-page": "PolymerElements/iron-component-page#^1.0.0",
     "iron-test-helpers": "PolymerElements/iron-test-helpers#^1.0.0",
-    "iron-flex-layout": "PolymerElements/iron-flex-layout#^1.0.0",
-    "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
+    "iron-flex-layout": "PolymerElements/iron-flex-layout#^1.0.0"
   }
 }
diff --git a/dashboard-ui/bower_components/paper-toggle-button/paper-toggle-button.css b/dashboard-ui/bower_components/paper-toggle-button/paper-toggle-button.css
deleted file mode 100644
index ecfed84870..0000000000
--- a/dashboard-ui/bower_components/paper-toggle-button/paper-toggle-button.css
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
-@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
-*/
-
-:host {
-  display: inline-block;
-}
-
-:host([disabled]) {
-  pointer-events: none;
-}
-
-:host(:focus) {
-  outline:none;
-}
-
-:host .toggle-bar {
-  background-color: var(--paper-toggle-button-unchecked-bar-color, #000000);
-  @apply(--paper-toggle-button-unchecked-bar);
-}
-
-:host .toggle-button {
-  background-color: var(--paper-toggle-button-unchecked-button-color, --paper-grey-50);
-  @apply(--paper-toggle-button-unchecked-button);
-}
-
-:host([checked]) .toggle-bar {
-  background-color: var(--paper-toggle-button-checked-bar-color, --google-green-500);
-  @apply(--paper-toggle-button-checked-bar);
-}
-
-:host([checked]) .toggle-button {
-  background-color: var(--paper-toggle-button-checked-button-color, --google-green-500);
-  @apply(--paper-toggle-button-checked-button);
-}
-
-:host .toggle-ink {
-  color: var(--paper-toggle-button-unchecked-ink-color, --primary-text-color);
-}
-
-:host([checked]) .toggle-ink {
-  color: var(--paper-toggle-button-checked-ink-color, --google-green-500);
-}
-
-/* ID selectors should not be overriden by users. */
-
-#toggleContainer {
-  position: relative;
-  width: 36px;
-  height: 14px;
-}
-
-#toggleBar {
-  position: absolute;
-  height: 100%;
-  width: 100%;
-  border-radius: 8px;
-  pointer-events: none;
-  opacity: 0.4;
-  transition: background-color linear .08s;
-}
-
-:host([checked]) #toggleBar {
-  opacity: 0.5;
-}
-
-:host([disabled]) #toggleBar {
-  background-color: #000;
-  opacity: 0.12;
-}
-
-#toggleButton {
-  position: absolute;
-  top: -3px;
-  height: 20px;
-  width: 20px;
-  border-radius: 50%;
-  box-shadow: 0 1px 5px 0 rgba(0, 0, 0, 0.6);
-  transition: -webkit-transform linear .08s, background-color linear .08s;
-  transition: transform linear .08s, background-color linear .08s;
-  will-change: transform;
-}
-
-#toggleButton.dragging {
-  -webkit-transition: none;
-  transition: none;
-}
-
-:host([checked]) #toggleButton {
-  -webkit-transform: translate(16px, 0);
-  transform: translate(16px, 0);
-}
-
-:host([disabled]) #toggleButton {
-  background-color: #bdbdbd;
-  opacity: 1;
-}
-
-#ink {
-  position: absolute;
-  top: -14px;
-  left: -14px;
-  width: 48px;
-  height: 48px;
-  opacity: 0.5;
-  pointer-events: none;
-}
diff --git a/dashboard-ui/bower_components/paper-toggle-button/paper-toggle-button.html b/dashboard-ui/bower_components/paper-toggle-button/paper-toggle-button.html
index 9cc71a04c7..0bdf712e06 100644
--- a/dashboard-ui/bower_components/paper-toggle-button/paper-toggle-button.html
+++ b/dashboard-ui/bower_components/paper-toggle-button/paper-toggle-button.html
@@ -13,6 +13,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 <link rel="import" href="../paper-styles/default-theme.html">
 <link rel="import" href="../paper-ripple/paper-ripple.html">
 <link rel="import" href="../paper-behaviors/paper-inky-focus-behavior.html">
+<link rel="import" href="../iron-checked-element-behavior/iron-checked-element-behavior.html">
 
 <!--
 `paper-toggle-button` provides a ON/OFF switch that user can toggle the state
@@ -31,9 +32,9 @@ Custom property | Description | Default
 `--paper-toggle-button-unchecked-bar-color` | Slider color when the input is not checked | `#000000`
 `--paper-toggle-button-unchecked-button-color` | Button color when the input is not checked | `--paper-grey-50`
 `--paper-toggle-button-unchecked-ink-color` | Selected/focus ripple color when the input is not checked | `--dark-primary-color`
-`--paper-toggle-button-checked-bar-color` | Slider button color when the input is checked | `--google-green-500`
-`--paper-toggle-button-checked-button-color` | Button color when the input is checked | `--google-green-500`
-`--paper-toggle-button-checked-ink-color` | Selected/focus ripple color when the input is checked | `--google-green-500`
+`--paper-toggle-button-checked-bar-color` | Slider button color when the input is checked | `--default-primary-color`
+`--paper-toggle-button-checked-button-color` | Button color when the input is checked | `--default-primary-color`
+`--paper-toggle-button-checked-ink-color` | Selected/focus ripple color when the input is checked | `--default-primary-color`
 `--paper-toggle-button-unchecked-bar` | Mixin applied to the slider when the input is not checked | `{}`
 `--paper-toggle-button-unchecked-button` | Mixin applied to the slider button when the input is not checked | `{}`
 `--paper-toggle-button-checked-bar` | Mixin applied to the slider when the input is checked | `{}`
@@ -46,11 +47,114 @@ Custom property | Description | Default
 -->
 
 <dom-module id="paper-toggle-button">
-
-  <link rel="import" type="css" href="paper-toggle-button.css">
-
   <template>
 
+    <style>
+      :host {
+        display: inline-block;
+      }
+
+      :host([disabled]) {
+        pointer-events: none;
+      }
+
+      :host(:focus) {
+        outline:none;
+      }
+
+      :host .toggle-bar {
+        background-color: var(--paper-toggle-button-unchecked-bar-color, #000000);
+        @apply(--paper-toggle-button-unchecked-bar);
+      }
+
+      :host .toggle-button {
+        background-color: var(--paper-toggle-button-unchecked-button-color, --paper-grey-50);
+        @apply(--paper-toggle-button-unchecked-button);
+      }
+
+      :host([checked]) .toggle-bar {
+        background-color: var(--paper-toggle-button-checked-bar-color, --default-primary-color);
+        @apply(--paper-toggle-button-checked-bar);
+      }
+
+      :host([checked]) .toggle-button {
+        background-color: var(--paper-toggle-button-checked-button-color, --default-primary-color);
+        @apply(--paper-toggle-button-checked-button);
+      }
+
+      :host .toggle-ink {
+        color: var(--paper-toggle-button-unchecked-ink-color, --primary-text-color);
+      }
+
+      :host([checked]) .toggle-ink {
+        color: var(--paper-toggle-button-checked-ink-color, --default-primary-color);
+      }
+
+      /* ID selectors should not be overriden by users. */
+
+      #toggleContainer {
+        position: relative;
+        width: 36px;
+        height: 14px;
+      }
+
+      #toggleBar {
+        position: absolute;
+        height: 100%;
+        width: 100%;
+        border-radius: 8px;
+        pointer-events: none;
+        opacity: 0.4;
+        transition: background-color linear .08s;
+      }
+
+      :host([checked]) #toggleBar {
+        opacity: 0.5;
+      }
+
+      :host([disabled]) #toggleBar {
+        background-color: #000;
+        opacity: 0.12;
+      }
+
+      #toggleButton {
+        position: absolute;
+        top: -3px;
+        height: 20px;
+        width: 20px;
+        border-radius: 50%;
+        box-shadow: 0 1px 5px 0 rgba(0, 0, 0, 0.6);
+        transition: -webkit-transform linear .08s, background-color linear .08s;
+        transition: transform linear .08s, background-color linear .08s;
+        will-change: transform;
+      }
+
+      #toggleButton.dragging {
+        -webkit-transition: none;
+        transition: none;
+      }
+
+      :host([checked]) #toggleButton {
+        -webkit-transform: translate(16px, 0);
+        transform: translate(16px, 0);
+      }
+
+      :host([disabled]) #toggleButton {
+        background-color: #bdbdbd;
+        opacity: 1;
+      }
+
+      #ink {
+        position: absolute;
+        top: -14px;
+        left: -14px;
+        width: 48px;
+        height: 48px;
+        opacity: 0.5;
+        pointer-events: none;
+      }
+    </style>
+
     <div id="toggleContainer">
       <div id="toggleBar" class="toggle-bar"></div>
       <div id="toggleButton" class="toggle-button">
@@ -65,7 +169,8 @@ Custom property | Description | Default
       is: 'paper-toggle-button',
 
       behaviors: [
-        Polymer.PaperInkyFocusBehavior
+        Polymer.PaperInkyFocusBehavior,
+        Polymer.IronCheckedElementBehavior
       ],
 
       hostAttributes: {
@@ -85,34 +190,6 @@ Custom property | Description | Default
          *
          * @event iron-change
          */
-        /**
-         * Gets or sets the state, `true` is checked and `false` is unchecked.
-         *
-         * @attribute checked
-         * @type boolean
-         * @default false
-         */
-        checked: {
-          type: Boolean,
-          value: false,
-          reflectToAttribute: true,
-          notify: true,
-          observer: '_checkedChanged'
-        },
-
-        /**
-         * If true, the button toggles the active state with each tap or press
-         * of the spacebar.
-         *
-         * @attribute toggles
-         * @type boolean
-         * @default true
-         */
-        toggles: {
-          type: Boolean,
-          value: true,
-          reflectToAttribute: true
-        }
       },
 
       listeners: {
@@ -133,11 +210,6 @@ Custom property | Description | Default
         }
       },
 
-      _checkedChanged: function(checked) {
-        this.active = this.checked;
-        this.fire('iron-change');
-      },
-
       _ontrack: function(event) {
         var track = event.detail;
         if (track.state === 'start') {
@@ -174,5 +246,4 @@ Custom property | Description | Default
 
     });
   </script>
-
 </dom-module>
diff --git a/dashboard-ui/bower_components/paper-toggle-button/test/basic.html b/dashboard-ui/bower_components/paper-toggle-button/test/basic.html
index 6768491525..43e028c81f 100644
--- a/dashboard-ui/bower_components/paper-toggle-button/test/basic.html
+++ b/dashboard-ui/bower_components/paper-toggle-button/test/basic.html
@@ -39,33 +39,35 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
           b1 = fixture('Basic');
         });
 
-        test('check button via click', function() {
+        test('check button via click', function(done) {
           b1.addEventListener('click', function() {
-            assert.isTrue(b1.getAttribute('aria-checked'));
+            assert.isTrue(b1.getAttribute('aria-pressed') == 'true');
             assert.isTrue(b1.checked);
             done();
           });
-          MockInteractions.down(b1);
+          MockInteractions.tap(b1);
         });
 
-        test('toggle button via click', function() {
+        test('toggle button via click', function(done) {
           b1.checked = true;
           b1.addEventListener('click', function() {
-            assert.isFalse(b1.getAttribute('aria-checked'));
+            assert.isFalse(b1.getAttribute('aria-pressed') == 'true');
             assert.isFalse(b1.checked);
             done();
           });
-          MockInteractions.down(b1);
+          MockInteractions.tap(b1);
         });
 
-        test('disabled button cannot be clicked', function() {
+        test('disabled button cannot be clicked', function(done) {
           b1.disabled = true;
-          b1.addEventListener('click', function() {
-            assert.isTrue(b1.getAttribute('aria-checked'));
+          b1.checked = true;
+          MockInteractions.tap(b1);
+
+          setTimeout(function() {
+            assert.isTrue(b1.getAttribute('aria-pressed') == 'true');
             assert.isTrue(b1.checked);
             done();
-          });
-          MockInteractions.down(b1);
+          }, 1);
         });
       });
 
@@ -80,6 +82,8 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
           console.log(b1.getAttribute('role'));
           assert.isTrue(b1.getAttribute('role') == 'button');
         });
+
+        a11ySuite('Basic');
       });
     </script>
   </body>
diff --git a/dashboard-ui/channels.html b/dashboard-ui/channels.html
index ca7380ea7a..29642d0255 100644
--- a/dashboard-ui/channels.html
+++ b/dashboard-ui/channels.html
@@ -7,7 +7,7 @@
     <div id="channelsPage" data-role="page" class="page libraryPage channelsPage pageWithAbsoluteTabs" data-contextname="${HeaderChannels}" data-require="scripts/channels,scripts/channelslatest,scripts/sections">
 
         <div class="libraryViewNav scopedLibraryViewNav libraryViewNavWithMinHeight">
-            <paper-tabs>
+            <paper-tabs hidescrollbuttons noink>
                 <paper-tab><iron-icon icon="new-releases"></iron-icon>${TabLatest}</paper-tab>
                 <paper-tab><iron-icon icon="live-tv"></iron-icon>${TabChannels}</paper-tab>
             </paper-tabs>
diff --git a/dashboard-ui/edititemmetadata.html b/dashboard-ui/edititemmetadata.html
index 49132b734e..eba9f1dd8d 100644
--- a/dashboard-ui/edititemmetadata.html
+++ b/dashboard-ui/edititemmetadata.html
@@ -14,7 +14,7 @@
             <div class="editPageInnerContent" style="visibility:hidden;">
                 <h1 class="itemName editPageName">&nbsp;</h1>
                 <br />
-                <paper-tabs>
+                <paper-tabs hidescrollbuttons noink>
                     <paper-tab class="metadataTabButton">${TabMetadata}</paper-tab>
                     <paper-tab class="subtitleTabButton hide">${TabSubtitles}</paper-tab>
                     <paper-tab class="collectionItemsTabButton hide">${TabCollectionTitles}</paper-tab>
diff --git a/dashboard-ui/index.html b/dashboard-ui/index.html
index 936b78851c..74ffc17e00 100644
--- a/dashboard-ui/index.html
+++ b/dashboard-ui/index.html
@@ -8,7 +8,7 @@
     <div id="indexPage" data-role="page" class="page homePage libraryPage allLibraryPage backdropPage pageWithAbsoluteTabs" data-title="${ButtonHome}" data-backdroptype="movie,series,game,book" data-require="scripts/indexpage">
 
         <div class="libraryViewNav libraryViewNavWithMinHeight">
-            <paper-tabs>
+            <paper-tabs hidescrollbuttons noink>
                 <paper-tab><iron-icon icon="home"></iron-icon>${TabHome}</paper-tab>
                 <paper-tab><iron-icon icon="navigate-next"></iron-icon>${TabNextUp}</paper-tab>
                 <paper-tab><iron-icon icon="favorite"></iron-icon>${TabFavorites}</paper-tab>
diff --git a/dashboard-ui/livetv.html b/dashboard-ui/livetv.html
index d6e1ed9866..4bdfc70c64 100644
--- a/dashboard-ui/livetv.html
+++ b/dashboard-ui/livetv.html
@@ -7,7 +7,7 @@
     <div id="liveTvSuggestedPage" data-role="page" class="page libraryPage liveTvPage pageWithAbsoluteTabs" data-contextname="${HeaderLiveTv}" data-backdroptype="series,movie" data-require="scripts/livetvsuggested,livetvcss,scripts/livetvcomponents">
 
         <div class="libraryViewNav libraryViewNavWithMinHeight">
-            <paper-tabs class="papertabs-800 scrollingPaperTabs">
+            <paper-tabs class="scrollingPaperTabs" hidescrollbuttons noink>
                 <paper-tab><iron-icon icon="info"></iron-icon>${TabSuggestions}</paper-tab>
                 <paper-tab><iron-icon icon="grid-on"></iron-icon>${TabGuide}</paper-tab>
                 <paper-tab><iron-icon icon="live-tv"></iron-icon>${TabChannels}</paper-tab>
diff --git a/dashboard-ui/movies.html b/dashboard-ui/movies.html
index aa06f7725a..2948087f88 100644
--- a/dashboard-ui/movies.html
+++ b/dashboard-ui/movies.html
@@ -7,7 +7,7 @@
     <div id="moviesPage" data-role="page" class="page libraryPage backdropPage pageWithAbsoluteTabs collectionEditorPage" data-backdroptype="movie" data-require="scripts/moviesrecommended">
 
         <div class="libraryViewNav libraryViewNavWithMinHeight">
-            <paper-tabs class="papertabs-800 scrollingPaperTabs">
+            <paper-tabs class="scrollingPaperTabs" hidescrollbuttons noink>
                 <paper-tab><iron-icon icon="info"></iron-icon>${TabSuggestions}</paper-tab>
                 <paper-tab><iron-icon icon="local-movies"></iron-icon>${TabMovies}</paper-tab>
                 <paper-tab class="movieTrailersTab"><iron-icon icon="movie"></iron-icon>${TabTrailers}</paper-tab>
diff --git a/dashboard-ui/nowplaying.html b/dashboard-ui/nowplaying.html
index 3c4ae6e51e..e0501e941c 100644
--- a/dashboard-ui/nowplaying.html
+++ b/dashboard-ui/nowplaying.html
@@ -149,7 +149,7 @@
                 </neon-animatable>
             </neon-animated-pages>
 
-            <paper-tabs selected="{{selected}}" style="position:fixed;bottom:0;left:0;right:0;" class="bottomTabs">
+            <paper-tabs selected="{{selected}}" style="position:fixed;bottom:0;left:0;right:0;" class="bottomTabs" hidescrollbuttons noink>
 
                 <paper-tab>${TabNowPlaying}</paper-tab>
                 <paper-tab>${TabControls}</paper-tab>
diff --git a/dashboard-ui/photos.html b/dashboard-ui/photos.html
index d7b91c9ae7..d5e80ac7ec 100644
--- a/dashboard-ui/photos.html
+++ b/dashboard-ui/photos.html
@@ -7,7 +7,7 @@
     <div id="photosPage" data-role="page" class="page libraryPage pageWithAbsoluteTabs" data-require="scripts/photos">
 
         <div class="libraryViewNav scopedLibraryViewNav libraryViewNavWithMinHeight">
-            <paper-tabs>
+            <paper-tabs hidescrollbuttons noink>
                 <paper-tab><iron-icon icon="photo-album"></iron-icon>${TabAlbums}</paper-tab>
                 <paper-tab><iron-icon icon="photo"></iron-icon>${TabPhotos}</paper-tab>
                 <paper-tab><iron-icon icon="videocam"></iron-icon>${TabVideos}</paper-tab>
diff --git a/dashboard-ui/scripts/addpluginpage.js b/dashboard-ui/scripts/addpluginpage.js
index eba46f10d8..5a74f6e82d 100644
--- a/dashboard-ui/scripts/addpluginpage.js
+++ b/dashboard-ui/scripts/addpluginpage.js
@@ -170,7 +170,7 @@
         Dashboard.hideLoadingMsg();
     }
 
-    $(document).on('pageinitdepends', "#addPluginPage", function () {
+    $(document).on('pageinit', "#addPluginPage", function () {
 
         $('.addPluginForm').off('submit', AddPluginPage.onSubmit).on('submit', AddPluginPage.onSubmit);
 
diff --git a/dashboard-ui/scripts/advancedconfigurationpage.js b/dashboard-ui/scripts/advancedconfigurationpage.js
index 437a4e48a4..8c958e3a46 100644
--- a/dashboard-ui/scripts/advancedconfigurationpage.js
+++ b/dashboard-ui/scripts/advancedconfigurationpage.js
@@ -84,7 +84,7 @@
 
         });
 
-    }).on('pageinitdepends', "#advancedConfigurationPage", function () {
+    }).on('pageinit', "#advancedConfigurationPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/alphapicker.js b/dashboard-ui/scripts/alphapicker.js
index e3559a2c84..87168cbb06 100644
--- a/dashboard-ui/scripts/alphapicker.js
+++ b/dashboard-ui/scripts/alphapicker.js
@@ -59,7 +59,7 @@
         });
     }
 
-    $(document).on('pageinitdepends', ".libraryPage", function () {
+    $(document).on('pageinit', ".libraryPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/autoorganizelog.js b/dashboard-ui/scripts/autoorganizelog.js
index a54801f201..a9a6f5d8a1 100644
--- a/dashboard-ui/scripts/autoorganizelog.js
+++ b/dashboard-ui/scripts/autoorganizelog.js
@@ -338,7 +338,7 @@
         return false;
     }
 
-    $(document).on('pageinitdepends', "#libraryFileOrganizerLogPage", function () {
+    $(document).on('pageinit', "#libraryFileOrganizerLogPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/autoorganizetv.js b/dashboard-ui/scripts/autoorganizetv.js
index b80402ba40..40f5719650 100644
--- a/dashboard-ui/scripts/autoorganizetv.js
+++ b/dashboard-ui/scripts/autoorganizetv.js
@@ -109,7 +109,7 @@
         return false;
     }
 
-    $(document).on('pageinitdepends', "#libraryFileOrganizerPage", function () {
+    $(document).on('pageinit', "#libraryFileOrganizerPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/channelitems.js b/dashboard-ui/scripts/channelitems.js
index 14cc0519bf..e9e75f7093 100644
--- a/dashboard-ui/scripts/channelitems.js
+++ b/dashboard-ui/scripts/channelitems.js
@@ -201,7 +201,7 @@
         $('#selectPageSize', page).val(query.Limit).selectmenu('refresh');
     }
 
-    $(document).on('pageinitdepends', "#channelItemsPage", function () {
+    $(document).on('pageinit', "#channelItemsPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/channels.js b/dashboard-ui/scripts/channels.js
index 84bd351f8f..2233da8d6b 100644
--- a/dashboard-ui/scripts/channels.js
+++ b/dashboard-ui/scripts/channels.js
@@ -70,7 +70,7 @@
         }
     }
 
-    $(document).on('pageinitdepends', "#channelsPage", function () {
+    $(document).on('pageinit', "#channelsPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/channelsettings.js b/dashboard-ui/scripts/channelsettings.js
index 6eb6427578..d9ad16f5e6 100644
--- a/dashboard-ui/scripts/channelsettings.js
+++ b/dashboard-ui/scripts/channelsettings.js
@@ -25,7 +25,7 @@
         return false;
     }
 
-    $(document).on('pageinitdepends', "#channelSettingsPage", function () {
+    $(document).on('pageinit', "#channelSettingsPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/channelslatest.js b/dashboard-ui/scripts/channelslatest.js
index 4b51470077..980c24ad8b 100644
--- a/dashboard-ui/scripts/channelslatest.js
+++ b/dashboard-ui/scripts/channelslatest.js
@@ -21,7 +21,7 @@
         }
     }
 
-    $(document).on('pageinitdepends', "#channelsPage", function () {
+    $(document).on('pageinit', "#channelsPage", function () {
 
         var page = this;
         var pages = page.querySelector('neon-animated-pages');
diff --git a/dashboard-ui/scripts/cinemamodeconfiguration.js b/dashboard-ui/scripts/cinemamodeconfiguration.js
index 26382bd3d2..5e03fdadf7 100644
--- a/dashboard-ui/scripts/cinemamodeconfiguration.js
+++ b/dashboard-ui/scripts/cinemamodeconfiguration.js
@@ -51,7 +51,7 @@
         return false;
     }
 
-    $(document).on('pageinitdepends', "#cinemaModeConfigurationPage", function () {
+    $(document).on('pageinit', "#cinemaModeConfigurationPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/collectioneditor.js b/dashboard-ui/scripts/collectioneditor.js
index 5ed1534ba9..59288e24a3 100644
--- a/dashboard-ui/scripts/collectioneditor.js
+++ b/dashboard-ui/scripts/collectioneditor.js
@@ -130,7 +130,7 @@
         return false;
     }
 
-    $(document).on('pageinitdepends', ".collectionEditorPage", function () {
+    $(document).on('pageinit', ".collectionEditorPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/connectlogin.js b/dashboard-ui/scripts/connectlogin.js
index 6755513132..5f65deda11 100644
--- a/dashboard-ui/scripts/connectlogin.js
+++ b/dashboard-ui/scripts/connectlogin.js
@@ -210,7 +210,7 @@
         });
     }
 
-    $(document).on('pageinitdepends', "#connectLoginPage", function () {
+    $(document).on('pageinit', "#connectLoginPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/dashboardgeneral.js b/dashboard-ui/scripts/dashboardgeneral.js
index 071c56d444..0804398225 100644
--- a/dashboard-ui/scripts/dashboardgeneral.js
+++ b/dashboard-ui/scripts/dashboardgeneral.js
@@ -77,7 +77,7 @@
         return false;
     }
 
-    $(document).on('pageinitdepends', "#dashboardGeneralPage", function () {
+    $(document).on('pageinit', "#dashboardGeneralPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/dashboardhosting.js b/dashboard-ui/scripts/dashboardhosting.js
index 4d787d8a50..9b606e3b6d 100644
--- a/dashboard-ui/scripts/dashboardhosting.js
+++ b/dashboard-ui/scripts/dashboardhosting.js
@@ -52,7 +52,7 @@
 
         });
 
-    }).on('pageinitdepends', "#dashboardHostingPage", function () {
+    }).on('pageinit', "#dashboardHostingPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/dashboardpage.js b/dashboard-ui/scripts/dashboardpage.js
index 67361b6efd..b8f63b99a9 100644
--- a/dashboard-ui/scripts/dashboardpage.js
+++ b/dashboard-ui/scripts/dashboardpage.js
@@ -1354,7 +1354,7 @@ $(document).on('pageshowready', "#dashboardPage", DashboardPage.onPageShow).on('
         }
     }
 
-    $(document).on('pageinitdepends', "#dashboardPage", function () {
+    $(document).on('pageinit', "#dashboardPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/device.js b/dashboard-ui/scripts/device.js
index 3685301f94..2d5a7861ee 100644
--- a/dashboard-ui/scripts/device.js
+++ b/dashboard-ui/scripts/device.js
@@ -58,7 +58,7 @@
         return false;
     }
 
-    $(document).on('pageinitdepends', "#devicePage", function () {
+    $(document).on('pageinit', "#devicePage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/devicesupload.js b/dashboard-ui/scripts/devicesupload.js
index 6db4f697e7..41ef3edd21 100644
--- a/dashboard-ui/scripts/devicesupload.js
+++ b/dashboard-ui/scripts/devicesupload.js
@@ -111,7 +111,7 @@
         return false;
     }
 
-    $(document).on('pageinitdepends', "#devicesUploadPage", function () {
+    $(document).on('pageinit', "#devicesUploadPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/dlnaprofile.js b/dashboard-ui/scripts/dlnaprofile.js
index a47d79858f..4b14638fc8 100644
--- a/dashboard-ui/scripts/dlnaprofile.js
+++ b/dashboard-ui/scripts/dlnaprofile.js
@@ -940,7 +940,7 @@
         profile.UserId = $('#selectUser', page).val();
     }
 
-    $(document).on('pageinitdepends', "#dlnaProfilePage", function () {
+    $(document).on('pageinit', "#dlnaProfilePage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/dlnaserversettings.js b/dashboard-ui/scripts/dlnaserversettings.js
index 5bd47993d6..0659170ebf 100644
--- a/dashboard-ui/scripts/dlnaserversettings.js
+++ b/dashboard-ui/scripts/dlnaserversettings.js
@@ -39,7 +39,7 @@
         return false;
     }
 
-    $(document).on('pageinitdepends', "#dlnaServerSettingsPage", function () {
+    $(document).on('pageinit', "#dlnaServerSettingsPage", function () {
 
         $('.dlnaServerSettingsForm').off('submit', onSubmit).on('submit', onSubmit);
 
diff --git a/dashboard-ui/scripts/dlnasettings.js b/dashboard-ui/scripts/dlnasettings.js
index 057622b1de..a64dfd7a73 100644
--- a/dashboard-ui/scripts/dlnasettings.js
+++ b/dashboard-ui/scripts/dlnasettings.js
@@ -28,7 +28,7 @@
         return false;
     }
 
-    $(document).on('pageinitdepends', "#dlnaSettingsPage", function () {
+    $(document).on('pageinit', "#dlnaSettingsPage", function () {
 
         $('.dlnaSettingsForm').off('submit', onSubmit).on('submit', onSubmit);
 
diff --git a/dashboard-ui/scripts/editcollectionitems.js b/dashboard-ui/scripts/editcollectionitems.js
index c86fd600f6..f34ae4f723 100644
--- a/dashboard-ui/scripts/editcollectionitems.js
+++ b/dashboard-ui/scripts/editcollectionitems.js
@@ -227,7 +227,7 @@
         return false;
     }
 
-    $(document).on('pageinitdepends', "#editItemMetadataPage", function () {
+    $(document).on('pageinit', "#editItemMetadataPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/edititemimages.js b/dashboard-ui/scripts/edititemimages.js
index 720688d20b..6ec8ea6513 100644
--- a/dashboard-ui/scripts/edititemimages.js
+++ b/dashboard-ui/scripts/edititemimages.js
@@ -500,7 +500,7 @@
 
     window.EditItemImagesPage = new editItemImages();
 
-    $(document).on('pageinitdepends', "#editItemMetadataPage", function () {
+    $(document).on('pageinit', "#editItemMetadataPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/edititemmetadata.js b/dashboard-ui/scripts/edititemmetadata.js
index 8c455c537b..be0c50e40e 100644
--- a/dashboard-ui/scripts/edititemmetadata.js
+++ b/dashboard-ui/scripts/edititemmetadata.js
@@ -1420,7 +1420,7 @@
         $('.editorTab', page).addClass('hide')[index].classList.remove('hide');
     }
 
-    $(document).on('pageinitdepends', "#editItemMetadataPage", function () {
+    $(document).on('pageinit', "#editItemMetadataPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/edititemsubtitles.js b/dashboard-ui/scripts/edititemsubtitles.js
index 04d869e14f..1b2d9304d7 100644
--- a/dashboard-ui/scripts/edititemsubtitles.js
+++ b/dashboard-ui/scripts/edititemsubtitles.js
@@ -281,7 +281,7 @@
         return false;
     }
 
-    $(document).on('pageinitdepends', "#editItemMetadataPage", function () {
+    $(document).on('pageinit', "#editItemMetadataPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/editorsidebar.js b/dashboard-ui/scripts/editorsidebar.js
index ebc7252c21..fdfadf60c6 100644
--- a/dashboard-ui/scripts/editorsidebar.js
+++ b/dashboard-ui/scripts/editorsidebar.js
@@ -425,7 +425,7 @@
 
         });
 
-    }).on('pageinitdepends', ".metadataEditorPage", function () {
+    }).on('pageinit', ".metadataEditorPage", function () {
 
         Dashboard.importCss('css/metadataeditor.css');
         window.MetadataEditor = new metadataEditor();
diff --git a/dashboard-ui/scripts/encodingsettings.js b/dashboard-ui/scripts/encodingsettings.js
index 52a6eb1b0e..91040c3bf8 100644
--- a/dashboard-ui/scripts/encodingsettings.js
+++ b/dashboard-ui/scripts/encodingsettings.js
@@ -39,7 +39,7 @@
         return false;
     }
 
-    $(document).on('pageinitdepends', "#encodingSettingsPage", function () {
+    $(document).on('pageinit', "#encodingSettingsPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/episodes.js b/dashboard-ui/scripts/episodes.js
index acd149f61b..cfad3ecdb2 100644
--- a/dashboard-ui/scripts/episodes.js
+++ b/dashboard-ui/scripts/episodes.js
@@ -153,7 +153,7 @@
         $('#selectPageSize', page).val(query.Limit).selectmenu('refresh');
     }
 
-    $(document).on('pageinitdepends', "#episodesPage", function () {
+    $(document).on('pageinit', "#episodesPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/forgotpassword.js b/dashboard-ui/scripts/forgotpassword.js
index e21abcc990..6af0d8e88d 100644
--- a/dashboard-ui/scripts/forgotpassword.js
+++ b/dashboard-ui/scripts/forgotpassword.js
@@ -62,7 +62,7 @@
     }
 
 
-    $(document).on('pageinitdepends', '#forgotPasswordPage', function () {
+    $(document).on('pageinit', '#forgotPasswordPage', function () {
 
         var page = this;
         $('.forgotPasswordForm', page).off('submit', onSubmit).on('submit', onSubmit);
diff --git a/dashboard-ui/scripts/forgotpasswordpin.js b/dashboard-ui/scripts/forgotpasswordpin.js
index 03e95b80ee..5914be6f37 100644
--- a/dashboard-ui/scripts/forgotpasswordpin.js
+++ b/dashboard-ui/scripts/forgotpasswordpin.js
@@ -51,7 +51,7 @@
         return false;
     }
 
-    $(document).on('pageinitdepends', '#forgotPasswordPinPage', function () {
+    $(document).on('pageinit', '#forgotPasswordPinPage', function () {
         $('.forgotPasswordPinForm').off('submit', onSubmit).on('submit', onSubmit);
     });
 
diff --git a/dashboard-ui/scripts/gamegenrepage.js b/dashboard-ui/scripts/gamegenrepage.js
index b11ce762a7..bad2f62b20 100644
--- a/dashboard-ui/scripts/gamegenrepage.js
+++ b/dashboard-ui/scripts/gamegenrepage.js
@@ -71,7 +71,7 @@
         $('#selectPageSize', page).val(query.Limit).selectmenu('refresh');
     }
 
-    $(document).on('pageinitdepends', "#gameGenresPage", function () {
+    $(document).on('pageinit', "#gameGenresPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/gamespage.js b/dashboard-ui/scripts/gamespage.js
index cdde45d3a1..4ca5596ef4 100644
--- a/dashboard-ui/scripts/gamespage.js
+++ b/dashboard-ui/scripts/gamespage.js
@@ -154,7 +154,7 @@
         }
     }
 
-    $(document).on('pageinitdepends', "#gamesPage", function () {
+    $(document).on('pageinit', "#gamesPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/gamestudiospage.js b/dashboard-ui/scripts/gamestudiospage.js
index e63bbf81ed..104b82677e 100644
--- a/dashboard-ui/scripts/gamestudiospage.js
+++ b/dashboard-ui/scripts/gamestudiospage.js
@@ -73,7 +73,7 @@
         $('#selectPageSize', page).val(query.Limit).selectmenu('refresh');
     }
 
-    $(document).on('pageinitdepends', "#gameStudiosPage", function () {
+    $(document).on('pageinit', "#gameStudiosPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/indexpage.js b/dashboard-ui/scripts/indexpage.js
index 1cdb2a90eb..0c96e2c1e2 100644
--- a/dashboard-ui/scripts/indexpage.js
+++ b/dashboard-ui/scripts/indexpage.js
@@ -228,7 +228,7 @@
         });
     }
 
-    $(document).on('pageinitdepends', "#indexPage", function () {
+    $(document).on('pageinit', "#indexPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/itemdetailpage.js b/dashboard-ui/scripts/itemdetailpage.js
index 0ca822b80e..07e04ca05d 100644
--- a/dashboard-ui/scripts/itemdetailpage.js
+++ b/dashboard-ui/scripts/itemdetailpage.js
@@ -1710,7 +1710,7 @@
         });
     }
 
-    $(document).on('pageinitdepends', "#itemDetailPage", function () {
+    $(document).on('pageinit', "#itemDetailPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/itemlistpage.js b/dashboard-ui/scripts/itemlistpage.js
index 6366c83be6..5b1940dac5 100644
--- a/dashboard-ui/scripts/itemlistpage.js
+++ b/dashboard-ui/scripts/itemlistpage.js
@@ -188,7 +188,7 @@
         }
     }
 
-    $(document).on('pageinitdepends', "#itemListPage", function () {
+    $(document).on('pageinit', "#itemListPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/kids.js b/dashboard-ui/scripts/kids.js
index 6f7b20f406..f90bd128e7 100644
--- a/dashboard-ui/scripts/kids.js
+++ b/dashboard-ui/scripts/kids.js
@@ -91,7 +91,7 @@
 
         $('.kidsBackdropContainer').css('background-image', 'url(css/images/kids/bg.jpg)');
 
-    }).on('pageinitdepends', "#kidsPage", function () {
+    }).on('pageinit', "#kidsPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js
index a66a4571fd..0e482dcc31 100644
--- a/dashboard-ui/scripts/librarybrowser.js
+++ b/dashboard-ui/scripts/librarybrowser.js
@@ -193,10 +193,7 @@
             return !LibraryBrowser.enableFullPaperTabs();
         },
 
-        configurePaperLibraryTabs: function (ownerpage, tabs, pages, defaultTabIndex) {
-
-            tabs.hideScrollButtons = true;
-            tabs.noink = true;
+        configurePaperLibraryTabs: function (ownerpage, tabs, pages) {
 
             if (AppInfo.enableBottomTabs) {
                 tabs.alignBottom = true;
@@ -210,7 +207,6 @@
                     // Not very iOS-like I suppose
                     tabs.noSlide = true;
                     tabs.noBar = true;
-                    tabs.noink = true;
                 }
                 else {
                     LibraryBrowser.configureSwipeTabs(ownerpage, tabs, pages);
@@ -222,7 +218,6 @@
 
                 tabs.noSlide = true;
                 tabs.noBar = true;
-                tabs.scrollable = true;
 
                 var legacyTabs = $('.legacyTabs', ownerpage);
 
@@ -254,6 +249,20 @@
         onTabbedpagebeforeshow: function () {
 
             var page = this;
+            var delay = 0;
+
+            if (!page.getAttribute('data-firstload')) {
+                delay = 300;
+                page.setAttribute('data-firstload', '1');
+            }
+
+            setTimeout(function () {
+                LibraryBrowser.onTabbedpagebeforeshowInternal(page);
+            }, delay);
+        },
+
+        onTabbedpagebeforeshowInternal: function (page) {
+
             var tabs = page.querySelector('paper-tabs');
             var selected = tabs.selected;
 
@@ -1154,7 +1163,7 @@
                     textlines.push('&nbsp;');
                 }
                 else if (item.Type == 'TvChannel') {
-                    
+
                     if (item.CurrentProgram) {
                         textlines.push(LibraryBrowser.getPosterViewDisplayName(item.CurrentProgram));
                     }
diff --git a/dashboard-ui/scripts/librarylist.js b/dashboard-ui/scripts/librarylist.js
index b70ff6cd81..b2198d8534 100644
--- a/dashboard-ui/scripts/librarylist.js
+++ b/dashboard-ui/scripts/librarylist.js
@@ -1185,7 +1185,7 @@
         });
     }
 
-    $(document).on('pageinitdepends', ".libraryPage", function () {
+    $(document).on('pageinit', ".libraryPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/librarypathmapping.js b/dashboard-ui/scripts/librarypathmapping.js
index 0146651035..94b008dbbd 100644
--- a/dashboard-ui/scripts/librarypathmapping.js
+++ b/dashboard-ui/scripts/librarypathmapping.js
@@ -113,7 +113,7 @@
         return false;
     }
 
-    $(document).on('pageinitdepends', "#libraryPathMappingPage", function () {
+    $(document).on('pageinit', "#libraryPathMappingPage", function () {
 
         $('.libraryPathMappingForm').off('submit', onSubmit).on('submit', onSubmit);
 
diff --git a/dashboard-ui/scripts/librarysettings.js b/dashboard-ui/scripts/librarysettings.js
index f69355cd10..d3e6d00393 100644
--- a/dashboard-ui/scripts/librarysettings.js
+++ b/dashboard-ui/scripts/librarysettings.js
@@ -55,7 +55,7 @@
 
         });
 
-    }).on('pageinitdepends', "#librarySettingsPage", function () {
+    }).on('pageinit', "#librarySettingsPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/livetvitems.js b/dashboard-ui/scripts/livetvitems.js
index be605c6c34..bb0bf7fea5 100644
--- a/dashboard-ui/scripts/livetvitems.js
+++ b/dashboard-ui/scripts/livetvitems.js
@@ -95,7 +95,7 @@
         });
     }
 
-    $(document).on('pageinitdepends', "#liveTvItemsPage", function () {
+    $(document).on('pageinit', "#liveTvItemsPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/livetvnewrecording.js b/dashboard-ui/scripts/livetvnewrecording.js
index f7dc648249..5adf0d9f47 100644
--- a/dashboard-ui/scripts/livetvnewrecording.js
+++ b/dashboard-ui/scripts/livetvnewrecording.js
@@ -218,7 +218,7 @@
         });
     }
 
-    $(document).on('pageinitdepends', "#liveTvNewRecordingPage", function () {
+    $(document).on('pageinit', "#liveTvNewRecordingPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/livetvrecordinglist.js b/dashboard-ui/scripts/livetvrecordinglist.js
index 70a6f65fdf..2fbbcefce6 100644
--- a/dashboard-ui/scripts/livetvrecordinglist.js
+++ b/dashboard-ui/scripts/livetvrecordinglist.js
@@ -81,7 +81,7 @@
 
     }
 
-    $(document).on('pageinitdepends', "#liveTvRecordingListPage", function () {
+    $(document).on('pageinit', "#liveTvRecordingListPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/livetvseriestimer.js b/dashboard-ui/scripts/livetvseriestimer.js
index 96a8a70019..d100440f3a 100644
--- a/dashboard-ui/scripts/livetvseriestimer.js
+++ b/dashboard-ui/scripts/livetvseriestimer.js
@@ -259,7 +259,7 @@
         });
     }
 
-    $(document).on('pageinitdepends', "#liveTvSeriesTimerPage", function () {
+    $(document).on('pageinit', "#liveTvSeriesTimerPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/livetvsettings.js b/dashboard-ui/scripts/livetvsettings.js
index 09ed4d3707..a7fd8ea64f 100644
--- a/dashboard-ui/scripts/livetvsettings.js
+++ b/dashboard-ui/scripts/livetvsettings.js
@@ -41,7 +41,7 @@
             return false;
     }
 
-    $(document).on('pageinitdepends', "#liveTvSettingsPage", function () {
+    $(document).on('pageinit', "#liveTvSettingsPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/livetvstatus.js b/dashboard-ui/scripts/livetvstatus.js
index ea8c2961b8..3d17b7c016 100644
--- a/dashboard-ui/scripts/livetvstatus.js
+++ b/dashboard-ui/scripts/livetvstatus.js
@@ -476,7 +476,7 @@
         });
     }
 
-    $(document).on('pageinitdepends', "#liveTvStatusPage", function () {
+    $(document).on('pageinit', "#liveTvStatusPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/livetvsuggested.js b/dashboard-ui/scripts/livetvsuggested.js
index a6e5680b9b..aeb57f2e65 100644
--- a/dashboard-ui/scripts/livetvsuggested.js
+++ b/dashboard-ui/scripts/livetvsuggested.js
@@ -209,7 +209,7 @@
         });
     }
 
-    $(document).on('pageinitdepends', "#liveTvSuggestedPage", function () {
+    $(document).on('pageinit', "#liveTvSuggestedPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/livetvtimer.js b/dashboard-ui/scripts/livetvtimer.js
index 43639746b6..3823bf29c8 100644
--- a/dashboard-ui/scripts/livetvtimer.js
+++ b/dashboard-ui/scripts/livetvtimer.js
@@ -101,7 +101,7 @@
         });
     }
 
-    $(document).on('pageinitdepends', "#liveTvTimerPage", function () {
+    $(document).on('pageinit', "#liveTvTimerPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/livetvtunerprovider-hdhomerun.js b/dashboard-ui/scripts/livetvtunerprovider-hdhomerun.js
index a26ecc2a76..5268da7735 100644
--- a/dashboard-ui/scripts/livetvtunerprovider-hdhomerun.js
+++ b/dashboard-ui/scripts/livetvtunerprovider-hdhomerun.js
@@ -58,7 +58,7 @@
 
     }
 
-    $(document).on('pageinitdepends', "#liveTvTunerProviderHdHomerunPage", function () {
+    $(document).on('pageinit', "#liveTvTunerProviderHdHomerunPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/livetvtunerprovider-m3u.js b/dashboard-ui/scripts/livetvtunerprovider-m3u.js
index 6059faa4b7..566a50273a 100644
--- a/dashboard-ui/scripts/livetvtunerprovider-m3u.js
+++ b/dashboard-ui/scripts/livetvtunerprovider-m3u.js
@@ -51,7 +51,7 @@
 
     }
 
-    $(document).on('pageinitdepends', "#liveTvTunerProviderM3UPage", function () {
+    $(document).on('pageinit', "#liveTvTunerProviderM3UPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/loginpage.js b/dashboard-ui/scripts/loginpage.js
index 7eb2379980..6bb1020445 100644
--- a/dashboard-ui/scripts/loginpage.js
+++ b/dashboard-ui/scripts/loginpage.js
@@ -216,7 +216,7 @@
     }
 };
 
-$(document).on('pageinitdepends', "#loginPage", function () {
+$(document).on('pageinit', "#loginPage", function () {
 
     var page = this;
 
diff --git a/dashboard-ui/scripts/medialibrarypage.js b/dashboard-ui/scripts/medialibrarypage.js
index e47f611517..7ca00563b7 100644
--- a/dashboard-ui/scripts/medialibrarypage.js
+++ b/dashboard-ui/scripts/medialibrarypage.js
@@ -347,7 +347,7 @@
     }
 };
 
-$(document).on('pageinitdepends', ".mediaLibraryPage", MediaLibraryPage.onPageInit).on('pageshowready', ".mediaLibraryPage", MediaLibraryPage.onPageShow);
+$(document).on('pageinit', ".mediaLibraryPage", MediaLibraryPage.onPageInit).on('pageshowready', ".mediaLibraryPage", MediaLibraryPage.onPageShow);
 
 var WizardLibraryPage = {
 
diff --git a/dashboard-ui/scripts/metadataadvanced.js b/dashboard-ui/scripts/metadataadvanced.js
index 07047232d7..b5196e21dc 100644
--- a/dashboard-ui/scripts/metadataadvanced.js
+++ b/dashboard-ui/scripts/metadataadvanced.js
@@ -168,7 +168,7 @@
         return false;
     }
 
-    $(document).on('pageinitdepends', "#advancedMetadataConfigurationPage", function () {
+    $(document).on('pageinit', "#advancedMetadataConfigurationPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/metadataconfigurationpage.js b/dashboard-ui/scripts/metadataconfigurationpage.js
index 8251682ea5..e416dcfcff 100644
--- a/dashboard-ui/scripts/metadataconfigurationpage.js
+++ b/dashboard-ui/scripts/metadataconfigurationpage.js
@@ -36,7 +36,7 @@
         return false;
     }
 
-    $(document).on('pageinitdepends', "#metadataConfigurationPage", function () {
+    $(document).on('pageinit', "#metadataConfigurationPage", function () {
 
         Dashboard.showLoadingMsg();
 
diff --git a/dashboard-ui/scripts/metadataimagespage.js b/dashboard-ui/scripts/metadataimagespage.js
index b6bf15c98a..f209e5a0ef 100644
--- a/dashboard-ui/scripts/metadataimagespage.js
+++ b/dashboard-ui/scripts/metadataimagespage.js
@@ -518,7 +518,7 @@
         return false;
     }
 
-    $(document).on('pageinitdepends', "#metadataImagesConfigurationPage", function () {
+    $(document).on('pageinit', "#metadataImagesConfigurationPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/metadatanfo.js b/dashboard-ui/scripts/metadatanfo.js
index b7c51a1f2f..57ff3539db 100644
--- a/dashboard-ui/scripts/metadatanfo.js
+++ b/dashboard-ui/scripts/metadatanfo.js
@@ -39,7 +39,7 @@
         return false;
     }
 
-    $(document).on('pageinitdepends', "#metadataNfoPage", function () {
+    $(document).on('pageinit', "#metadataNfoPage", function () {
 
         $('.metadataNfoForm').off('submit', onSubmit).on('submit', onSubmit);
 
diff --git a/dashboard-ui/scripts/metadatasubtitles.js b/dashboard-ui/scripts/metadatasubtitles.js
index b282fd5757..020a09e325 100644
--- a/dashboard-ui/scripts/metadatasubtitles.js
+++ b/dashboard-ui/scripts/metadatasubtitles.js
@@ -77,7 +77,7 @@
         return false;
     }
 
-    $(document).on('pageinitdepends', "#metadataSubtitlesPage", function () {
+    $(document).on('pageinit', "#metadataSubtitlesPage", function () {
 
         $('.metadataSubtitlesForm').off('submit', onSubmit).on('submit', onSubmit);
 
diff --git a/dashboard-ui/scripts/moviecollections.js b/dashboard-ui/scripts/moviecollections.js
index 0a39056bb1..93448d5291 100644
--- a/dashboard-ui/scripts/moviecollections.js
+++ b/dashboard-ui/scripts/moviecollections.js
@@ -209,7 +209,7 @@
         });
     }
 
-    $(document).on('pageinitdepends', "#boxsetsPage", function () {
+    $(document).on('pageinit', "#boxsetsPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/moviesrecommended.js b/dashboard-ui/scripts/moviesrecommended.js
index 19ca2dc66f..cb6bce2230 100644
--- a/dashboard-ui/scripts/moviesrecommended.js
+++ b/dashboard-ui/scripts/moviesrecommended.js
@@ -316,7 +316,7 @@
     window.MoviesPage = window.MoviesPage || {};
     window.MoviesPage.renderSuggestedTab = loadSuggestionsTab;
 
-    $(document).on('pageinitdepends', "#moviesPage", function () {
+    $(document).on('pageinit', "#moviesPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/musicalbumartists.js b/dashboard-ui/scripts/musicalbumartists.js
index 458bf4acf9..3e00c63f6f 100644
--- a/dashboard-ui/scripts/musicalbumartists.js
+++ b/dashboard-ui/scripts/musicalbumartists.js
@@ -157,7 +157,7 @@
         }
     }
 
-    $(document).on('pageinitdepends', "#musicAlbumArtistsPage", function () {
+    $(document).on('pageinit', "#musicAlbumArtistsPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/musicalbums.js b/dashboard-ui/scripts/musicalbums.js
index e69b4aea53..3039062317 100644
--- a/dashboard-ui/scripts/musicalbums.js
+++ b/dashboard-ui/scripts/musicalbums.js
@@ -170,7 +170,7 @@
         }
     }
 
-    $(document).on('pageinitdepends', "#musicAlbumsPage", function () {
+    $(document).on('pageinit', "#musicAlbumsPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/musicartists.js b/dashboard-ui/scripts/musicartists.js
index 287a4db071..6721ba2030 100644
--- a/dashboard-ui/scripts/musicartists.js
+++ b/dashboard-ui/scripts/musicartists.js
@@ -155,7 +155,7 @@
         }
     }
 
-    $(document).on('pageinitdepends', "#musicArtistsPage", function () {
+    $(document).on('pageinit', "#musicArtistsPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/musicgenres.js b/dashboard-ui/scripts/musicgenres.js
index 2576802d7b..04746437a5 100644
--- a/dashboard-ui/scripts/musicgenres.js
+++ b/dashboard-ui/scripts/musicgenres.js
@@ -91,7 +91,7 @@
         $('#selectPageSize', page).val(query.Limit).selectmenu('refresh');
     }
 
-    $(document).on('pageinitdepends', "#musicGenresPage", function () {
+    $(document).on('pageinit', "#musicGenresPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/musicvideos.js b/dashboard-ui/scripts/musicvideos.js
index 6d2bd62633..d07f97f435 100644
--- a/dashboard-ui/scripts/musicvideos.js
+++ b/dashboard-ui/scripts/musicvideos.js
@@ -127,7 +127,7 @@
         }
     }
 
-    $(document).on('pageinitdepends', "#musicVideosPage", function () {
+    $(document).on('pageinit', "#musicVideosPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/mypreferencesdisplay.js b/dashboard-ui/scripts/mypreferencesdisplay.js
index 234bfefac9..fb2b02377f 100644
--- a/dashboard-ui/scripts/mypreferencesdisplay.js
+++ b/dashboard-ui/scripts/mypreferencesdisplay.js
@@ -53,7 +53,7 @@
         return false;
     }
 
-    $(document).on('pageinitdepends', "#displayPreferencesPage", function () {
+    $(document).on('pageinit', "#displayPreferencesPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/mypreferenceshome.js b/dashboard-ui/scripts/mypreferenceshome.js
index 693ed7ff7a..3c8477eae4 100644
--- a/dashboard-ui/scripts/mypreferenceshome.js
+++ b/dashboard-ui/scripts/mypreferenceshome.js
@@ -230,7 +230,7 @@
         return false;
     }
 
-    $(document).on('pageinitdepends', "#homeScreenPreferencesPage", function () {
+    $(document).on('pageinit', "#homeScreenPreferencesPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/mypreferenceslanguages.js b/dashboard-ui/scripts/mypreferenceslanguages.js
index 8ef34d73cb..85ea48877d 100644
--- a/dashboard-ui/scripts/mypreferenceslanguages.js
+++ b/dashboard-ui/scripts/mypreferenceslanguages.js
@@ -116,7 +116,7 @@
         return false;
     }
 
-    $(document).on('pageinitdepends', "#languagePreferencesPage", function () {
+    $(document).on('pageinit', "#languagePreferencesPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/myprofile.js b/dashboard-ui/scripts/myprofile.js
index 330b242326..f9df19c372 100644
--- a/dashboard-ui/scripts/myprofile.js
+++ b/dashboard-ui/scripts/myprofile.js
@@ -181,7 +181,7 @@
 
     window.MyProfilePage = new myProfilePage();
 
-    $(document).on('pageinitdepends', "#userImagePage", function () {
+    $(document).on('pageinit', "#userImagePage", function () {
 
         var page = this;
 
@@ -406,7 +406,7 @@
 
     window.UpdatePasswordPage = new updatePasswordPage();
 
-    $(document).on('pageinitdepends', ".userPasswordPage", function () {
+    $(document).on('pageinit', ".userPasswordPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/mysync.js b/dashboard-ui/scripts/mysync.js
index a42f718a40..53a9d3c1ac 100644
--- a/dashboard-ui/scripts/mysync.js
+++ b/dashboard-ui/scripts/mysync.js
@@ -34,7 +34,7 @@
 
     var interval;
 
-    $(document).on('pageinitdepends', "#mySyncActivityPage", function () {
+    $(document).on('pageinit', "#mySyncActivityPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/mysyncsettings.js b/dashboard-ui/scripts/mysyncsettings.js
index 5b425a7316..16f45f4982 100644
--- a/dashboard-ui/scripts/mysyncsettings.js
+++ b/dashboard-ui/scripts/mysyncsettings.js
@@ -37,7 +37,7 @@
         return false;
     }
 
-    $(document).on('pageinitdepends', "#syncPreferencesPage", function () {
+    $(document).on('pageinit', "#syncPreferencesPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/notificationsetting.js b/dashboard-ui/scripts/notificationsetting.js
index f8efeb9a42..cb6dd4911b 100644
--- a/dashboard-ui/scripts/notificationsetting.js
+++ b/dashboard-ui/scripts/notificationsetting.js
@@ -161,7 +161,7 @@
         return false;
     }
 
-    $(document).on('pageinitdepends', "#notificationSettingPage", function () {
+    $(document).on('pageinit', "#notificationSettingPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/nowplayingpage.js b/dashboard-ui/scripts/nowplayingpage.js
index d569e75526..1a21418711 100644
--- a/dashboard-ui/scripts/nowplayingpage.js
+++ b/dashboard-ui/scripts/nowplayingpage.js
@@ -742,7 +742,7 @@
         });
     }
 
-    $(document).on('pageinitdepends', "#nowPlayingPage", function () {
+    $(document).on('pageinit', "#nowPlayingPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/photos.js b/dashboard-ui/scripts/photos.js
index 264975bd16..e6d5e11bba 100644
--- a/dashboard-ui/scripts/photos.js
+++ b/dashboard-ui/scripts/photos.js
@@ -201,7 +201,7 @@
         }
     }
 
-    $(document).on('pageinitdepends', "#photosPage", function () {
+    $(document).on('pageinit', "#photosPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/playbackconfiguration.js b/dashboard-ui/scripts/playbackconfiguration.js
index 5012c5467d..754606785f 100644
--- a/dashboard-ui/scripts/playbackconfiguration.js
+++ b/dashboard-ui/scripts/playbackconfiguration.js
@@ -27,7 +27,7 @@
         return false;
     }
 
-    $(document).on('pageinitdepends', "#playbackConfigurationPage", function () {
+    $(document).on('pageinit', "#playbackConfigurationPage", function () {
 
         $('.playbackConfigurationForm').off('submit', onSubmit).on('submit', onSubmit);
 
diff --git a/dashboard-ui/scripts/plugincatalogpage.js b/dashboard-ui/scripts/plugincatalogpage.js
index 8d26ea9c1d..1177bd7c46 100644
--- a/dashboard-ui/scripts/plugincatalogpage.js
+++ b/dashboard-ui/scripts/plugincatalogpage.js
@@ -244,7 +244,7 @@
         return html;
     }
 
-    $(document).on('pageinitdepends', "#pluginCatalogPage", function () {
+    $(document).on('pageinit', "#pluginCatalogPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/reports.js b/dashboard-ui/scripts/reports.js
index 8f990d810d..8fc2cc6a26 100644
--- a/dashboard-ui/scripts/reports.js
+++ b/dashboard-ui/scripts/reports.js
@@ -540,7 +540,7 @@
         }
     }
 
-    $(document).on('pageinitdepends', "#libraryReportManagerPage", function () {
+    $(document).on('pageinit', "#libraryReportManagerPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/scheduledtaskpage.js b/dashboard-ui/scripts/scheduledtaskpage.js
index 4b20783f1c..14b6ad9eb4 100644
--- a/dashboard-ui/scripts/scheduledtaskpage.js
+++ b/dashboard-ui/scripts/scheduledtaskpage.js
@@ -310,7 +310,7 @@
         return false;
     }
 
-    $(document).on('pageinitdepends', "#scheduledTaskPage", function () {
+    $(document).on('pageinit', "#scheduledTaskPage", function () {
 
         $('.addTriggerForm').off('submit', onSubmit).on('submit', onSubmit);
 
diff --git a/dashboard-ui/scripts/scheduledtaskspage.js b/dashboard-ui/scripts/scheduledtaskspage.js
index f16ec2cb52..b2b047c147 100644
--- a/dashboard-ui/scripts/scheduledtaskspage.js
+++ b/dashboard-ui/scripts/scheduledtaskspage.js
@@ -194,7 +194,7 @@
         }
     }
 
-    $(document).on('pageinitdepends', "#scheduledTasksPage", function () {
+    $(document).on('pageinit', "#scheduledTasksPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/secondaryitems.js b/dashboard-ui/scripts/secondaryitems.js
index 58a7e9d463..7fb8bfb62d 100644
--- a/dashboard-ui/scripts/secondaryitems.js
+++ b/dashboard-ui/scripts/secondaryitems.js
@@ -167,7 +167,7 @@
         });
     }
 
-    $(document).on('pageinitdepends', "#secondaryItemsPage", function () {
+    $(document).on('pageinit', "#secondaryItemsPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/selectserver.js b/dashboard-ui/scripts/selectserver.js
index a18d952dcc..b612b73d14 100644
--- a/dashboard-ui/scripts/selectserver.js
+++ b/dashboard-ui/scripts/selectserver.js
@@ -341,7 +341,7 @@
         }
     }
 
-    $(document).on('pageinitdepends pagebeforeshow', "#selectServerPage", function () {
+    $(document).on('pageinit pagebeforeshow', "#selectServerPage", function () {
 
         var page = this;
         updatePageStyle(page);
diff --git a/dashboard-ui/scripts/serversecurity.js b/dashboard-ui/scripts/serversecurity.js
index 5620f95ade..59f6f9ea50 100644
--- a/dashboard-ui/scripts/serversecurity.js
+++ b/dashboard-ui/scripts/serversecurity.js
@@ -119,7 +119,7 @@
         return false;
     }
 
-    $(document).on('pageinitdepends', "#serverSecurityPage", function () {
+    $(document).on('pageinit', "#serverSecurityPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/shared.js b/dashboard-ui/scripts/shared.js
index 0c820b309f..d9b9193941 100644
--- a/dashboard-ui/scripts/shared.js
+++ b/dashboard-ui/scripts/shared.js
@@ -61,7 +61,7 @@
         LibraryBrowser.renderDetailImage(page.querySelector('.detailImageContainer'), item, '#');
     }
 
-    $(document).on('pageinitdepends', "#publicSharedItemPage", function () {
+    $(document).on('pageinit', "#publicSharedItemPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index ee6c3a86ee..673d9224bd 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -2149,7 +2149,7 @@ var AppInfo = {};
             capabilities.DeviceProfile = MediaPlayer.getDeviceProfile(Math.max(screen.height, screen.width));
             createConnectionManager(capabilities).done(function () { onConnectionManagerCreated(deferred); });
 
-            //$(document.body).append('<div style="background:#3F51B5;position:fixed;z-index:999999;top:1px;left:1px;width:800px;height:450px;display:flex;align-items:center;justify-content:center;"><iron-icon icon="live-tv" style="width:320px;height:320px;color:#fff;"></iron-icon></div>');
+            //$(document.body).append('<div style="background:#00ACC1;position:fixed;z-index:999999;top:1px;left:1px;width:800px;height:450px;display:flex;align-items:center;justify-content:center;"><iron-icon icon="ondemand-video" style="width:320px;height:320px;color:#fff;"></iron-icon></div>');
         });
     }
 
@@ -2272,15 +2272,12 @@ $(document).on('pagecreate', ".page", function () {
         document.body.classList.remove('darkScrollbars');
     }
 
-}).on('pageinit', ".page", function () {
-
-    var page = this;
-    Events.trigger(page, 'pageinitdepends');
-
 }).on('pageshow', ".page", function () {
 
     var page = this;
 
+    Dashboard.ensurePageTitle(page);
+
     var apiClient = window.ApiClient;
 
     if (apiClient && apiClient.accessToken() && Dashboard.getCurrentUserId()) {
@@ -2294,7 +2291,6 @@ $(document).on('pagecreate', ".page", function () {
 
                 if (!user.Policy.IsAdministrator) {
                     Dashboard.logout();
-                    return;
                 }
             });
         }
diff --git a/dashboard-ui/scripts/songs.js b/dashboard-ui/scripts/songs.js
index ceea2fd0b2..6094401f93 100644
--- a/dashboard-ui/scripts/songs.js
+++ b/dashboard-ui/scripts/songs.js
@@ -132,7 +132,7 @@
         }
     }
 
-    $(document).on('pageinitdepends', "#songsPage", function () {
+    $(document).on('pageinit', "#songsPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/streamingsettings.js b/dashboard-ui/scripts/streamingsettings.js
index bdb2217a7b..65cb296dbe 100644
--- a/dashboard-ui/scripts/streamingsettings.js
+++ b/dashboard-ui/scripts/streamingsettings.js
@@ -23,7 +23,7 @@
         return false;
     }
 
-    $(document).on('pageinitdepends', "#streamingSettingsPage", function () {
+    $(document).on('pageinit', "#streamingSettingsPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/supporterkeypage.js b/dashboard-ui/scripts/supporterkeypage.js
index eaa6dd3253..110ded1d56 100644
--- a/dashboard-ui/scripts/supporterkeypage.js
+++ b/dashboard-ui/scripts/supporterkeypage.js
@@ -255,7 +255,7 @@ $(document).on('pageshowready', "#supporterKeyPage", SupporterKeyPage.onPageShow
 
     }
 
-    $(document).on('pageinitdepends', "#supporterKeyPage", function () {
+    $(document).on('pageinit', "#supporterKeyPage", function () {
 
         var page = this;
         $('#btnAddConnectUser', page).on('click', function () {
diff --git a/dashboard-ui/scripts/supporterpage.js b/dashboard-ui/scripts/supporterpage.js
index f6b11c4166..7c64c41ab5 100644
--- a/dashboard-ui/scripts/supporterpage.js
+++ b/dashboard-ui/scripts/supporterpage.js
@@ -121,7 +121,7 @@
         }
     }
 
-    $(document).on('pageinitdepends', "#supporterPage", function () {
+    $(document).on('pageinit', "#supporterPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/sync.js b/dashboard-ui/scripts/sync.js
index 6435bda709..ca1f5eec9f 100644
--- a/dashboard-ui/scripts/sync.js
+++ b/dashboard-ui/scripts/sync.js
@@ -399,7 +399,7 @@
         });
     }
 
-    $(document).on('pageinitdepends', ".libraryPage", function () {
+    $(document).on('pageinit', ".libraryPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/syncjob.js b/dashboard-ui/scripts/syncjob.js
index e8a8e75ee2..1c60d9e9e3 100644
--- a/dashboard-ui/scripts/syncjob.js
+++ b/dashboard-ui/scripts/syncjob.js
@@ -386,7 +386,7 @@
         return false;
     }
 
-    $(document).on('pageinitdepends', ".syncJobPage", function () {
+    $(document).on('pageinit', ".syncJobPage", function () {
 
         $('.syncJobForm').off('submit', onSubmit).on('submit', onSubmit);
 
diff --git a/dashboard-ui/scripts/syncsettings.js b/dashboard-ui/scripts/syncsettings.js
index 7bfc9e4503..8dc1309a0f 100644
--- a/dashboard-ui/scripts/syncsettings.js
+++ b/dashboard-ui/scripts/syncsettings.js
@@ -29,7 +29,7 @@
         return false;
     }
 
-    $(document).on('pageinitdepends', "#syncSettingsPage", function () {
+    $(document).on('pageinit', "#syncSettingsPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/tvpeople.js b/dashboard-ui/scripts/tvpeople.js
index 861c754c11..78baa35632 100644
--- a/dashboard-ui/scripts/tvpeople.js
+++ b/dashboard-ui/scripts/tvpeople.js
@@ -96,7 +96,7 @@
         $('.alphabetPicker', page).alphaValue(query.NameStartsWithOrGreater);
     }
 
-    $(document).on('pageinitdepends', "#tvPeoplePage", function () {
+    $(document).on('pageinit', "#tvPeoplePage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/tvshows.js b/dashboard-ui/scripts/tvshows.js
index 486e91ef15..c75ecf5d4d 100644
--- a/dashboard-ui/scripts/tvshows.js
+++ b/dashboard-ui/scripts/tvshows.js
@@ -222,7 +222,7 @@
         }
     }
 
-    $(document).on('pageinitdepends', "#tvShowsPage", function () {
+    $(document).on('pageinit', "#tvShowsPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/useredit.js b/dashboard-ui/scripts/useredit.js
index e972e08fa7..4e4cac7cac 100644
--- a/dashboard-ui/scripts/useredit.js
+++ b/dashboard-ui/scripts/useredit.js
@@ -193,7 +193,7 @@
         });
     }
 
-    $(document).on('pageinitdepends', "#editUserPage", function () {
+    $(document).on('pageinit', "#editUserPage", function () {
 
         $('.editUserProfileForm').off('submit', onSubmit).on('submit', onSubmit);
 
diff --git a/dashboard-ui/scripts/userlibraryaccess.js b/dashboard-ui/scripts/userlibraryaccess.js
index 877364386d..40b0c888e6 100644
--- a/dashboard-ui/scripts/userlibraryaccess.js
+++ b/dashboard-ui/scripts/userlibraryaccess.js
@@ -165,7 +165,7 @@
         return false;
     }
 
-    $(document).on('pageinitdepends', "#userLibraryAccessPage", function () {
+    $(document).on('pageinit', "#userLibraryAccessPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/usernew.js b/dashboard-ui/scripts/usernew.js
index b55215e6b4..d72b2d78c7 100644
--- a/dashboard-ui/scripts/usernew.js
+++ b/dashboard-ui/scripts/usernew.js
@@ -125,7 +125,7 @@
         loadUser(page);
     }
 
-    $(document).on('pageinitdepends', "#newUserPage", function () {
+    $(document).on('pageinit', "#newUserPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/userparentalcontrol.js b/dashboard-ui/scripts/userparentalcontrol.js
index a208bbba08..ef305d0321 100644
--- a/dashboard-ui/scripts/userparentalcontrol.js
+++ b/dashboard-ui/scripts/userparentalcontrol.js
@@ -367,7 +367,7 @@
         $('#txtBlockedTag', page).val('').focus();
     }
 
-    $(document).on('pageinitdepends', "#userParentalControlPage", function () {
+    $(document).on('pageinit', "#userParentalControlPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/userpassword.js b/dashboard-ui/scripts/userpassword.js
index c2cda1cfab..72d44d983f 100644
--- a/dashboard-ui/scripts/userpassword.js
+++ b/dashboard-ui/scripts/userpassword.js
@@ -28,7 +28,7 @@
         });
     }
 
-    $(document).on('pageinitdepends', "#userPasswordPage", function () {
+    $(document).on('pageinit', "#userPasswordPage", function () {
 
         $('.adminUpdatePasswordForm').off('submit', UpdatePasswordPage.onSubmit).on('submit', UpdatePasswordPage.onSubmit);
         $('.adminLocalAccessForm').off('submit', UpdatePasswordPage.onLocalAccessSubmit).on('submit', UpdatePasswordPage.onLocalAccessSubmit);
diff --git a/dashboard-ui/scripts/userprofilespage.js b/dashboard-ui/scripts/userprofilespage.js
index 7905c2beb4..b86368b674 100644
--- a/dashboard-ui/scripts/userprofilespage.js
+++ b/dashboard-ui/scripts/userprofilespage.js
@@ -461,7 +461,7 @@
         return false;
     }
 
-    $(document).on('pageinitdepends', "#userProfilesPage", function () {
+    $(document).on('pageinit', "#userProfilesPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/wizardagreement.js b/dashboard-ui/scripts/wizardagreement.js
index 900359bb63..357a2bf919 100644
--- a/dashboard-ui/scripts/wizardagreement.js
+++ b/dashboard-ui/scripts/wizardagreement.js
@@ -17,7 +17,7 @@
         return false;
     }
 
-    $(document).on('pageinitdepends', '#wizardAgreementPage', function () {
+    $(document).on('pageinit', '#wizardAgreementPage', function () {
 
         $('.wizardAgreementForm').off('submit', onSubmit).on('submit', onSubmit);
     });
diff --git a/dashboard-ui/scripts/wizardfinishpage.js b/dashboard-ui/scripts/wizardfinishpage.js
index 7f641de41d..cfe20d1015 100644
--- a/dashboard-ui/scripts/wizardfinishpage.js
+++ b/dashboard-ui/scripts/wizardfinishpage.js
@@ -13,7 +13,7 @@
         });
 	}
 
-    $(document).on('pageinitdepends', '#wizardFinishPage', function(){
+    $(document).on('pageinit', '#wizardFinishPage', function(){
 
     	$('.btnWizardNext', this).on('click', onFinish);
     });
diff --git a/dashboard-ui/scripts/wizardlivetvguide.js b/dashboard-ui/scripts/wizardlivetvguide.js
index 4a7b925d2e..e0743f3e4c 100644
--- a/dashboard-ui/scripts/wizardlivetvguide.js
+++ b/dashboard-ui/scripts/wizardlivetvguide.js
@@ -80,7 +80,7 @@
         $('#selectType', page).trigger('change');
     }
 
-    $(document).on('pageinitdepends', "#wizardGuidePage", function () {
+    $(document).on('pageinit', "#wizardGuidePage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/wizardlivetvtuner.js b/dashboard-ui/scripts/wizardlivetvtuner.js
index 933c29dfc2..2ddcbb3f19 100644
--- a/dashboard-ui/scripts/wizardlivetvtuner.js
+++ b/dashboard-ui/scripts/wizardlivetvtuner.js
@@ -81,7 +81,7 @@
         return false;
     }
 
-    $(document).on('pageinitdepends', "#wizardTunerPage", function () {
+    $(document).on('pageinit', "#wizardTunerPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/wizardservice.js b/dashboard-ui/scripts/wizardservice.js
index 2f68245ce7..dc8922c6c8 100644
--- a/dashboard-ui/scripts/wizardservice.js
+++ b/dashboard-ui/scripts/wizardservice.js
@@ -1,6 +1,6 @@
 (function ($, document) {
 
-    $(document).on('pageinitdepends', "#wizardServicePage", function () {
+    $(document).on('pageinit', "#wizardServicePage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/wizardsettings.js b/dashboard-ui/scripts/wizardsettings.js
index aac59670e6..3fa128d817 100644
--- a/dashboard-ui/scripts/wizardsettings.js
+++ b/dashboard-ui/scripts/wizardsettings.js
@@ -70,7 +70,7 @@
         return false;
     }
 
-    $(document).on('pageinitdepends', "#wizardSettingsPage", function () {
+    $(document).on('pageinit', "#wizardSettingsPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/wizardstartpage.js b/dashboard-ui/scripts/wizardstartpage.js
index 68af4b7b78..c54aacc074 100644
--- a/dashboard-ui/scripts/wizardstartpage.js
+++ b/dashboard-ui/scripts/wizardstartpage.js
@@ -42,7 +42,7 @@
         return false;
     }
 
-    $(document).on('pageinitdepends', "#wizardStartPage", function () {
+    $(document).on('pageinit', "#wizardStartPage", function () {
 
         $('.wizardStartForm').off('submit', onSubmit).on('submit', onSubmit);
 
diff --git a/dashboard-ui/scripts/wizarduserpage.js b/dashboard-ui/scripts/wizarduserpage.js
index 64874b1936..fd5fc695d3 100644
--- a/dashboard-ui/scripts/wizarduserpage.js
+++ b/dashboard-ui/scripts/wizarduserpage.js
@@ -56,7 +56,7 @@
         return false;
     }
 
-    $(document).on('pageinitdepends', "#wizardUserPage", function () {
+    $(document).on('pageinit', "#wizardUserPage", function () {
 
         $('.wizardUserForm').off('submit', onSubmit).on('submit', onSubmit);
 
diff --git a/dashboard-ui/thirdparty/emby-icons.html b/dashboard-ui/thirdparty/emby-icons.html
index 99339b51ac..43e2385c90 100644
--- a/dashboard-ui/thirdparty/emby-icons.html
+++ b/dashboard-ui/thirdparty/emby-icons.html
@@ -131,6 +131,7 @@ See [iron-iconset](#iron-iconset) and [iron-iconset-svg](#iron-iconset-svg) for
             <g id="filter-list"><path d="M10 18h4v-2h-4v2zM3 6v2h18V6H3zm3 7h12v-2H6v2z" /></g>
             <g id="error"><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-2h2v2zm0-4h-2V7h2v6z" /></g>
             <g id="wifi"><path d="M1 9l2 2c4.97-4.97 13.03-4.97 18 0l2-2C16.93 2.93 7.08 2.93 1 9zm8 8l3 3 3-3c-1.65-1.66-4.34-1.66-6 0zm-4-4l2 2c2.76-2.76 7.24-2.76 10 0l2-2C15.14 9.14 8.87 9.14 5 13z" /></g>
+            <g id="ondemand-video"><path d="M21 3H3c-1.11 0-2 .89-2 2v12c0 1.1.89 2 2 2h5v2h8v-2h5c1.1 0 1.99-.9 1.99-2L23 5c0-1.11-.9-2-2-2zm0 14H3V5h18v12zm-5-6l-7 4V7z" /></g>
         </defs>
     </svg>
 </iron-iconset-svg>
diff --git a/dashboard-ui/thirdparty/paper-button-style.css b/dashboard-ui/thirdparty/paper-button-style.css
index e6752419fe..6eb6aae80a 100644
--- a/dashboard-ui/thirdparty/paper-button-style.css
+++ b/dashboard-ui/thirdparty/paper-button-style.css
@@ -341,10 +341,10 @@ paper-menu-item {
 }
 
 .libraryViewNav paper-tabs {
-    /*display: block !important;*/
     flex: none;
     flex-shrink: 0;
     flex-grow: 0;
+    overflow-x: visible !important;
 }
 
 .libraryViewNav paper-tab {
@@ -354,19 +354,8 @@ paper-menu-item {
     flex-grow: 0;
 }
 
-.papertabs-800 {
-    min-width: 800px;
-}
-
 .scrollingPaperTabs #tabsContainer {
-    margin: 0;
-}
-
-@media all and (min-width: 800px) {
-
-    .papertabs-800 #tabsContainer {
-        margin: auto;
-    }
+    margin: 0 auto;
 }
 
 /*.scrollablePaperTabs #tabsContainer {
diff --git a/dashboard-ui/vulcanize-out.html b/dashboard-ui/vulcanize-out.html
index 7a63133d03..3a779a4a00 100644
--- a/dashboard-ui/vulcanize-out.html
+++ b/dashboard-ui/vulcanize-out.html
@@ -14379,7 +14379,6 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
   </style>
 
   <template>
-    <iron-meta id="meta" type="iconset"></iron-meta>
   </template>
 
   <script>
@@ -14416,7 +14415,12 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
         src: {
           type: String,
           observer: '_srcChanged'
+        },
+        
+        _meta: {
+          value: Polymer.Base.create('iron-meta', {type: 'iconset'})
         }
+        
       },
 
       _DEFAULT_ICONSET: 'icons',
@@ -14440,7 +14444,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
       _updateIcon: function() {
         if (this._usesIconset()) {
           if (this._iconsetName) {
-            this._iconset = this.$.meta.byKey(this._iconsetName);
+            this._iconset = this._meta.byKey(this._iconsetName);
             if (this._iconset) {
               this._iconset.applyIcon(this, this._iconName, this.theme);
             } else {
@@ -18762,7 +18766,8 @@ paper-ripple {
 <dom-module id="paper-radio-button" assetpath="bower_components/paper-radio-button/">
 
   <style>
-/*
+/**
+@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
@@ -18886,7 +18891,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
       <paper-ripple id="ink" class="circle" center="" checked$="[[checked]]"></paper-ripple>
     </div>
 
-    <div id="radioLabel" aria-hidden="true"><content></content></div>
+    <div id="radioLabel"><content></content></div>
 
   </template>
 
@@ -18895,7 +18900,8 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
       is: 'paper-radio-button',
 
       behaviors: [
-        Polymer.PaperInkyFocusBehavior
+        Polymer.PaperInkyFocusBehavior,
+        Polymer.IronCheckedElementBehavior
       ],
 
       hostAttributes: {
@@ -18917,38 +18923,30 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
          * @event iron-change
          */
 
-        /**
-         * Gets or sets the state, `true` is checked and `false` is unchecked.
-         */
-        checked: {
-          type: Boolean,
-          value: false,
-          reflectToAttribute: true,
-          notify: true,
-          observer: '_checkedChanged'
-        },
-
-        /**
-         * If true, the button toggles the active state with each tap or press
-         * of the spacebar.
-         */
-        toggles: {
-          type: Boolean,
-          value: true,
-          reflectToAttribute: true
-        }
+         ariaActiveAttribute: {
+           value: 'aria-checked'
+         }
       },
 
       attached: function() {
-        var trimmedText = Polymer.dom(this).textContent.trim();
-        if (trimmedText === '') {
-          this.$.radioLabel.hidden = true;
-        }
-        // Don't stomp over a user-set aria-label.
-        if (trimmedText !== '' && !this.getAttribute('aria-label')) {
-          this.setAttribute('aria-label', trimmedText);
-        }
         this._isReady = true;
+
+        // Don't stomp over a user-set aria-label.
+        if (!this.getAttribute('aria-label')) {
+          this.updateAriaLabel();
+        }
+      },
+
+      /**
+       * Update the checkbox aria-label. This is a temporary workaround not
+       * being able to observe changes in <content>
+       * (see: https://github.com/Polymer/polymer/issues/1773)
+       *
+       * Call this if you manually change the contents of the checkbox
+       * and want the aria-label to match the new contents.
+       */
+      updateAriaLabel: function() {
+        this.setAttribute('aria-label', Polymer.dom(this).textContent.trim());
       },
 
       _buttonStateChanged: function() {
@@ -18958,12 +18956,6 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
         if (this._isReady) {
           this.checked = this.active;
         }
-      },
-
-      _checkedChanged: function() {
-        this.setAttribute('aria-checked', this.checked ? 'true' : 'false');
-        this.active = this.checked;
-        this.fire('iron-change');
       }
     })
   </script>
@@ -19181,6 +19173,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
             <g id="filter-list"><path d="M10 18h4v-2h-4v2zM3 6v2h18V6H3zm3 7h12v-2H6v2z"></path></g>
             <g id="error"><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-2h2v2zm0-4h-2V7h2v6z"></path></g>
             <g id="wifi"><path d="M1 9l2 2c4.97-4.97 13.03-4.97 18 0l2-2C16.93 2.93 7.08 2.93 1 9zm8 8l3 3 3-3c-1.65-1.66-4.34-1.66-6 0zm-4-4l2 2c2.76-2.76 7.24-2.76 10 0l2-2C15.14 9.14 8.87 9.14 5 13z"></path></g>
+            <g id="ondemand-video"><path d="M21 3H3c-1.11 0-2 .89-2 2v12c0 1.1.89 2 2 2h5v2h8v-2h5c1.1 0 1.99-.9 1.99-2L23 5c0-1.11-.9-2-2-2zm0 14H3V5h18v12zm-5-6l-7 4V7z"></path></g>
         </defs>
     </svg>
 </iron-iconset-svg>