diff --git a/dashboard-ui/bower_components/emby-apiclient/.bower.json b/dashboard-ui/bower_components/emby-apiclient/.bower.json
index 8641f7e64..8c602a167 100644
--- a/dashboard-ui/bower_components/emby-apiclient/.bower.json
+++ b/dashboard-ui/bower_components/emby-apiclient/.bower.json
@@ -16,12 +16,12 @@
   },
   "devDependencies": {},
   "ignore": [],
-  "version": "1.1.76",
-  "_release": "1.1.76",
+  "version": "1.1.77",
+  "_release": "1.1.77",
   "_resolution": {
     "type": "version",
-    "tag": "1.1.76",
-    "commit": "1096ffc66e3df8d63e305889dd7fb5b769095082"
+    "tag": "1.1.77",
+    "commit": "685285e67f67ba356af1be84652e9705a6ea7b74"
   },
   "_source": "https://github.com/MediaBrowser/Emby.ApiClient.Javascript.git",
   "_target": "^1.1.51",
diff --git a/dashboard-ui/bower_components/emby-apiclient/connectionmanager.js b/dashboard-ui/bower_components/emby-apiclient/connectionmanager.js
index f484911c8..84500b4a3 100644
--- a/dashboard-ui/bower_components/emby-apiclient/connectionmanager.js
+++ b/dashboard-ui/bower_components/emby-apiclient/connectionmanager.js
@@ -215,7 +215,7 @@
             return connectUser;
         };
 
-        var minServerVersion = '3.0.5971';
+        var minServerVersion = '3.0.5972';
         self.minServerVersion = function (val) {
 
             if (val) {
diff --git a/dashboard-ui/bower_components/emby-webcomponents/.bower.json b/dashboard-ui/bower_components/emby-webcomponents/.bower.json
index a4874baa4..852fb9bee 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/.bower.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/.bower.json
@@ -14,12 +14,12 @@
   },
   "devDependencies": {},
   "ignore": [],
-  "version": "1.4.188",
-  "_release": "1.4.188",
+  "version": "1.4.189",
+  "_release": "1.4.189",
   "_resolution": {
     "type": "version",
-    "tag": "1.4.188",
-    "commit": "9bfd0321b48bbe058008848619521d3d5b23bbe7"
+    "tag": "1.4.189",
+    "commit": "d7b1da1cd548e50125dd5419b3742fdfc9a07460"
   },
   "_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
   "_target": "^1.2.1",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/emby-select/emby-select.js b/dashboard-ui/bower_components/emby-webcomponents/emby-select/emby-select.js
index 2b730a412..dde2d64ff 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/emby-select/emby-select.js
+++ b/dashboard-ui/bower_components/emby-webcomponents/emby-select/emby-select.js
@@ -169,6 +169,13 @@
         arrowContainer.appendChild(arrow);
     };
 
+    EmbySelectPrototype.setLabel = function (text) {
+
+        var label = this.parentNode.querySelector('label');
+
+        label.innerHTML = text;
+    };
+
     document.registerElement('emby-select', {
         prototype: EmbySelectPrototype,
         extends: 'select'
diff --git a/dashboard-ui/bower_components/emby-webcomponents/thememediaplayer.js b/dashboard-ui/bower_components/emby-webcomponents/thememediaplayer.js
index c2099c231..f067947c2 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/thememediaplayer.js
+++ b/dashboard-ui/bower_components/emby-webcomponents/thememediaplayer.js
@@ -22,7 +22,8 @@ define(['playbackManager', 'browser'], function (playbackManager, browser) {
             if (enabled(items[0].MediaType)) {
                 playbackManager.play({
                     items: items,
-                    fullscreen: false
+                    fullscreen: false,
+                    enableRemotePlayers: false
                 });
             }
 
diff --git a/dashboard-ui/bower_components/iron-icon/.bower.json b/dashboard-ui/bower_components/iron-icon/.bower.json
index 87e3dad5d..f76855b27 100644
--- a/dashboard-ui/bower_components/iron-icon/.bower.json
+++ b/dashboard-ui/bower_components/iron-icon/.bower.json
@@ -32,14 +32,14 @@
     "web-component-tester": "^4.0.0",
     "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
   },
-  "homepage": "https://github.com/polymerelements/iron-icon",
+  "homepage": "https://github.com/PolymerElements/iron-icon",
   "_release": "1.0.10",
   "_resolution": {
     "type": "version",
     "tag": "v1.0.10",
     "commit": "f4e146da4982ff96bb25db85290c09e8de4ec734"
   },
-  "_source": "git://github.com/polymerelements/iron-icon.git",
+  "_source": "git://github.com/PolymerElements/iron-icon.git",
   "_target": "^1.0.0",
-  "_originalSource": "polymerelements/iron-icon"
+  "_originalSource": "PolymerElements/iron-icon"
 }
\ No newline at end of file
diff --git a/dashboard-ui/bower_components/polymer/.bower.json b/dashboard-ui/bower_components/polymer/.bower.json
index 25eb84c03..a96f0f050 100644
--- a/dashboard-ui/bower_components/polymer/.bower.json
+++ b/dashboard-ui/bower_components/polymer/.bower.json
@@ -32,14 +32,14 @@
     "iron-component-page": "polymerElements/iron-component-page#^1.1.6"
   },
   "private": true,
-  "homepage": "https://github.com/polymer/polymer",
+  "homepage": "https://github.com/Polymer/polymer",
   "_release": "1.6.1",
   "_resolution": {
     "type": "version",
     "tag": "v1.6.1",
     "commit": "1f197d9d7874b1e5808b2a5c26f34446a7d912fc"
   },
-  "_source": "git://github.com/polymer/polymer.git",
+  "_source": "git://github.com/Polymer/polymer.git",
   "_target": "^1.1.0",
-  "_originalSource": "polymer/polymer"
+  "_originalSource": "Polymer/polymer"
 }
\ No newline at end of file
diff --git a/dashboard-ui/dashboard/dashboardgeneral.js b/dashboard-ui/dashboard/dashboardgeneral.js
index 7d7f51d31..5cfd70503 100644
--- a/dashboard-ui/dashboard/dashboardgeneral.js
+++ b/dashboard-ui/dashboard/dashboardgeneral.js
@@ -1,4 +1,4 @@
-define(['jQuery'], function ($) {
+define(['jQuery', 'fnchecked', 'emby-checkbox', 'emby-collapse', 'emby-textarea', 'emby-input', 'emby-select'], function ($) {
 
     var brandingConfigKey = "branding";
     var currentBrandingOptions;
@@ -36,10 +36,10 @@
 
         if (systemInfo.CanSelfUpdate) {
             $('.fldAutomaticUpdates', page).show();
-            $('.lnlAutomaticUpdateLevel', page).html(Globalize.translate('LabelAutomaticUpdateLevel'));
+            page.querySelector('#selectAutomaticUpdateLevel').setLabel(Globalize.translate('LabelAutomaticUpdateLevel'));
         } else {
             $('.fldAutomaticUpdates', page).hide();
-            $('.lnlAutomaticUpdateLevel', page).html(Globalize.translate('LabelAutomaticUpdateLevelForPlugins'));
+            page.querySelector('#selectAutomaticUpdateLevel').setLabel(Globalize.translate('LabelAutomaticUpdateLevelForPlugins'));
         }
 
         $('#chkEnableAutomaticServerUpdates', page).checked(config.EnableAutoUpdate);
diff --git a/dashboard-ui/dashboardgeneral.html b/dashboard-ui/dashboardgeneral.html
index 6e06cbaac..1f6304b69 100644
--- a/dashboard-ui/dashboardgeneral.html
+++ b/dashboard-ui/dashboardgeneral.html
@@ -9,9 +9,8 @@
                     <input is="emby-input" type="text" id="txtServerName" label="${LabelFriendlyServerName}" />
                     <div class="fieldDescription">${LabelFriendlyServerNameHelp}</div>
                 </div>
-                <div>
-                    <label for="selectLocalizationLanguage" class="selectLabel">${LabelPreferredDisplayLanguage}</label>
-                    <select id="selectLocalizationLanguage" data-mini="true"></select>
+                <div class="selectContainer">
+                    <select is="emby-select" id="selectLocalizationLanguage" label="${LabelPreferredDisplayLanguage}"></select>
                     <div class="fieldDescription">
                         <div>${LabelPreferredDisplayLanguageHelp}</div>
                         <div style="margin-top: .25em;">
@@ -19,25 +18,28 @@
                         </div>
                     </div>
                 </div>
-                <br /><br />
 
-                <div id="fldRunAtStartup" style="display: none;">
-                    <paper-checkbox id="chkRunAtStartup">${LabelRunServerAtStartup}</paper-checkbox>
-                    <div id="windowsStartupDescription" class="fieldDescription paperCheckboxFieldDescription" style="display: none;">
+                <div id="fldRunAtStartup" style="display: none;" class="checkboxContainer checkboxContainer-withDescription">
+                    <label>
+                        <input is="emby-checkbox" type="checkbox" id="chkRunAtStartup" />
+                        <span>${LabelRunServerAtStartup}</span>
+                    </label>
+                    <div id="windowsStartupDescription" class="fieldDescription checkboxFieldDescription" style="display: none;">
                         ${LabelRunServerAtStartupHelp}
                     </div>
-                    <br /><br />
                 </div>
 
-                <div>
-                    <paper-checkbox id="chkUsageData">${OptionEnableAnonymousUsageReporting}</paper-checkbox>
-                    <div class="fieldDescription paperCheckboxFieldDescription">
+                <div class="checkboxContainer checkboxContainer-withDescription">
+                    <label>
+                        <input is="emby-checkbox" type="checkbox" id="chkUsageData" />
+                        <span>${OptionEnableAnonymousUsageReporting}</span>
+                    </label>
+                    <div class="fieldDescription checkboxFieldDescription">
                         ${OptionEnableAnonymousUsageReportingHelp}
                         <div style="margin-top:.5em;">
                             <a target="_blank" href="https://emby.media/privacy">${ButtonLearnMore}</a>
                         </div>
                     </div>
-                    <br /><br />
                 </div>
 
                 <div is="emby-collapse" title="${HeaderAdvanced}">
@@ -59,15 +61,12 @@
                 <div is="emby-collapse" title="${HeaderAutomaticUpdates}">
                     <div class="collapseContent">
                         <br />
-                        <div class="fldAutomaticUpdates">
-                            <div data-role="controlgroup">
-                                <input type="checkbox" id="chkEnableAutomaticServerUpdates" data-mini="true" />
-                                <label for="chkEnableAutomaticServerUpdates">${OptionEnableAutomaticServerUpdates}</label>
-                            </div>
-                        </div>
-                        <div>
-                            <label class="lnlAutomaticUpdateLevel selectLabel" for="selectAutomaticUpdateLevel"></label>
-                            <select name="selectAutomaticUpdateLevel" id="selectAutomaticUpdateLevel">
+                        <label class="fldAutomaticUpdates checkboxContainer">
+                            <input is="emby-checkbox" type="checkbox" id="chkEnableAutomaticServerUpdates" />
+                            <span>${OptionEnableAutomaticServerUpdates}</span>
+                        </label>
+                        <div class="selectContainer">
+                            <select is="emby-select" id="selectAutomaticUpdateLevel" label="${LabelAutomaticUpdateLevel}">
                                 <option value="Release">${OptionRelease}</option>
                                 <option value="Beta">${OptionBeta}</option>
                                 <option value="Dev">${OptionDev}</option>
@@ -76,11 +75,12 @@
                                 ${DevBuildWarning}
                             </div>
                         </div>
-                        <div id="fldEnableAutomaticRestart" style="display: none;">
-                            <paper-checkbox id="chkEnableAutomaticRestart">${LabelAllowServerAutoRestart}</paper-checkbox>
-                            <div class="fieldDescription paperCheckboxFieldDescription">
-                                ${LabelAllowServerAutoRestartHelp}
-                            </div>
+                        <div id="fldEnableAutomaticRestart" style="display: none;" class="checkboxContainer checkboxContainer-withDescription">
+                            <label>
+                                <input is="emby-checkbox" type="checkbox" id="chkEnableAutomaticRestart" />
+                                <span>${LabelAllowServerAutoRestart}</span>
+                            </label>
+                            <div class="fieldDescription checkboxFieldDescription">${LabelAllowServerAutoRestartHelp}</div>
                         </div>
                     </div>
                 </div>
@@ -104,17 +104,17 @@
                 <div is="emby-collapse" title="${HeaderDeveloperOptions}">
                     <div class="collapseContent">
                         <br />
-                        <div>
-                            <paper-checkbox id="chkEnableDashboardResponseCache">${OptionEnableWebClientResponseCache}</paper-checkbox>
+                        <label class="checkboxContainer">
+                            <input is="emby-checkbox" type="checkbox" id="chkEnableDashboardResponseCache" />
+                            <span>${OptionEnableWebClientResponseCache}</span>
+                        </label>
+                        <div class="checkboxContainer checkboxContainer-withDescription">
+                            <label>
+                                <input is="emby-checkbox" type="checkbox" id="chkEnableMinification" />
+                                <span>${OptionEnableWebClientResourceMinification}</span>
+                            </label>
+                            <div class="fieldDescription checkboxFieldDescription">${OptionDisableForDevelopmentHelp}</div>
                         </div>
-                        <br />
-                        <div>
-                            <paper-checkbox id="chkEnableMinification">${OptionEnableWebClientResourceMinification}</paper-checkbox>
-                        </div>
-                        <div class="fieldDescription paperCheckboxFieldDescription">
-                            ${OptionDisableForDevelopmentHelp}
-                        </div>
-                        <br /><br />
                         <div class="inputContainer">
                             <div style="display: flex; align-items: center;">
                                 <div style="flex-grow:1;">
diff --git a/dashboard-ui/scripts/mediacontroller.js b/dashboard-ui/scripts/mediacontroller.js
index c148c53e6..9c4ad282c 100644
--- a/dashboard-ui/scripts/mediacontroller.js
+++ b/dashboard-ui/scripts/mediacontroller.js
@@ -518,6 +518,12 @@
 
         self.play = function (options) {
 
+            if (options.enableRemotePlayers === false) {
+                if (!currentPlayer.isLocalPlayer) {
+                    return;
+                }
+            }
+
             doWithPlaybackValidation(currentPlayer, function () {
                 if (typeof (options) === 'string') {
                     options = { ids: [options] };
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index ecf98b494..29fe59c6b 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -1970,7 +1970,6 @@ var AppInfo = {};
 
         defineRoute({
             path: '/dashboardgeneral.html',
-            dependencies: ['emby-collapse', 'emby-textarea', 'emby-input', 'paper-checkbox'],
             controller: 'dashboard/dashboardgeneral',
             autoFocus: false,
             roles: 'admin'