diff --git a/dashboard-ui/addplugin.html b/dashboard-ui/addplugin.html
index 4125e8075..ed997782f 100644
--- a/dashboard-ui/addplugin.html
+++ b/dashboard-ui/addplugin.html
@@ -4,7 +4,7 @@
     <title>${TitlePlugins}</title>
 </head>
 <body>
-    <div id="addPluginPage" data-role="page" class="page type-interior pluginConfigurationPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Plugins" data-require="registrationservices,scripts/ratingdialog,scripts/addpluginpage">
+    <div id="addPluginPage" data-role="page" class="page type-interior pluginConfigurationPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Plugins" data-require="jqmcollapsible,registrationservices,scripts/ratingdialog,scripts/addpluginpage">
 
         <div data-role="content">
             <div class="content-primary">
diff --git a/dashboard-ui/advanced.html b/dashboard-ui/advanced.html
index 74c690cff..2b991cc0d 100644
--- a/dashboard-ui/advanced.html
+++ b/dashboard-ui/advanced.html
@@ -4,7 +4,7 @@
     <title>${TitleAdvanced}</title>
 </head>
 <body>
-    <div id="advancedConfigurationPage" data-role="page" class="page type-interior advancedConfigurationPage" data-require="scripts/advancedconfigurationpage,paper-input">
+    <div id="advancedConfigurationPage" data-role="page" class="page type-interior advancedConfigurationPage" data-require="jqmcollapsible,scripts/advancedconfigurationpage,paper-input">
 
         <div data-role="content">
             <div class="content-primary">
diff --git a/dashboard-ui/autoorganizetv.html b/dashboard-ui/autoorganizetv.html
index d2a4810a3..f995a81f2 100644
--- a/dashboard-ui/autoorganizetv.html
+++ b/dashboard-ui/autoorganizetv.html
@@ -4,7 +4,7 @@
     <title>${TitleAutoOrganize}</title>
 </head>
 <body>
-    <div id="libraryFileOrganizerPage" data-role="page" class="page type-interior organizePage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Auto-Organize" data-require="jqmtable,scripts/autoorganizetv,paper-input">
+    <div id="libraryFileOrganizerPage" data-role="page" class="page type-interior organizePage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Auto-Organize" data-require="jqmcollapsible,jqmtable,scripts/autoorganizetv,paper-input">
 
         <div data-role="content">
             <div class="content-primary">
diff --git a/dashboard-ui/components/metadataeditor/metadataeditor.js b/dashboard-ui/components/metadataeditor/metadataeditor.js
index 2814fbc58..39692a615 100644
--- a/dashboard-ui/components/metadataeditor/metadataeditor.js
+++ b/dashboard-ui/components/metadataeditor/metadataeditor.js
@@ -729,7 +729,7 @@
             html += '</li>';
         }
 
-        //elem.html(html).listview('refresh');
+        //elem.html(html);
 
         $('.btnDeletePerson', elem).on('click', function () {
 
diff --git a/dashboard-ui/css/site.css b/dashboard-ui/css/site.css
index f91478add..c8e8e2e11 100644
--- a/dashboard-ui/css/site.css
+++ b/dashboard-ui/css/site.css
@@ -808,7 +808,6 @@ h1 .imageLink {
     }
 
 .fieldDescription {
-    font-size: 12px;
     padding-left: 5px;
     font-weight: normal;
     white-space: normal !important;
diff --git a/dashboard-ui/dashboard.html b/dashboard-ui/dashboard.html
index 1f9a556f8..0a8fa95c5 100644
--- a/dashboard-ui/dashboard.html
+++ b/dashboard-ui/dashboard.html
@@ -4,7 +4,7 @@
     <title>Emby</title>
 </head>
 <body>
-    <div id="dashboardPage" data-role="page" class="page type-interior dashboardHomePage" data-require="scripts/dashboardpage,humanedate,buttonenabled,paper-icon-item,paper-item-body,paper-fab">
+    <div id="dashboardPage" data-role="page" class="page type-interior dashboardHomePage" data-require="jqmcollapsible,scripts/dashboardpage,humanedate,buttonenabled,paper-icon-item,paper-item-body,paper-fab">
 
         <div data-role="content">
             <div class="content-primary">
diff --git a/dashboard-ui/dashboardgeneral.html b/dashboard-ui/dashboardgeneral.html
index 65c112db7..2c12ecc12 100644
--- a/dashboard-ui/dashboardgeneral.html
+++ b/dashboard-ui/dashboardgeneral.html
@@ -4,7 +4,7 @@
     <title>${TitleServer}</title>
 </head>
 <body>
-    <div id="dashboardGeneralPage" data-role="page" class="page type-interior dashboardHomePage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Server%20Settings" data-require="scripts/dashboardgeneral,paper-textarea,paper-input">
+    <div id="dashboardGeneralPage" data-role="page" class="page type-interior dashboardHomePage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Server%20Settings" data-require="jqmcollapsible,scripts/dashboardgeneral,paper-textarea,paper-input">
 
         <div data-role="content">
             <div class="content-primary">
@@ -23,7 +23,7 @@
                     </div>
                     <br /><br />
                     <div>
-                        <label for="selectLocalizationLanguage">${LabelPreferredDisplayLanguage}</label>
+                        <label for="selectLocalizationLanguage" class="selectLabel">${LabelPreferredDisplayLanguage}</label>
                         <select id="selectLocalizationLanguage" data-mini="true"></select>
                         <div class="fieldDescription">
                             <div>${LabelPreferredDisplayLanguageHelp}</div>
diff --git a/dashboard-ui/dlnaprofile.html b/dashboard-ui/dlnaprofile.html
index 2c3605e00..ee9b65118 100644
--- a/dashboard-ui/dlnaprofile.html
+++ b/dashboard-ui/dlnaprofile.html
@@ -4,7 +4,7 @@
     <title>${TitleDlna}</title>
 </head>
 <body>
-    <div id="dlnaProfilePage" data-role="page" class="page type-interior dlnaPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Dlna%20profiles" data-require="jqmpopup,scripts/dlnaprofile">
+    <div id="dlnaProfilePage" data-role="page" class="page type-interior dlnaPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Dlna%20profiles" data-require="jqmcollapsible,jqmpopup,scripts/dlnaprofile">
 
         <div data-role="content">
             <div class="content-primary">
diff --git a/dashboard-ui/librarysettings.html b/dashboard-ui/librarysettings.html
index 6cce92f67..8cc30279a 100644
--- a/dashboard-ui/librarysettings.html
+++ b/dashboard-ui/librarysettings.html
@@ -4,7 +4,7 @@
     <title>${TitleMediaLibrary}</title>
 </head>
 <body>
-    <div id="librarySettingsPage" data-role="page" class="page type-interior librarySectionPage" data-require="scripts/librarysettings">
+    <div id="librarySettingsPage" data-role="page" class="page type-interior librarySectionPage" data-require="jqmcollapsible,scripts/librarysettings">
 
         <div data-role="content">
             <div class="content-primary">
diff --git a/dashboard-ui/metadataadvanced.html b/dashboard-ui/metadataadvanced.html
index b082ff233..f4ae114b5 100644
--- a/dashboard-ui/metadataadvanced.html
+++ b/dashboard-ui/metadataadvanced.html
@@ -4,7 +4,7 @@
     <title>${TitleMetadata}</title>
 </head>
 <body>
-    <div id="advancedMetadataConfigurationPage" data-role="page" class="page type-interior metadataConfigurationPage" data-require="scripts/metadataadvanced,paper-checkbox,paper-input">
+    <div id="advancedMetadataConfigurationPage" data-role="page" class="page type-interior metadataConfigurationPage" data-require="jqmcollapsible,scripts/metadataadvanced,paper-checkbox,paper-input">
 
         <div data-role="content">
 
diff --git a/dashboard-ui/metadataimages.html b/dashboard-ui/metadataimages.html
index 32c2f5715..b1c058a20 100644
--- a/dashboard-ui/metadataimages.html
+++ b/dashboard-ui/metadataimages.html
@@ -4,7 +4,7 @@
     <title>${TitleMetadata}</title>
 </head>
 <body>
-    <div id="metadataImagesConfigurationPage" data-role="page" class="page type-interior metadataConfigurationPage" data-require="scripts/metadataimagespage">
+    <div id="metadataImagesConfigurationPage" data-role="page" class="page type-interior metadataConfigurationPage" data-require="jqmcollapsible,scripts/metadataimagespage">
 
         <div data-role="content">
 
diff --git a/dashboard-ui/playbackconfiguration.html b/dashboard-ui/playbackconfiguration.html
index a43740922..fee39531b 100644
--- a/dashboard-ui/playbackconfiguration.html
+++ b/dashboard-ui/playbackconfiguration.html
@@ -4,7 +4,7 @@
     <title>${TitlePlayback}</title>
 </head>
 <body>
-    <div id="playbackConfigurationPage" data-role="page" class="page type-interior playbackConfigurationPage" data-require="scripts/playbackconfiguration">
+    <div id="playbackConfigurationPage" data-role="page" class="page type-interior playbackConfigurationPage" data-require="jqmcollapsible,scripts/playbackconfiguration">
 
         <div data-role="content">
             <div class="content-primary">
diff --git a/dashboard-ui/scheduledtask.html b/dashboard-ui/scheduledtask.html
index 81a7e3410..b8525d28e 100644
--- a/dashboard-ui/scheduledtask.html
+++ b/dashboard-ui/scheduledtask.html
@@ -11,12 +11,17 @@
                 <div class="readOnlyContent">
                     <h2 class="taskName"></h2>
                     <p id="pTaskDescription"></p>
-                    <p>
-                        <button type="button" data-icon="plus" onclick="ScheduledTaskPage.showAddTriggerPopup();">
-                            ${ButtonAddScheduledTaskTrigger}
-                        </button>
-                    </p>
-                    <ul id="ulTaskTriggers" data-role="listview" data-inset="true" data-auto-enhanced="false" data-split-icon="minus"></ul>
+                    <div>
+                        <br />
+                        <h1 style="margin: .6em 0; vertical-align: middle; display: inline-block;">
+                            ${HeaderTaskTriggers}
+                        </h1>
+                        <paper-button raised class="btnInvite submit mini" style="margin-left: 1em;" title="${ButtonAddScheduledTaskTrigger}" onclick="ScheduledTaskPage.showAddTriggerPopup();">
+                            <iron-icon icon="add"></iron-icon>
+                            <span>${ButtonAdd}</span>
+                        </paper-button>
+                    </div>
+                    <div class="taskTriggers"></div>
                 </div>
             </div>
         </div>
@@ -26,10 +31,10 @@
                     <h3>${HeaderAddScheduledTaskTrigger}</h3>
                 </div>
                 <div data-role="content">
-
+                    <br />
                     <ul data-role="listview" class="ulForm">
                         <li>
-                            <label for="selectTriggerType">${LabelTriggerType}</label>
+                            <label for="selectTriggerType" class="selectLabel">${LabelTriggerType}</label>
                             <select id="selectTriggerType" name="selectTriggerType" onchange="ScheduledTaskPage.refreshTriggerFields(this.value);">
                                 <option value="DailyTrigger">${OptionDaily}</option>
                                 <option value="WeeklyTrigger">${OptionWeekly}</option>
@@ -39,7 +44,7 @@
                             </select>
                         </li>
                         <li id="fldDayOfWeek">
-                            <label for="selectDayOfWeek">${LabelDay}</label>
+                            <label for="selectDayOfWeek" class="selectLabel">${LabelDay}</label>
                             <select id="selectDayOfWeek" name="selectDayOfWeek">
                                 <option value="Sunday">${OptionSunday}</option>
                                 <option value="Monday">${OptionMonday}</option>
@@ -55,13 +60,13 @@
                             <input type="time" id="txtTimeOfDay" name="txtTimeOfDay" required="required" />
                         </li>
                         <li id="fldSelectSystemEvent">
-                            <label for="selectSystemEvent">${LabelEvent}</label>
+                            <label for="selectSystemEvent" class="selectLabel">${LabelEvent}</label>
                             <select id="selectSystemEvent" name="selectSystemEvent">
                                 <option value="WakeFromSleep">${OptionWakeFromSleep}</option>
                             </select>
                         </li>
                         <li id="fldSelectInterval">
-                            <label for="selectInterval">${LabelEveryXMinutes}</label>
+                            <label for="selectInterval" class="selectLabel">${LabelEveryXMinutes}</label>
                             <select id="selectInterval">
                                 <option value="9000000000">15 minutes</option>
                                 <option value="18000000000">30 minutes</option>
diff --git a/dashboard-ui/scripts/chromecast.js b/dashboard-ui/scripts/chromecast.js
index 237473163..524e276e5 100644
--- a/dashboard-ui/scripts/chromecast.js
+++ b/dashboard-ui/scripts/chromecast.js
@@ -1,4 +1,4 @@
-﻿define(['https://www.gstatic.com/cv/js/sender/v1/cast_sender.js'], function () {
+﻿define([], function () {
 
     // Based on https://github.com/googlecast/CastVideos-chrome/blob/master/CastVideos.js
     var currentResolve;
@@ -874,6 +874,10 @@
         }));
     }
 
-    initializeChromecast();
+    var fileref = document.createElement('script');
+    fileref.setAttribute("type", "text/javascript");
+    fileref.onload = initializeChromecast;
+    fileref.setAttribute("src", "https://www.gstatic.com/cv/js/sender/v1/cast_sender.js");
+    document.querySelector('head').appendChild(fileref);
 
 });
\ No newline at end of file
diff --git a/dashboard-ui/scripts/edititemmetadata.js b/dashboard-ui/scripts/edititemmetadata.js
index 7d9c6aec8..c386878d8 100644
--- a/dashboard-ui/scripts/edititemmetadata.js
+++ b/dashboard-ui/scripts/edititemmetadata.js
@@ -596,7 +596,7 @@
             html += '</li>';
         }
 
-        elem.html(html).listview('refresh');
+        elem.html(html);
 
         $('.btnDeletePerson', elem).on('click', function () {
 
@@ -716,7 +716,7 @@
         for (var i = 0; i < items.length; i++) {
             html += '<li data-mini="true"><a class="data">' + items[i] + '</a><a href="#" onclick="EditItemMetadataPage.removeElementFromListview(this)" class="btnRemoveFromEditorList"></a></li>';
         }
-        list.html(html).listview('refresh');
+        list.html(html);
     }
 
     function editableListViewValues(list) {
@@ -1008,7 +1008,6 @@
         self.removeElementFromListview = function (source) {
             var list = $(source).parents('ul[data-role="listview"]');
             $(source).parent().remove();
-            list.listview('refresh');
         };
 
         self.onRefreshFormSubmit = function () {
diff --git a/dashboard-ui/scripts/scheduledtaskpage.js b/dashboard-ui/scripts/scheduledtaskpage.js
index e957bd835..bc7841359 100644
--- a/dashboard-ui/scripts/scheduledtaskpage.js
+++ b/dashboard-ui/scripts/scheduledtaskpage.js
@@ -18,37 +18,39 @@ var ScheduledTaskPage = {
 
     loadScheduledTask: function (task) {
 
-        var page = $.mobile.activePage;
+        var page = $($.mobile.activePage)[0];
 
         $('.taskName', page).html(task.Name);
 
         $('#pTaskDescription', page).html(task.Description);
 
-        ScheduledTaskPage.loadTaskTriggers(task);
+        require(['paper-fab', 'paper-item-body', 'paper-icon-item'], function () {
+            ScheduledTaskPage.loadTaskTriggers(page, task);
+        });
 
         Dashboard.hideLoadingMsg();
     },
 
-    loadTaskTriggers: function (task) {
+    loadTaskTriggers: function (context, task) {
 
         var html = '';
 
-        html += '<li data-role="list-divider"><h3>' + Globalize.translate('HeaderTaskTriggers') + '</h3></li>';
+        html += '<div class="paperList">';
 
         for (var i = 0, length = task.Triggers.length; i < length; i++) {
 
             var trigger = task.Triggers[i];
 
-            html += '<li>';
+            html += '<paper-icon-item>';
 
-            html += '<a href="#">';
+            html += '<paper-fab mini icon="schedule" item-icon></paper-fab>';
 
-            html += '<h3>';
-            html += ScheduledTaskPage.getTriggerFriendlyName(trigger);
-            html += '</h3>';
+            html += '<paper-item-body two-line>';
+
+            html += "<div>" + ScheduledTaskPage.getTriggerFriendlyName(trigger) + "</div>";
 
             if (trigger.MaxRuntimeMs) {
-                html += '<p>';
+                html += '<div secondary>';
 
                 var hours = trigger.MaxRuntimeMs / 3600000;
 
@@ -57,19 +59,19 @@ var ScheduledTaskPage = {
                 } else {
                     html += Globalize.translate('ValueTimeLimitMultiHour', hours);
                 }
-                html += '</p>';
+                html += '</div>';
             }
 
-            html += '</a>';
+            html += '</paper-item-body>';
 
-            html += '<a href="#" onclick="ScheduledTaskPage.confirmDeleteTrigger(' + i + ');">';
-            html += Globalize.translate('Delete');
-            html += '</a>';
+            html += '<paper-icon-button icon="delete" title="' + Globalize.translate('ButtonDelete') + '" onclick="ScheduledTaskPage.confirmDeleteTrigger(' + i + ');"></paper-icon-button>';
 
-            html += '</li>';
+            html += '</paper-icon-item>';
         }
 
-        $('#ulTaskTriggers', $.mobile.activePage).html(html).listview('refresh');
+        html += '</div>';
+
+        context.querySelector('.taskTriggers').innerHTML = html;
     },
 
     getTriggerFriendlyName: function (trigger) {
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index ad7a7144f..4c3d8a516 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -1958,6 +1958,8 @@ var AppInfo = {};
         define("paper-icon-item", ["html!" + bowerPath + "/paper-item/paper-icon-item.html"]);
         define("paper-item-body", ["html!" + bowerPath + "/paper-item/paper-item-body.html"]);
 
+        define("paper-collapse-item", ["html!" + bowerPath + "/paper-collapse-item/paper-collapse-item.html"]);
+
         define("jstree", [bowerPath + "/jstree/dist/jstree.min", "css!thirdparty/jstree/themes/default/style.min.css"]);
 
         define("jqmicons", ['css!thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.icons.css']);
@@ -1969,7 +1971,7 @@ var AppInfo = {};
 
         define("jqmpopup", ["thirdparty/jquerymobile-1.4.5/jqm.popup", 'css!thirdparty/jquerymobile-1.4.5/jqm.popup.css']);
 
-        define("jqmlistview", ["thirdparty/jquerymobile-1.4.5/jqm.listview", 'css!thirdparty/jquerymobile-1.4.5/jqm.listview.css']);
+        define("jqmlistview", ['css!thirdparty/jquerymobile-1.4.5/jqm.listview.css']);
 
         define("jqmcontrolgroup", ["thirdparty/jquerymobile-1.4.5/jqm.controlgroup", 'css!thirdparty/jquerymobile-1.4.5/jqm.controlgroup.css']);
 
@@ -2238,12 +2240,7 @@ var AppInfo = {};
                     depends = depends || [];
 
                     if (newHtml.indexOf('type-interior') != -1) {
-                        depends.push('jqmpopup');
-                        depends.push('jqmlistview');
-                        depends.push('jqmcollapsible');
-                        depends.push('jqmcontrolgroup');
-                        depends.push('jqmcheckbox');
-                        depends.push('scripts/notifications');
+                        addLegacyDependencies(depends, window.location.href);
                     }
 
                     require(depends, function () {
@@ -2508,6 +2505,21 @@ var AppInfo = {};
 
 })();
 
+function addLegacyDependencies(depends, url) {
+
+    var isPluginpage = url.toLowerCase().indexOf('/configurationpage?') != -1;
+
+    if (isPluginpage) {
+        depends.push('jqmpopup');
+        depends.push('jqmcollapsible');
+    }
+
+    depends.push('jqmcontrolgroup');
+    depends.push('jqmlistview');
+    depends.push('jqmcheckbox');
+    depends.push('scripts/notifications');
+}
+
 function pageClassOn(eventName, className, fn) {
 
     document.addEventListener(eventName, function (e) {
diff --git a/dashboard-ui/strings/html/server.json b/dashboard-ui/strings/html/server.json
index 1226a2509..1967f054d 100644
--- a/dashboard-ui/strings/html/server.json
+++ b/dashboard-ui/strings/html/server.json
@@ -58,6 +58,7 @@
     "ButtonCancel": "Cancel",
     "ButtonExit": "Exit",
     "ButtonNew": "New",
+    "HeaderTaskTriggers": "Task Triggers",
     "HeaderTV": "TV",
     "HeaderAudio": "Audio",
     "HeaderVideo": "Video",
diff --git a/dashboard-ui/strings/javascript/javascript.json b/dashboard-ui/strings/javascript/javascript.json
index 0aa1ecc10..ab43ee689 100644
--- a/dashboard-ui/strings/javascript/javascript.json
+++ b/dashboard-ui/strings/javascript/javascript.json
@@ -127,7 +127,6 @@
     "LabelAbortedByServerShutdown": "(Aborted by server shutdown)",
     "LabelScheduledTaskLastRan": "Last ran {0}, taking {1}.",
     "HeaderDeleteTaskTrigger": "Delete Task Trigger",
-    "HeaderTaskTriggers": "Task Triggers",
     "MessageDeleteTaskTrigger": "Are you sure you wish to delete this task trigger?",
     "MessageNoPluginsInstalled": "You have no plugins installed.",
     "LabelVersionInstalled": "{0} installed",
diff --git a/dashboard-ui/supporterkey.html b/dashboard-ui/supporterkey.html
index 551b1bbb2..de879107c 100644
--- a/dashboard-ui/supporterkey.html
+++ b/dashboard-ui/supporterkey.html
@@ -4,7 +4,7 @@
     <title>${TitleSupport}</title>
 </head>
 <body>
-    <div id="supporterKeyPage" data-role="page" class="page type-interior" data-require="jqmpopup,scripts/supporterkeypage">
+    <div id="supporterKeyPage" data-role="page" class="page type-interior" data-require="jqmcollapsible,scripts/supporterkeypage">
 
         <div data-role="content">
             <div class="content-primary">
@@ -128,7 +128,7 @@
                 </div>
             </div>
         </div>
-        <div data-role="popup" class="popupAddUser popup" data-theme="a">
+        <div class="popupAddUser popup hide" data-theme="a">
 
             <div class="ui-bar-a" style="text-align: center; padding: 0 20px; position: relative;">
 
diff --git a/dashboard-ui/thirdparty/jquerymobile-1.4.5/jqm.listview.css b/dashboard-ui/thirdparty/jquerymobile-1.4.5/jqm.listview.css
index 41cd9195e..3a2e6645f 100644
--- a/dashboard-ui/thirdparty/jquerymobile-1.4.5/jqm.listview.css
+++ b/dashboard-ui/thirdparty/jquerymobile-1.4.5/jqm.listview.css
@@ -1,34 +1,34 @@
 ﻿
 
 
-.ui-listview,
-.ui-listview > li {
+ul[data-role="listview"],
+ul[data-role="listview"] > li {
 	margin: 0;
 	padding: 0;
 	list-style: none;
 }
-.ui-content .ui-listview,
-.ui-panel-inner > .ui-listview {
+.ui-content ul[data-role="listview"],
+.ui-panel-inner > ul[data-role="listview"] {
 	margin: -1em;
 }
-.ui-content .ui-listview-inset,
-.ui-panel-inner > .ui-listview-inset {
+/*.ui-content ul[data-role="listview"],
+.ui-panel-inner > ul[data-role="listview"] {
 	margin: 1em 0;
-}
-.ui-collapsible-content > .ui-listview {
+}*/
+.ui-collapsible-content > ul[data-role="listview"] {
 	margin: -.5em -1em;
 }
-.ui-collapsible-content > .ui-listview-inset {
+.ui-collapsible-content > ul[data-role="listview"] {
 	margin: .5em 0;
 }
-.ui-listview > li {
+ul[data-role="listview"] > li {
 	display: block;
 	position: relative;
 	overflow: visible;
 }
-.ui-listview > .ui-li-static,
-.ui-listview > .ui-li-divider,
-.ui-listview > li > a.ui-btn {
+ul[data-role="listview"] > li,
+ul[data-role="listview"] > .ui-li-divider,
+ul[data-role="listview"] > li > a.ui-btn {
 	margin: 0;
 	display: block;
 	position: relative;
@@ -37,104 +37,104 @@
 	overflow: hidden;
 	white-space: nowrap;
 }
-.ui-listview > li > .ui-btn:focus {
+ul[data-role="listview"] > li > .ui-btn:focus {
 	z-index: 1;
 }
-.ui-listview > .ui-li-static,
-.ui-listview > .ui-li-divider,
-.ui-listview > li > a.ui-btn {
+ul[data-role="listview"] > li,
+ul[data-role="listview"] > .ui-li-divider,
+ul[data-role="listview"] > li > a.ui-btn {
 	border-width: 1px 0 0 0;
 	border-style: solid;
 }
-.ui-listview-inset > .ui-li-static,
-.ui-listview-inset > .ui-li-divider,
-.ui-listview-inset > li > a.ui-btn {
-	border-right-width: 1px;
-	border-left-width: 1px;
+ul[data-role="listview"] > li,
+ul[data-role="listview"] > .ui-li-divider,
+ul[data-role="listview"] > li > a.ui-btn {
+	/*border-right-width: 1px;
+	border-left-width: 1px;*/
 }
-.ui-listview > .ui-li-static.ui-last-child,
-.ui-listview > .ui-li-divider.ui-last-child,
-.ui-listview > li.ui-last-child > a.ui-btn {
+ul[data-role="listview"] > li:last-child,
+ul[data-role="listview"] > .ui-li-divider.ui-last-child,
+ul[data-role="listview"] > li.ui-last-child > a.ui-btn {
 	border-bottom-width: 1px;
 }
-.ui-collapsible-content > .ui-listview:not(.ui-listview-inset) > li.ui-first-child,
-.ui-collapsible-content > .ui-listview:not(.ui-listview-inset) > li.ui-first-child > a.ui-btn {
+.ui-collapsible-content > ul[data-role="listview"]:not(ul[data-role="listview"]) > li.ui-first-child,
+.ui-collapsible-content > ul[data-role="listview"]:not(ul[data-role="listview"]) > li.ui-first-child > a.ui-btn {
 	border-top-width: 0;
 }
-.ui-collapsible-themed-content .ui-listview:not(.ui-listview-inset) > li.ui-last-child,
-.ui-collapsible-themed-content .ui-listview:not(.ui-listview-inset) > li.ui-last-child > a.ui-btn {
+.ui-collapsible-themed-content ul[data-role="listview"]:not(ul[data-role="listview"]) > li.ui-last-child,
+.ui-collapsible-themed-content ul[data-role="listview"]:not(ul[data-role="listview"]) > li.ui-last-child > a.ui-btn {
 	border-bottom-width: 0;
 }
-.ui-listview > li.ui-first-child,
-.ui-listview > li.ui-first-child > a.ui-btn {
+ul[data-role="listview"] > li.ui-first-child,
+ul[data-role="listview"] > li.ui-first-child > a.ui-btn {
 	-webkit-border-top-right-radius: inherit;	
 	border-top-right-radius: inherit;
 	-webkit-border-top-left-radius: inherit;
 	border-top-left-radius: inherit;
 }
-.ui-listview > li.ui-last-child,
-.ui-listview > li.ui-last-child > a.ui-btn {
+ul[data-role="listview"] > li.ui-last-child,
+ul[data-role="listview"] > li.ui-last-child > a.ui-btn {
 	-webkit-border-bottom-right-radius: inherit;
 	border-bottom-right-radius: inherit;
 	-webkit-border-bottom-left-radius: inherit;
 	border-bottom-left-radius: inherit;
 }
-.ui-listview > li.ui-li-has-alt > a.ui-btn {
+ul[data-role="listview"] > li.ui-li-has-alt > a.ui-btn {
 	-webkit-border-top-right-radius: 0;
 	border-top-right-radius: 0;
 	-webkit-border-bottom-right-radius: 0;
 	border-bottom-right-radius: 0;
 }
-.ui-listview > li.ui-first-child > a.ui-btn + a.ui-btn {
+ul[data-role="listview"] > li.ui-first-child > a.ui-btn + a.ui-btn {
 	-webkit-border-top-left-radius: 0;	
 	border-top-left-radius: 0;
 	-webkit-border-top-right-radius: inherit;
 	border-top-right-radius: inherit;
 }
-.ui-listview > li.ui-last-child > a.ui-btn + a.ui-btn {
+ul[data-role="listview"] > li.ui-last-child > a.ui-btn + a.ui-btn {
 	-webkit-border-bottom-left-radius: 0;
 	border-bottom-left-radius: 0;
 	-webkit-border-bottom-right-radius: inherit;
 	border-bottom-right-radius: inherit;
 }
-.ui-listview > li.ui-first-child img:first-child:not(.ui-li-icon) {
+ul[data-role="listview"] > li.ui-first-child img:first-child:not(.ui-li-icon) {
 	-webkit-border-top-left-radius: inherit;
 	border-top-left-radius: inherit;	
 }
-.ui-listview > li.ui-last-child img:first-child:not(.ui-li-icon) {
+ul[data-role="listview"] > li.ui-last-child img:first-child:not(.ui-li-icon) {
 	-webkit-border-bottom-left-radius: inherit;
 	border-bottom-left-radius: inherit;	
 }
-.ui-collapsible-content > .ui-listview:not(.ui-listview-inset) {
+.ui-collapsible-content > ul[data-role="listview"]:not(ul[data-role="listview"]) {
 	-webkit-border-radius: inherit;
 	border-radius: inherit;	
 }
-.ui-listview > .ui-li-static {
+ul[data-role="listview"] > li {
 	padding: .7em 1em;
 }
-.ui-listview > .ui-li-divider {
+ul[data-role="listview"] > .ui-li-divider {
 	padding: .5em 1.143em;
 	font-size: 14px;
 	font-weight: bold;
 	cursor: default;
 	outline: 0; /* Dividers in custom selectmenus have tabindex */
 }
-.ui-listview > .ui-li-has-count > .ui-btn,
-.ui-listview > .ui-li-static.ui-li-has-count,
-.ui-listview > .ui-li-divider.ui-li-has-count {
+ul[data-role="listview"] > .ui-li-has-count > .ui-btn,
+ul[data-role="listview"] > .ui-li-static.ui-li-has-count,
+ul[data-role="listview"] > .ui-li-divider.ui-li-has-count {
 	padding-right: 2.8125em;
 }
-.ui-listview > .ui-li-has-count > .ui-btn-icon-right {
+ul[data-role="listview"] > .ui-li-has-count > .ui-btn-icon-right {
 	padding-right: 4.6875em;
 }
-.ui-listview > .ui-li-has-thumb > .ui-btn,
-.ui-listview > .ui-li-static.ui-li-has-thumb {
+ul[data-role="listview"] > .ui-li-has-thumb > .ui-btn,
+ul[data-role="listview"] > .ui-li-static.ui-li-has-thumb {
 	min-height: 3.625em;
 	padding-left: 6.25em;
 }
 /* ui-li-has-icon deprecated in 1.4. TODO: remove in 1.5 */
-.ui-listview > .ui-li-has-icon > .ui-btn,
-.ui-listview > .ui-li-static.ui-li-has-icon {
+ul[data-role="listview"] > .ui-li-has-icon > .ui-btn,
+ul[data-role="listview"] > .ui-li-static.ui-li-has-icon {
 	min-height: 1.25em;
 	padding-left: 2.5em;
 }
@@ -154,12 +154,12 @@
 	top: 50%;
 	margin-top: -.88em;
 }
-.ui-listview .ui-btn-icon-right .ui-li-count {
+ul[data-role="listview"] .ui-btn-icon-right .ui-li-count {
 	right: 3.2em;
 }
-.ui-listview .ui-li-has-thumb > img:first-child,
-.ui-listview .ui-li-has-thumb > .ui-btn > img:first-child,
-.ui-listview .ui-li-has-thumb .ui-li-thumb {
+ul[data-role="listview"] .ui-li-has-thumb > img:first-child,
+ul[data-role="listview"] .ui-li-has-thumb > .ui-btn > img:first-child,
+ul[data-role="listview"] .ui-li-has-thumb .ui-li-thumb {
 	position: absolute;
 	left: 0;
 	top: 0;
@@ -167,20 +167,20 @@
 	max-width: 5em;
 }
 /* ui-li-has-icon deprecated in 1.4. TODO: remove in 1.5 */
-.ui-listview > .ui-li-has-icon > img:first-child,
-.ui-listview > .ui-li-has-icon > .ui-btn > img:first-child {
+ul[data-role="listview"] > .ui-li-has-icon > img:first-child,
+ul[data-role="listview"] > .ui-li-has-icon > .ui-btn > img:first-child {
 	position: absolute;
 	left: .625em;
 	top: .9em;
 	max-height: 1em;
 	max-width: 1em;
 }
-.ui-listview > li h1,
-.ui-listview > li h2,
-.ui-listview > li h3,
-.ui-listview > li h4,
-.ui-listview > li h5,
-.ui-listview > li h6 {
+ul[data-role="listview"] > li h1,
+ul[data-role="listview"] > li h2,
+ul[data-role="listview"] > li h3,
+ul[data-role="listview"] > li h4,
+ul[data-role="listview"] > li h5,
+ul[data-role="listview"] > li h6 {
 	font-size: 1em;
 	display: block;
 	margin: .45em 0;
@@ -188,7 +188,7 @@
 	overflow: hidden;
 	white-space: nowrap;
 }
-.ui-listview > li p {
+ul[data-role="listview"] > li p {
 	font-size: .75em;
 	font-weight: normal;
 	display: block;
@@ -197,18 +197,18 @@
 	overflow: hidden;
 	white-space: nowrap;
 }
-.ui-listview .ui-li-aside {
+ul[data-role="listview"] .ui-li-aside {
 	position: absolute;
 	top: 1em;
 	right: 3.333em;
 	margin: 0;
 	text-align: right;
 }
-.ui-listview > li.ui-li-has-alt > .ui-btn {
+ul[data-role="listview"] > li.ui-li-has-alt > .ui-btn {
 	margin-right: 2.5em;
 	border-right-width: 0;
 }
-.ui-listview > li.ui-li-has-alt > .ui-btn + .ui-btn {
+ul[data-role="listview"] > li.ui-li-has-alt > .ui-btn + .ui-btn {
 	position: absolute;
 	width: 2.5em;
 	height: 100%;
@@ -223,24 +223,24 @@
 	padding: 0;
 	z-index: 2;
 }
-.ui-listview-inset > li.ui-li-has-alt > .ui-btn + .ui-btn {
+ul[data-role="listview"] > li.ui-li-has-alt > .ui-btn + .ui-btn {
 	border-right-width: 1px;
 }
-.ui-listview > li.ui-li-has-alt > .ui-btn + .ui-btn:focus {
+ul[data-role="listview"] > li.ui-li-has-alt > .ui-btn + .ui-btn:focus {
 	z-index: 3;
 }
-ol.ui-listview,
-ol.ui-listview > .ui-li-divider {
+ol[data-role="listview"],
+ol[data-role="listview"] > .ui-li-divider {
 	counter-reset: listnumbering;
 }
-ol.ui-listview > li > .ui-btn,
-ol.ui-listview > li.ui-li-static {
+ol[data-role="listview"] > li > .ui-btn,
+ol[data-role="listview"] > li {
 	vertical-align: middle;
 }
-ol.ui-listview > li > .ui-btn:first-child:before,
-ol.ui-listview > li.ui-li-static:before,
-ol.ui-listview > li.ui-field-contain > label:before,
-ol.ui-listview > li.ui-field-contain > .ui-controlgroup-label:before {
+ol[data-role="listview"] > li > .ui-btn:first-child:before,
+ol[data-role="listview"] > li:before,
+ol[data-role="listview"] > li.ui-field-contain > label:before,
+ol[data-role="listview"] > li.ui-field-contain > .ui-controlgroup-label:before {
 	display: inline-block;
 	font-size: .9em;
 	font-weight: normal;
@@ -251,29 +251,29 @@ ol.ui-listview > li.ui-field-contain > .ui-controlgroup-label:before {
 	counter-increment: listnumbering;
 	content: counter(listnumbering) ".";
 }
-ol.ui-listview > li.ui-field-contain:before {
+ol[data-role="listview"] > li.ui-field-contain:before {
 	content: none;
 	display: none;
 }
-ol.ui-listview > li h1:first-child,
-ol.ui-listview > li h2:first-child,
-ol.ui-listview > li h3:first-child,
-ol.ui-listview > li h4:first-child,
-ol.ui-listview > li h5:first-child,
-ol.ui-listview > li h6:first-child,
-ol.ui-listview > li p:first-child,
-ol.ui-listview > li img:first-child + * {
+ol[data-role="listview"] > li h1:first-child,
+ol[data-role="listview"] > li h2:first-child,
+ol[data-role="listview"] > li h3:first-child,
+ol[data-role="listview"] > li h4:first-child,
+ol[data-role="listview"] > li h5:first-child,
+ol[data-role="listview"] > li h6:first-child,
+ol[data-role="listview"] > li p:first-child,
+ol[data-role="listview"] > li img:first-child + * {
 	display: inline-block;
 	vertical-align: middle;
 }
-ol.ui-listview > li h1:first-child ~ *,
-ol.ui-listview > li h2:first-child ~ *,
-ol.ui-listview > li h3:first-child ~ *,
-ol.ui-listview > li h4:first-child ~ *,
-ol.ui-listview > li h5:first-child ~ *,
-ol.ui-listview > li h6:first-child ~ *,
-ol.ui-listview > li p:first-child ~ *,
-ol.ui-listview > li img:first-child + * ~ * {
+ol[data-role="listview"] > li h1:first-child ~ *,
+ol[data-role="listview"] > li h2:first-child ~ *,
+ol[data-role="listview"] > li h3:first-child ~ *,
+ol[data-role="listview"] > li h4:first-child ~ *,
+ol[data-role="listview"] > li h5:first-child ~ *,
+ol[data-role="listview"] > li h6:first-child ~ *,
+ol[data-role="listview"] > li p:first-child ~ *,
+ol[data-role="listview"] > li img:first-child + * ~ * {
 	margin-top: 0;
 	text-indent: 2.04em; /* (1.4em + .3em) * .9em / .75em */
 }
\ No newline at end of file
diff --git a/dashboard-ui/thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.js b/dashboard-ui/thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.js
index beef9913c..ae350e52c 100644
--- a/dashboard-ui/thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.js
+++ b/dashboard-ui/thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.js
@@ -1196,12 +1196,7 @@
 
                     if (contentElem.classList.contains('type-interior')) {
                         dependencies = dependencies || [];
-                        dependencies.push('jqmpopup');
-                        dependencies.push('jqmlistview');
-                        dependencies.push('jqmcollapsible');
-                        dependencies.push('jqmcontrolgroup');
-                        dependencies.push('jqmcheckbox');
-                        dependencies.push('scripts/notifications');
+                        addLegacyDependencies(dependencies, absUrl);
                     }
 
                     require(dependencies, function () {
diff --git a/dashboard-ui/thirdparty/paper-button-style.css b/dashboard-ui/thirdparty/paper-button-style.css
index 5460a14cc..94b0436ba 100644
--- a/dashboard-ui/thirdparty/paper-button-style.css
+++ b/dashboard-ui/thirdparty/paper-button-style.css
@@ -448,11 +448,11 @@ paper-input label, paper-textarea label {
     font-family: inherit !important;
 }
 
-.ui-body-b .paper-input-container-0 .input-content.paper-input-container label, .ui-body-b .paper-input-container-0 .input-content.paper-input-container .paper-input-label, .ui-body-b paper-textarea label {
+.ui-body-b .paper-input-container-0 .input-content.paper-input-container label, .ui-body-b .paper-input-container-0 .input-content.paper-input-container .paper-input-label, .ui-body-b paper-textarea label, .ui-body-b .selectLabel, .ui-body-b .fieldDescription {
     color: #858585;
 }
 
-.ui-body-a .paper-input-container-0 .input-content.paper-input-container label, .ui-body-a .paper-input-container-0 .input-content.paper-input-container .paper-input-label, .ui-body-a paper-textarea label {
+.ui-body-a .paper-input-container-0 .input-content.paper-input-container label, .ui-body-a .paper-input-container-0 .input-content.paper-input-container .paper-input-label, .ui-body-a paper-textarea label, .ui-body-a .selectLabel, .ui-body-a .fieldDescription {
     color: #656565;
 }
 
diff --git a/dashboard-ui/useredit.html b/dashboard-ui/useredit.html
index 9aeb4f63c..d395a333f 100644
--- a/dashboard-ui/useredit.html
+++ b/dashboard-ui/useredit.html
@@ -4,7 +4,7 @@
     <title></title>
 </head>
 <body>
-    <div id="editUserPage" data-role="page" class="page type-interior userProfilesPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Users" data-require="scripts/useredit">
+    <div id="editUserPage" data-role="page" class="page type-interior userProfilesPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Users" data-require="jqmcollapsible,scripts/useredit">
 
         <div data-role="content">
             <div class="content-primary">
diff --git a/dashboard-ui/userparentalcontrol.html b/dashboard-ui/userparentalcontrol.html
index 0ed6e51e0..96b3528c0 100644
--- a/dashboard-ui/userparentalcontrol.html
+++ b/dashboard-ui/userparentalcontrol.html
@@ -4,7 +4,7 @@
     <title></title>
 </head>
 <body>
-    <div id="userParentalControlPage" data-role="page" class="page type-interior userProfilesPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Users" data-require="jqmpopup,scripts/userparentalcontrol">
+    <div id="userParentalControlPage" data-role="page" class="page type-interior userProfilesPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Users" data-require="jqmpopup,jqmcollapsible,scripts/userparentalcontrol">
 
         <div data-role="content">
             <div class="content-primary">
diff --git a/dashboard-ui/userprofiles.html b/dashboard-ui/userprofiles.html
index c47565225..b27586639 100644
--- a/dashboard-ui/userprofiles.html
+++ b/dashboard-ui/userprofiles.html
@@ -4,7 +4,7 @@
     <title>${TitleUsers}</title>
 </head>
 <body>
-    <div id="userProfilesPage" data-role="page" class="page type-interior userProfilesPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Users" data-require="jqmpopup,scripts/userprofilespage">
+    <div id="userProfilesPage" data-role="page" class="page type-interior userProfilesPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Users" data-require="jqmpopup,jqmcollapsible,scripts/userprofilespage">
 
         <div data-role="content">
             <div class="content-primary">
