diff --git a/dashboard-ui/autoorganizelog.html b/dashboard-ui/autoorganizelog.html
index 5f1c25af8f..47f529f61a 100644
--- a/dashboard-ui/autoorganizelog.html
+++ b/dashboard-ui/autoorganizelog.html
@@ -20,7 +20,7 @@
                     </div>
 
                     <div style="float: right; position: relative; top: 15px;margin-top: -5px;display:none;" class="organizeTaskPanel">
-                        <paper-button type="button" class="btnClearLog" raised><iron-icon icon="clear-all"></iron-icon><span>${ButtonClear}</span></paper-button>
+                        <paper-button type="button" class="btnClearLog" raised style="display: inline-block;"><iron-icon icon="clear-all"></iron-icon><span>${ButtonClear}</span></paper-button>
                         <paper-button type="button" class="btnOrganize" raised><iron-icon icon="check"></iron-icon><span>${ButtonOrganize}</span></paper-button>
                         <progress max="100" min="0" style="width:100px;display:none;" class="organizeProgress"></progress>
                     </div>
diff --git a/dashboard-ui/bower_components/iron-selector/.bower.json b/dashboard-ui/bower_components/iron-selector/.bower.json
index d749e70dcc..2b3357dcb1 100644
--- a/dashboard-ui/bower_components/iron-selector/.bower.json
+++ b/dashboard-ui/bower_components/iron-selector/.bower.json
@@ -36,7 +36,7 @@
     "tag": "v1.2.1",
     "commit": "1e6a7ee05e5ff350472ffc1ee780f145a7606b7b"
   },
-  "_source": "git://github.com/polymerelements/iron-selector.git",
+  "_source": "git://github.com/PolymerElements/iron-selector.git",
   "_target": "^1.0.0",
-  "_originalSource": "polymerelements/iron-selector"
+  "_originalSource": "PolymerElements/iron-selector"
 }
\ No newline at end of file
diff --git a/dashboard-ui/bower_components/paper-behaviors/.bower.json b/dashboard-ui/bower_components/paper-behaviors/.bower.json
index a6b333d335..2b04bf9f8a 100644
--- a/dashboard-ui/bower_components/paper-behaviors/.bower.json
+++ b/dashboard-ui/bower_components/paper-behaviors/.bower.json
@@ -45,7 +45,7 @@
     "tag": "v1.0.11",
     "commit": "e3c1ab0c72905b58fb4d9adc2921ea73b5c085a5"
   },
-  "_source": "git://github.com/polymerelements/paper-behaviors.git",
+  "_source": "git://github.com/PolymerElements/paper-behaviors.git",
   "_target": "^1.0.0",
-  "_originalSource": "polymerelements/paper-behaviors"
+  "_originalSource": "PolymerElements/paper-behaviors"
 }
\ No newline at end of file
diff --git a/dashboard-ui/bower_components/paper-dialog/.bower.json b/dashboard-ui/bower_components/paper-dialog/.bower.json
index b5b5d1d79f..48c832d5e0 100644
--- a/dashboard-ui/bower_components/paper-dialog/.bower.json
+++ b/dashboard-ui/bower_components/paper-dialog/.bower.json
@@ -1,7 +1,7 @@
 {
   "name": "paper-dialog",
   "description": "A Material Design dialog",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "authors": "The Polymer Authors",
   "keywords": [
     "web-components",
@@ -19,27 +19,27 @@
   "homepage": "https://github.com/PolymerElements/paper-dialog",
   "ignore": [],
   "dependencies": {
-    "polymer": "Polymer/polymer#^1.1.0",
+    "neon-animation": "PolymerElements/neon-animation#^1.0.0",
     "paper-dialog-behavior": "PolymerElements/paper-dialog-behavior#^1.0.0",
     "paper-styles": "PolymerElements/paper-styles#^1.0.0",
-    "neon-animation": "PolymerElements/neon-animation#^1.0.0"
+    "polymer": "Polymer/polymer#^1.1.0"
   },
   "devDependencies": {
     "iron-component-page": "PolymerElements/iron-component-page#^1.0.0",
     "paper-button": "PolymerElements/paper-button#^1.0.0",
-    "paper-dropdown-menu": "PolymerElements/paper-dropdown-menu#^1.0.0",
-    "paper-menu": "PolymerElements/paper-menu#^1.0.0",
-    "paper-item": "PolymerElements/paper-item#^1.0.0",
     "paper-dialog-scrollable": "PolymerElements/paper-dialog-scrollable#^1.0.0",
+    "paper-dropdown-menu": "PolymerElements/paper-dropdown-menu#^1.0.0",
+    "paper-item": "PolymerElements/paper-item#^1.0.0",
+    "paper-menu": "PolymerElements/paper-menu#^1.0.0",
     "test-fixture": "PolymerElements/test-fixture#^1.0.0",
-    "web-component-tester": "polymer/web-component-tester#^3.4.0",
+    "web-component-tester": "^4.0.0",
     "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
   },
-  "_release": "1.0.3",
+  "_release": "1.0.4",
   "_resolution": {
     "type": "version",
-    "tag": "v1.0.3",
-    "commit": "ec85b110e11e9d390f601e1c88ebf97984b53d82"
+    "tag": "v1.0.4",
+    "commit": "53b099bed06bbbab7cb0f82c8209328c1a82aee6"
   },
   "_source": "git://github.com/PolymerElements/paper-dialog.git",
   "_target": "~1.0.0",
diff --git a/dashboard-ui/bower_components/paper-dialog/.travis.yml b/dashboard-ui/bower_components/paper-dialog/.travis.yml
index 1064303fb5..eda70b0278 100644
--- a/dashboard-ui/bower_components/paper-dialog/.travis.yml
+++ b/dashboard-ui/bower_components/paper-dialog/.travis.yml
@@ -1,22 +1,25 @@
 language: node_js
 sudo: false
 before_script:
-  - npm install web-component-tester
-  - npm install bower
-  - 'export PATH=$PWD/node_modules/.bin:$PATH'
+  - npm install -g bower polylint web-component-tester
   - bower install
+  - polylint
 env:
   global:
     - secure: CiislAd2L7WGhu3ZFWeP/tq7aToNIKX//D4gUbafyI1vmFykDOTeZ22UzoFZ/SJ2pHUdoMGyjiYBr+MGS0G81+CEAgUC/8RI5HzWRg10KdEWB7qWQgWlxABdl0MV2T6RY2rv1gMss2b8sFL8FoBsR2ydqeKyGHhiuNG3/th7HBUdyLur4VnGlVHcQAHk8CgszBgL78RFU61+FbJR1RyJpjytAkJJP4X2DFdNx5XYh6nwDWKnRciZEHFzgj9c52eaQKBNOKwJjm/Gc2Mcyhq7inUM9di5qfRhP3EVn3aENC3WJoIyGu3wgzjD+r3Mp+PsEq6OLvm09g6ljbeMKfV9haQ0MPRQTmZiEjsiEXmxzL3qfYZhA/YoySyl/PyrXoAXFE19sbCBV9tCbbmR9vStIZOiFQLtUGAHUosWQOhR2Nym23q7B1sSlYAhaAaQlzkflhkb+h4QFCUW5IBjQEDl4CwG0n0dm7YO+Z+jZFoEz1kiper3D5T8mJxso69WQskG/kENqnrP1U9RMJbFQOQFYXauNBpc5ufbODTRivwHnNA+Gu2D5AbljGM8xcUNlzLJx+BWUU5QIt/ddfjynCdFyUazHNU/P2gH6R8e2ROVzupvBsdr2PyU5kQqdD8yTGPHkOimtlRY2Hsnp50NkNzDzuxIz+1SYjve7OOZXFWpRi4=
     - secure: iEyYkfoa4Sp68fk1ttK0AEdoJ2i+3Ggx1cFcEuNtTjyrmSDVVb10E6LeTBWgWgxnK1EmV5MRY+5m3BzONDaPJMoChNa1ddqitPSqfK8SARjIUZ9DrliLwgsnfl/k/5EkKxzayH+xASYSqqMknpJC+irIs48oMZPB1zEVRK4FdhaCTPcWlDbdHtqwhDeRjXWmpY4uggRTyuql9PLwSU+P+e2S6UqBvXs5ldwHbC+361l8nDX4eB2AC/RmcSoawHoptd2+40+vJ2hs9+bcmQcD5rwGN3Y793q+F5L5ZTJu3v9KKU+9ABNT7yaIEk497dSA3lWa0I4MNT+pe5UcvJ6A1f5/pKLPZ8gYVdOx61Y9yHYW8c86k+QasGBTgwrzwIhk71iu+t9c6Jtt39mmZpewsfGpmUKoVTCBpO7YYlQwe1BCxQOLwdiudXE1wZKy2yLFSBHGa6wM1C9tLw6IW9Wb0ncUCSP/SIsXFlzBQKpOHBtJe0yGqw6yPf5/mxoVcsm5+F49Vh8nu7CTNVpZ9rcQcObLMAsy9qs7etiCHlzA5bAXtX0mmTob8+R5Cbjiir9LwR8ZltASivJg87taMldtXJDEDxNuHiSytxMTF56OxnWx82ek8aOaDY0WiIzUNEVufVh+sLTp47OHKOJXMRsLXu16TkaOkCVPsBkF2KVNwT4=
-node_js: 4
+    - CXX=g++-4.8
+node_js: stable
 addons:
-  firefox: '42.0'
+  firefox: latest
   apt:
     sources:
       - google-chrome
+      - ubuntu-toolchain-r-test
     packages:
       - google-chrome-stable
+      - g++-4.8
+  sauce_connect: true
 script:
   - xvfb-run wct
   - "if [ \"${TRAVIS_PULL_REQUEST}\" = \"false\" ]; then wct -s 'default'; fi"
diff --git a/dashboard-ui/bower_components/paper-dialog/CONTRIBUTING.md b/dashboard-ui/bower_components/paper-dialog/CONTRIBUTING.md
index 7b10141565..f147978a3e 100644
--- a/dashboard-ui/bower_components/paper-dialog/CONTRIBUTING.md
+++ b/dashboard-ui/bower_components/paper-dialog/CONTRIBUTING.md
@@ -5,6 +5,11 @@ https://github.com/PolymerElements/ContributionGuide/blob/master/CONTRIBUTING.md
 
 If you edit that file, it will get updated everywhere else.
 If you edit this file, your changes will get overridden :)
+
+You can however override the jsbin link with one that's customized to this
+specific element:
+
+jsbin=https://jsbin.com/cagaye/edit?html,output
 -->
 # Polymer Elements
 ## Guide for Contributors
@@ -41,7 +46,7 @@ Polymer Elements are built in the open, and the Polymer authors eagerly encourag
  3. Click the `paper-foo` element.
  ```
 
- 2. **A reduced test case that demonstrates the problem.** If possible, please include the test case as a JSBin. Start with this template to easily import and use relevant Polymer Elements: [http://jsbin.com/cagaye](http://jsbin.com/cagaye/edit?html,output).
+ 2. **A reduced test case that demonstrates the problem.** If possible, please include the test case as a JSBin. Start with this template to easily import and use relevant Polymer Elements: [https://jsbin.com/cagaye/edit?html,output](https://jsbin.com/cagaye/edit?html,output).
 
  3. **A list of browsers where the problem occurs.** This can be skipped if the problem is the same across all browsers.
 
@@ -51,14 +56,14 @@ Polymer Elements are built in the open, and the Polymer authors eagerly encourag
 
 When submitting pull requests, please provide:
 
- 1. **A reference to the corresponding issue** or issues that will be closed by the pull request. Please refer to these issues using the following syntax:
+ 1. **A reference to the corresponding issue** or issues that will be closed by the pull request. Please refer to these issues in the pull request description using the following syntax:
 
  ```markdown
  (For a single issue)
  Fixes #20
 
  (For multiple issues)
- Fixes #32, #40
+ Fixes #32, fixes #40
  ```
 
  2. **A succinct description of the design** used to fix any related issues. For example:
diff --git a/dashboard-ui/bower_components/paper-dialog/bower.json b/dashboard-ui/bower_components/paper-dialog/bower.json
index ae1aa53c51..ab3be847f4 100644
--- a/dashboard-ui/bower_components/paper-dialog/bower.json
+++ b/dashboard-ui/bower_components/paper-dialog/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "paper-dialog",
   "description": "A Material Design dialog",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "authors": "The Polymer Authors",
   "keywords": [
     "web-components",
@@ -19,20 +19,20 @@
   "homepage": "https://github.com/PolymerElements/paper-dialog",
   "ignore": [],
   "dependencies": {
-    "polymer": "Polymer/polymer#^1.1.0",
+    "neon-animation": "PolymerElements/neon-animation#^1.0.0",
     "paper-dialog-behavior": "PolymerElements/paper-dialog-behavior#^1.0.0",
     "paper-styles": "PolymerElements/paper-styles#^1.0.0",
-    "neon-animation": "PolymerElements/neon-animation#^1.0.0"
+    "polymer": "Polymer/polymer#^1.1.0"
   },
   "devDependencies": {
     "iron-component-page": "PolymerElements/iron-component-page#^1.0.0",
     "paper-button": "PolymerElements/paper-button#^1.0.0",
-    "paper-dropdown-menu": "PolymerElements/paper-dropdown-menu#^1.0.0",
-    "paper-menu": "PolymerElements/paper-menu#^1.0.0",
-    "paper-item": "PolymerElements/paper-item#^1.0.0",
     "paper-dialog-scrollable": "PolymerElements/paper-dialog-scrollable#^1.0.0",
+    "paper-dropdown-menu": "PolymerElements/paper-dropdown-menu#^1.0.0",
+    "paper-item": "PolymerElements/paper-item#^1.0.0",
+    "paper-menu": "PolymerElements/paper-menu#^1.0.0",
     "test-fixture": "PolymerElements/test-fixture#^1.0.0",
-    "web-component-tester": "polymer/web-component-tester#^3.4.0",
+    "web-component-tester": "^4.0.0",
     "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
   }
 }
diff --git a/dashboard-ui/bower_components/paper-dialog/demo/index.html b/dashboard-ui/bower_components/paper-dialog/demo/index.html
index b1291ce473..8b7549607c 100644
--- a/dashboard-ui/bower_components/paper-dialog/demo/index.html
+++ b/dashboard-ui/bower_components/paper-dialog/demo/index.html
@@ -32,6 +32,11 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
   <link rel="stylesheet" href="../../paper-styles/demo.css">
 
   <style is="custom-style">
+
+    section {
+      -webkit-tap-highlight-color: rgba(0,0,0,0);
+    }
+    
     section > paper-button {
       background-color: var(--google-grey-300);
       padding: 5px;
diff --git a/dashboard-ui/bower_components/paper-dialog/paper-dialog.html b/dashboard-ui/bower_components/paper-dialog/paper-dialog.html
index ce04a3bf39..ce3aab9f85 100644
--- a/dashboard-ui/bower_components/paper-dialog/paper-dialog.html
+++ b/dashboard-ui/bower_components/paper-dialog/paper-dialog.html
@@ -92,6 +92,7 @@ element.
     },
 
     _renderOpened: function() {
+      this.cancelAnimation();
       if (this.withBackdrop) {
         this.backdropElement.open();
       }
@@ -99,6 +100,7 @@ element.
     },
 
     _renderClosed: function() {
+      this.cancelAnimation();
       if (this.withBackdrop) {
         this.backdropElement.close();
       }
diff --git a/dashboard-ui/bower_components/paper-dialog/test/index.html b/dashboard-ui/bower_components/paper-dialog/test/index.html
index ae925b0589..3d0c8eec73 100644
--- a/dashboard-ui/bower_components/paper-dialog/test/index.html
+++ b/dashboard-ui/bower_components/paper-dialog/test/index.html
@@ -1,5 +1,4 @@
-<!doctype html>
-<!--
+<!DOCTYPE html><!--
 @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
@@ -7,9 +6,7 @@ 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
--->
-<html>
-  <head>
+--><html><head>
 
     <title>paper-dialog tests</title>
 
@@ -23,12 +20,12 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
   <body>
 
     <script>
-
       WCT.loadSuites([
-        'paper-dialog.html'
+        'paper-dialog.html',
+        'paper-dialog.html?dom=shadow'
       ]);
-
     </script>
 
-  </body>
-</html>
+  
+
+</body></html>
diff --git a/dashboard-ui/bower_components/paper-ripple/.bower.json b/dashboard-ui/bower_components/paper-ripple/.bower.json
index 2f654d71c6..157225ee71 100644
--- a/dashboard-ui/bower_components/paper-ripple/.bower.json
+++ b/dashboard-ui/bower_components/paper-ripple/.bower.json
@@ -32,14 +32,14 @@
     "iron-test-helpers": "PolymerElements/iron-test-helpers#^1.0.0"
   },
   "ignore": [],
-  "homepage": "https://github.com/polymerelements/paper-ripple",
+  "homepage": "https://github.com/PolymerElements/paper-ripple",
   "_release": "1.0.5",
   "_resolution": {
     "type": "version",
     "tag": "v1.0.5",
     "commit": "d72e7a9a8ab518b901ed18dde492df3b87a93be5"
   },
-  "_source": "git://github.com/polymerelements/paper-ripple.git",
+  "_source": "git://github.com/PolymerElements/paper-ripple.git",
   "_target": "^1.0.0",
-  "_originalSource": "polymerelements/paper-ripple"
+  "_originalSource": "PolymerElements/paper-ripple"
 }
\ No newline at end of file
diff --git a/dashboard-ui/components/guestinviter/guestinviter.js b/dashboard-ui/components/guestinviter/guestinviter.js
new file mode 100644
index 0000000000..47655d8c5b
--- /dev/null
+++ b/dashboard-ui/components/guestinviter/guestinviter.js
@@ -0,0 +1,150 @@
+define(['paperdialoghelper', 'paper-input', 'paper-button', 'jqmcollapsible'], function (paperDialogHelper) {
+
+    function renderLibrarySharingList(context, result) {
+
+        var folderHtml = '';
+
+        folderHtml += '<div data-role="controlgroup">';
+
+        folderHtml += result.Items.map(function (i) {
+
+            var currentHtml = '';
+
+            var id = 'chkShareFolder' + i.Id;
+
+            currentHtml += '<label for="' + id + '">' + i.Name + '</label>';
+
+            var isChecked = true;
+            var checkedHtml = isChecked ? ' checked="checked"' : '';
+
+            currentHtml += '<input data-mini="true" class="chkShareFolder" data-folderid="' + i.Id + '" type="checkbox" id="' + id + '"' + checkedHtml + ' />';
+
+            return currentHtml;
+
+        }).join('');
+
+        folderHtml += '</div>';
+
+        $('.librarySharingList', context).html(folderHtml).trigger('create');
+    }
+
+    function inviteUser(dlg) {
+
+        Dashboard.showLoadingMsg();
+
+        ApiClient.getJSON(ApiClient.getUrl("Channels", {})).then(function (channelsResult) {
+
+            var shareExcludes = $(".chkShareFolder:checked", dlg).get().map(function (i) {
+
+                return i.getAttribute('data-folderid');
+            });
+
+            // Add/Update connect info
+            ApiClient.ajax({
+
+                type: "POST",
+                url: ApiClient.getUrl('Connect/Invite'),
+                dataType: 'json',
+                data: {
+
+                    ConnectUsername: $('#txtConnectUsername', dlg).val(),
+                    EnabledLibraries: shareExcludes.join(','),
+                    SendingUserId: Dashboard.getCurrentUserId(),
+                    EnableLiveTv: false
+                }
+
+            }).then(function (result) {
+
+                dlg.submitted = true;
+                paperDialogHelper.close(dlg);
+
+                Dashboard.hideLoadingMsg();
+
+                showNewUserInviteMessage(dlg, result);
+
+            });
+        });
+    }
+
+    function showNewUserInviteMessage(page, result) {
+
+        if (!result.IsNewUserInvitation && !result.IsPending) {
+
+            // It was immediately approved
+            return;
+        }
+
+        var message = result.IsNewUserInvitation ?
+            Globalize.translate('MessageInvitationSentToNewUser', result.GuestDisplayName) :
+            Globalize.translate('MessageInvitationSentToUser', result.GuestDisplayName);
+
+        Dashboard.alert({
+            message: message,
+            title: Globalize.translate('HeaderInvitationSent')
+        });
+    }
+
+    return {
+        show: function () {
+            return new Promise(function (resolve, reject) {
+
+                var xhr = new XMLHttpRequest();
+                xhr.open('GET', 'components/guestinviter/guestinviter.template.html', true);
+
+                xhr.onload = function (e) {
+
+                    var template = this.response;
+                    var dlg = paperDialogHelper.createDialog({
+                        removeOnClose: true,
+                        size: 'small'
+                    });
+
+                    dlg.classList.add('ui-body-a');
+                    dlg.classList.add('background-theme-a');
+
+                    dlg.classList.add('formDialog');
+
+                    var html = '';
+
+                    html += Globalize.translateDocument(template);
+
+                    dlg.innerHTML = html;
+                    // needed for the collapsible
+                    document.body.appendChild(dlg);
+                    $(dlg).trigger('create');
+
+                    paperDialogHelper.open(dlg);
+
+                    dlg.addEventListener('iron-overlay-closed', function () {
+
+                        if (dlg.submitted) {
+                            resolve();
+                        } else {
+                            reject();
+                        }
+                    });
+
+                    dlg.querySelector('.btnCancel').addEventListener('click', function (e) {
+
+                        paperDialogHelper.close(dlg);
+                    });
+
+                    dlg.querySelector('form').addEventListener('submit', function (e) {
+
+                        inviteUser(dlg);
+
+                        e.preventDefault();
+                        return false;
+                    });
+
+                    ApiClient.getJSON(ApiClient.getUrl("Library/MediaFolders", { IsHidden: false })).then(function (result) {
+
+                        renderLibrarySharingList(dlg, result);
+                    });
+                }
+
+                xhr.send();
+            });
+        }
+    };
+});
\ No newline at end of file
diff --git a/dashboard-ui/components/guestinviter/guestinviter.template.html b/dashboard-ui/components/guestinviter/guestinviter.template.html
new file mode 100644
index 0000000000..9fa4c0200f
--- /dev/null
+++ b/dashboard-ui/components/guestinviter/guestinviter.template.html
@@ -0,0 +1,31 @@
+<div class="dialogHeader">
+    <paper-icon-button icon="close" class="btnCancel" tabindex="-1"></paper-icon-button>
+    <div class="dialogHeaderTitle">
+        ${HeaderInviteUser}
+    </div>
+</div>
+
+<form class="addUserForm" style="max-width: none;margin:0;">
+
+    <paper-input type="text" id="txtConnectUsername" value="" placeholder="${PlaceholderUsername}" label="${LabelConnectGuestUserName}" required></paper-input>
+    <div class="fieldDescription">
+        <div>${LabelConnectGuestUserNameHelp}</div>
+        <div style="margin-top: .25em;"><a href="http://emby.media/connect" target="_blank">${ButtonLearnMoreAboutEmbyConnect}</a></div>
+    </div>
+
+    <br />
+
+    <div data-role="collapsible">
+        <h2>${HeaderShareMediaFolders}</h2>
+        <div>
+            <div class="librarySharingList" style="margin-top:1em;">
+
+            </div>
+        </div>
+    </div>
+    <p class="fieldDescription" style="margin-top:.5em;">${MessageGuestSharingPermissionsHelp}</p>
+    <br />
+    <button type="submit" data-role="none" class="clearButton">
+        <paper-button raised class="submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSendInvitation}</span></paper-button>
+    </button>
+</form>
\ No newline at end of file
diff --git a/dashboard-ui/components/metadataeditor/metadataeditor.js b/dashboard-ui/components/metadataeditor/metadataeditor.js
index 9329a2df9f..898c333c7a 100644
--- a/dashboard-ui/components/metadataeditor/metadataeditor.js
+++ b/dashboard-ui/components/metadataeditor/metadataeditor.js
@@ -1,44 +1,207 @@
-define(['paperdialoghelper', 'paper-checkbox', 'paper-dialog', 'paper-input', 'paper-item-body', 'paper-icon-item'], function (paperDialogHelper) {
+define(['paperdialoghelper', 'paper-checkbox', 'paper-dialog', 'paper-input', 'paper-item-body', 'paper-icon-item', 'paper-textarea'], function (paperDialogHelper) {
 
     var currentDialog;
     var metadataEditorInfo;
     var currentItem;
 
-    function onWebSocketMessageReceived(e, data) {
-
-        var msg = data;
-
-        if (msg.MessageType === "LibraryChanged") {
-
-            if (msg.Data.ItemsUpdated.indexOf(currentItem.Id) != -1) {
-
-                console.log('Item updated - reloading metadata');
-                reload(currentDialog, currentItem.Id);
-            }
-        }
-    }
-
-    function bindItemChanged() {
-
-        Events.on(ApiClient, "websocketmessage", onWebSocketMessageReceived);
-    }
-
-    function unbindItemChanged() {
-
-        Events.off(ApiClient, "websocketmessage", onWebSocketMessageReceived);
-    }
-
     function closeDialog(isSubmitted) {
 
         paperDialogHelper.close(currentDialog);
     }
 
+    function submitUpdatedItem(form, item) {
+
+        function afterContentTypeUpdated() {
+
+            Dashboard.alert(Globalize.translate('MessageItemSaved'));
+
+            Dashboard.hideLoadingMsg();
+            closeDialog(true);
+        }
+
+        ApiClient.updateItem(item).then(function () {
+
+            var newContentType = $('#selectContentType', form).val() || '';
+
+            if ((metadataEditorInfo.ContentType || '') != newContentType) {
+
+                ApiClient.ajax({
+
+                    url: ApiClient.getUrl('Items/' + item.Id + '/ContentType', {
+                        ContentType: newContentType
+                    }),
+
+                    type: 'POST'
+
+                }).then(function () {
+                    afterContentTypeUpdated();
+                });
+
+            } else {
+                afterContentTypeUpdated();
+            }
+
+        });
+    }
+
+    function getSelectedAirDays(form) {
+        return $('.chkAirDay:checked', form).map(function () {
+            return this.getAttribute('data-day');
+        }).get();
+    }
+
+    function getAlbumArtists(form) {
+
+        return $('#txtAlbumArtist', form).val().trim().split(';').filter(function (s) {
+
+            return s.length > 0;
+
+        }).map(function (a) {
+
+            return {
+                Name: a
+            };
+        });
+    }
+
+    function getArtists(form) {
+
+        return $('#txtArtist', form).val().trim().split(';').filter(function (s) {
+
+            return s.length > 0;
+
+        }).map(function (a) {
+
+            return {
+                Name: a
+            };
+        });
+    }
+
+    function getDateFromForm(form, element, property) {
+
+        var val = $(element, form).val();
+
+        if (!val) {
+            return null;
+        }
+
+        if (currentItem[property]) {
+
+            var date = parseISO8601Date(currentItem[property], { toLocal: true });
+
+            var parts = date.toISOString().split('T');
+
+            // If the date is the same, preserve the time
+            if (parts[0].indexOf(val) == 0) {
+
+                var iso = parts[1];
+
+                val += 'T' + iso;
+            }
+        }
+
+        return val;
+    }
+
     function onSubmit() {
 
         Dashboard.showLoadingMsg();
 
         var form = this;
 
+        try {
+            var item = {
+                Id: currentItem.Id,
+                Name: $('#txtName', form).val(),
+                ForcedSortName: $('#txtSortName', form).val(),
+                DisplayMediaType: $('#txtDisplayMediaType', form).val(),
+                CommunityRating: $('#txtCommunityRating', form).val(),
+                VoteCount: $('#txtCommunityVoteCount', form).val(),
+                HomePageUrl: $('#txtHomePageUrl', form).val(),
+                Budget: $('#txtBudget', form).val(),
+                Revenue: $('#txtRevenue', form).val(),
+                CriticRating: $('#txtCriticRating', form).val(),
+                CriticRatingSummary: $('#txtCriticRatingSummary', form).val(),
+                IndexNumber: $('#txtIndexNumber', form).val() || null,
+                DisplaySpecialsWithSeasons: form.querySelector('#chkDisplaySpecialsInline').checked,
+                AbsoluteEpisodeNumber: $('#txtAbsoluteEpisodeNumber', form).val(),
+                DvdEpisodeNumber: $('#txtDvdEpisodeNumber', form).val(),
+                DvdSeasonNumber: $('#txtDvdSeasonNumber', form).val(),
+                AirsBeforeSeasonNumber: $('#txtAirsBeforeSeason', form).val(),
+                AirsAfterSeasonNumber: $('#txtAirsAfterSeason', form).val(),
+                AirsBeforeEpisodeNumber: $('#txtAirsBeforeEpisode', form).val(),
+                ParentIndexNumber: $('#txtParentIndexNumber', form).val() || null,
+                DisplayOrder: $('#selectDisplayOrder', form).val(),
+                Players: $('#txtPlayers', form).val(),
+                Album: $('#txtAlbum', form).val(),
+                AlbumArtist: getAlbumArtists(form),
+                ArtistItems: getArtists(form),
+                Metascore: $('#txtMetascore', form).val(),
+                AwardSummary: $('#txtAwardSummary', form).val(),
+                Overview: $('#txtOverview', form).val(),
+                ShortOverview: $('#txtShortOverview', form).val(),
+                Status: $('#selectStatus', form).val(),
+                AirDays: getSelectedAirDays(form),
+                AirTime: $('#txtAirTime', form).val(),
+                Genres: editableListViewValues($("#listGenres", form)),
+                ProductionLocations: editableListViewValues($("#listCountries", form)),
+                Tags: editableListViewValues($("#listTags", form)),
+                Keywords: editableListViewValues($("#listKeywords", form)),
+                Studios: editableListViewValues($("#listStudios", form)).map(function (element) { return { Name: element }; }),
+
+                PremiereDate: getDateFromForm(form, '#txtPremiereDate', 'PremiereDate'),
+                DateCreated: getDateFromForm(form, '#txtDateAdded', 'DateCreated'),
+                EndDate: getDateFromForm(form, '#txtEndDate', 'EndDate'),
+                ProductionYear: $('#txtProductionYear', form).val(),
+                AspectRatio: $('#txtOriginalAspectRatio', form).val(),
+                Video3DFormat: $('#select3dFormat', form).val(),
+
+                OfficialRating: $('#selectOfficialRating', form).val(),
+                CustomRating: $('#selectCustomRating', form).val(),
+                People: currentItem.People,
+                LockData: form.querySelector("#chkLockData").checked,
+                LockedFields: $('.selectLockedField', form).get().filter(function (c) {
+                    return !c.checked;
+                }).map(function (c) {
+                    return c.getAttribute('data-value');
+                })
+            };
+
+            item.ProviderIds = $.extend({}, currentItem.ProviderIds || {});
+
+            $('.txtExternalId', form).each(function () {
+
+                var providerkey = this.getAttribute('data-providerkey');
+
+                item.ProviderIds[providerkey] = this.value;
+            });
+
+            item.PreferredMetadataLanguage = $('#selectLanguage', form).val();
+            item.PreferredMetadataCountryCode = $('#selectCountry', form).val();
+
+            if (currentItem.Type == "Person") {
+
+                var placeOfBirth = $('#txtPlaceOfBirth', form).val();
+
+                item.ProductionLocations = placeOfBirth ? [placeOfBirth] : [];
+            }
+
+            if (currentItem.Type == "Series") {
+
+                // 600000000
+                var seriesRuntime = $('#txtSeriesRuntime', form).val();
+                item.RunTimeTicks = seriesRuntime ? (seriesRuntime * 600000000) : null;
+            }
+
+            var tagline = $('#txtTagline', form).val();
+            item.Taglines = tagline ? [tagline] : [];
+
+            submitUpdatedItem(form, item);
+        } catch (err) {
+            alert(err);
+        }
+
         // Disable default form submission
         return false;
     }
@@ -81,48 +244,19 @@
 
     function editPerson(context, person, index) {
 
-        $('#popupEditPerson', context).popup("open");
+        require(['components/metadataeditor/personeditor'], function (personeditor) {
 
-        $('#txtPersonName', context).val(person.Name || '');
-        $('#selectPersonType', context).val(person.Type || '');
-        $('#txtPersonRole', context).val(person.Role || '');
+            personeditor.show(person).then(function (updatedPerson) {
 
-        if (index == null) {
-            index = '';
-        }
+                var isNew = index == -1;
 
-        $("#fldPersonIndex", context).val(index);
-    }
+                if (isNew) {
+                    currentItem.People.push(updatedPerson);
+                }
 
-    function savePersonInfo(page) {
-
-        $('#popupEditPerson', page).popup("close");
-
-        var index = $("#fldPersonIndex", page).val();
-        var person;
-
-        var isNew = true;
-
-        if (index) {
-
-            isNew = false;
-            index = parseInt(index);
-
-            person = currentItem.People[index];
-
-        } else {
-            person = {};
-        }
-
-        person.Name = $('#txtPersonName', page).val();
-        person.Type = $('#selectPersonType', page).val();
-        person.Role = $('#txtPersonRole', page).val();
-
-        if (isNew) {
-            currentItem.People.push(person);
-        }
-
-        populatePeople(page, currentItem.People);
+                populatePeople(context, currentItem.People);
+            });
+        });
     }
 
     function init(context) {
@@ -132,6 +266,11 @@
             closeDialog(false);
         });
 
+        context.querySelector('.btnHeaderSave').addEventListener('click', function (e) {
+
+            context.querySelector('.btnSave').click();
+        });
+
         context.querySelector('#chkLockData').addEventListener('click', function (e) {
 
             if (!e.target.checked) {
@@ -159,7 +298,7 @@
 
         $("#btnAddPerson", context).on('click', function (event, data) {
 
-            editPerson(context, {});
+            editPerson(context, {}, -1);
         });
     }
 
@@ -176,10 +315,7 @@
             return ApiClient.getJSON(ApiClient.getUrl('Items/' + itemId + '/MetadataEditor'));
         }
 
-        return new Promise(function (resolve, reject) {
-
-            resolve({});
-        });
+        return Promise.resolve({});
     }
 
     function populateCountries(select, allCountries) {
@@ -757,34 +893,36 @@
         var lastType = '';
         var html = '';
 
-        var elem = $('#peopleList', context);
+        var elem = context.querySelector('#peopleList');
 
         for (var i = 0, length = people.length; i < length; i++) {
 
             var person = people[i];
 
-            var type = person.Type || Globalize.translate('PersonTypePerson');
+            html += '<paper-icon-item>';
 
-            if (type != lastType) {
-                html += '<li data-role="list-divider">' + type + '</li>';
-                lastType = type;
-            }
+            html += '<paper-fab class="btnEditPerson" data-index="' + i + '" mini style="background-color:#444;" icon="person" item-icon></paper-fab>';
 
-            html += '<li><a class="btnEditPerson" href="#" data-index="' + i + '">';
+            html += '<paper-item-body>';
+            html += '<a class="btnEditPerson clearLink" href="#" data-index="' + i + '">';
 
-            html += '<h3>' + (person.Name || '') + '</h3>';
+            html += '<div class="textValue">';
+            html += (person.Name || '');
+            html += '</div>';
 
             if (person.Role && person.Role != lastType) {
-                html += '<p>' + (person.Role) + '</p>';
+                html += '<div secondary>' + (person.Role) + '</div>';
             }
+
             html += '</a>';
+            html += '</paper-item-body>';
 
-            html += '<a class="btnDeletePerson" href="#" data-icon="delete" data-index="' + i + '">' + Globalize.translate('Delete') + '</a>';
+            html += '<paper-icon-button icon="delete" data-index="' + i + '" class="btnDeletePerson"></paper-icon-button>';
 
-            html += '</li>';
+            html += '</paper-icon-item>';
         }
 
-        //elem.html(html);
+        elem.innerHTML = html;
 
         $('.btnDeletePerson', elem).on('click', function () {
 
@@ -858,7 +996,6 @@
 
     function reload(context, itemId) {
 
-        unbindItemChanged();
         Dashboard.showLoadingMsg();
 
         Promise.all([getItem(itemId), getEditorConfig(itemId)]).then(function (responses) {
@@ -902,7 +1039,6 @@
             }
 
             Dashboard.hideLoadingMsg();
-            bindItemChanged(context);
         });
     }
 
diff --git a/dashboard-ui/components/metadataeditor/metadataeditor.template.html b/dashboard-ui/components/metadataeditor/metadataeditor.template.html
index 073feaa129..1dc2c6844b 100644
--- a/dashboard-ui/components/metadataeditor/metadataeditor.template.html
+++ b/dashboard-ui/components/metadataeditor/metadataeditor.template.html
@@ -1,8 +1,12 @@
 <div class="dialogHeader">
-    <paper-icon-button icon="close" class="btnCancel"></paper-icon-button>
+    <paper-icon-button icon="close" class="btnCancel" tabindex="-1"></paper-icon-button>
     <div class="dialogHeaderTitle">
         ${ButtonEdit}
     </div>
+    <paper-button class="btnHeaderSave accent" tabindex="-1" style="margin-left:auto;">
+        <iron-icon icon="check"></iron-icon>
+        <span>${ButtonSave}</span>
+    </paper-button>
 </div>
 
 <form class="editItemMetadataForm editMetadataForm ">
@@ -70,7 +74,7 @@
             </div>
             <div>
                 <label for="txtOverview" class="likePaperLabel">${LabelOverview}</label>
-                <textarea id="txtOverview" class="likePaperText" data-role="none"></textarea>
+                <paper-textarea id="txtOverview"></paper-textarea>
                 <br />
             </div>
             <div id="fldShortOverview" style="display: none;">
@@ -236,8 +240,7 @@
                 <iron-icon icon="add"></iron-icon>
                 <span>${ButtonAdd}</span>
             </paper-button>
-            <div>
-                <ul data-role="listview" data-inset="true" data-split-icon="delete" id="peopleList"></ul>
+            <div id="peopleList" class="paperList">
             </div>
         </div>
         <div id="keywordsCollapsible" class="editableListviewContainer" style="display: none; margin-top: 3em;">
@@ -299,5 +302,6 @@
             <paper-button raised class="submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></paper-button>
         </button>
     </div>
-
+    <br />
+    <br />
 </form>
\ No newline at end of file
diff --git a/dashboard-ui/components/metadataeditor/personeditor.js b/dashboard-ui/components/metadataeditor/personeditor.js
new file mode 100644
index 0000000000..e33e75673c
--- /dev/null
+++ b/dashboard-ui/components/metadataeditor/personeditor.js
@@ -0,0 +1,70 @@
+define(['paperdialoghelper'], function (paperDialogHelper) {
+
+    return {
+        show: function (person) {
+            return new Promise(function (resolve, reject) {
+
+                var xhr = new XMLHttpRequest();
+                xhr.open('GET', 'components/metadataeditor/personeditor.template.html', true);
+
+                xhr.onload = function (e) {
+
+                    var template = this.response;
+                    var dlg = paperDialogHelper.createDialog({
+                        removeOnClose: true,
+                        size: 'small'
+                    });
+
+                    dlg.classList.add('ui-body-b');
+                    dlg.classList.add('background-theme-b');
+
+                    dlg.classList.add('formDialog');
+
+                    var html = '';
+                    var submitted = false;
+
+                    html += Globalize.translateDocument(template);
+
+                    dlg.innerHTML = html;
+                    document.body.appendChild(dlg);
+
+                    $('#txtPersonName', dlg).val(person.Name || '');
+                    $('#selectPersonType', dlg).val(person.Type || '');
+                    $('#txtPersonRole', dlg).val(person.Role || '');
+
+                    paperDialogHelper.open(dlg);
+
+                    dlg.addEventListener('iron-overlay-closed', function () {
+
+                        if (submitted) {
+                            resolve(person);
+                        } else {
+                            reject();
+                        }
+                    });
+
+                    dlg.querySelector('.btnCancel').addEventListener('click', function (e) {
+
+                        paperDialogHelper.close(dlg);
+                    });
+
+                    dlg.querySelector('form').addEventListener('submit', function (e) {
+
+                        submitted = true;
+
+                        person.Name = $('#txtPersonName', dlg).val();
+                        person.Type = $('#selectPersonType', dlg).val();
+                        person.Role = $('#txtPersonRole', dlg).val() || null;
+
+                        paperDialogHelper.close(dlg);
+
+                        e.preventDefault();
+                        return false;
+                    });
+                }
+
+                xhr.send();
+            });
+        }
+    };
+});
\ No newline at end of file
diff --git a/dashboard-ui/components/metadataeditor/personeditor.template.html b/dashboard-ui/components/metadataeditor/personeditor.template.html
new file mode 100644
index 0000000000..7fe50e5a40
--- /dev/null
+++ b/dashboard-ui/components/metadataeditor/personeditor.template.html
@@ -0,0 +1,35 @@
+<div class="dialogHeader">
+    <paper-icon-button icon="close" class="btnCancel" tabindex="-1"></paper-icon-button>
+    <div class="dialogHeaderTitle">
+        ${ButtonEdit}
+    </div>
+</div>
+
+<form class="popupEditPersonForm" style="max-width: none;margin:0;">
+
+    <div>
+        <paper-input type="text" id="txtPersonName" required="required" label="${LabelName}"></paper-input>
+    </div>
+
+    <br />
+    <div>
+        <label for="selectPersonType" class="selectLabel">${LabelType}</label>
+        <select id="selectPersonType" data-mini="true">
+            <option value=""></option>
+            <option value="Actor">${OptionActor}</option>
+            <option value="Composer">${OptionComposer}</option>
+            <option value="Director">${OptionDirector}</option>
+            <option value="GuestStar">${OptionGuestStar}</option>
+            <option value="Producer">${OptionProducer}</option>
+            <option value="Writer">${OptionWriter}</option>
+        </select>
+    </div>
+    <div>
+        <paper-input type="text" id="txtPersonRole" label="${LabelPersonRole}"></paper-input>
+        <div class="fieldDescription">${LabelPersonRoleHelp}</div>
+    </div>
+    <br />
+    <button type="submit" data-role="none" class="clearButton">
+        <paper-button raised class="submit block"><iron-icon icon="check"></iron-icon><span>${ButtonOk}</span></paper-button>
+    </button>
+</form>
\ No newline at end of file
diff --git a/dashboard-ui/css/librarymenu.css b/dashboard-ui/css/librarymenu.css
index 1c8665fc41..031beca8e8 100644
--- a/dashboard-ui/css/librarymenu.css
+++ b/dashboard-ui/css/librarymenu.css
@@ -12,7 +12,7 @@
 
 .sidebarDivider {
     height: 1px;
-    background: #ddd;
+    background: #eaeaea;
     margin: .5em 0;
 }
 
diff --git a/dashboard-ui/css/site.css b/dashboard-ui/css/site.css
index 2bc3af3e25..d755097e9d 100644
--- a/dashboard-ui/css/site.css
+++ b/dashboard-ui/css/site.css
@@ -1123,7 +1123,7 @@ paper-input + .fieldDescription {
 }
 
 .background-theme-a, paper-dialog.background-theme-a {
-    background-color: #f7f7f7;
+    background-color: #f4f4f4;
 }
 
 .ui-page-theme-a .content-secondary {
diff --git a/dashboard-ui/device.html b/dashboard-ui/device.html
index cc21e577aa..3e6bc34a3e 100644
--- a/dashboard-ui/device.html
+++ b/dashboard-ui/device.html
@@ -21,11 +21,9 @@
                         <p class="reportedName">
 
                         </p>
-                        <br />
                         <ul data-role="listview" class="ulForm">
                             <li>
-                                <label for="txtCustomName">${LabelCustomDeviceDisplayName}</label>
-                                <input type="text" id="txtCustomName" />
+                                <paper-input type="text" id="txtCustomName" label="${LabelCustomDeviceDisplayName}"></paper-input>
                                 <div class="fieldDescription">${LabelCustomDeviceDisplayNameHelp}</div>
                             </li>
                             <li id="fldCameraUploadPath" style="display:none;">
diff --git a/dashboard-ui/dlnaprofile.html b/dashboard-ui/dlnaprofile.html
index f9e8278b09..801a5e4945 100644
--- a/dashboard-ui/dlnaprofile.html
+++ b/dashboard-ui/dlnaprofile.html
@@ -406,7 +406,7 @@
                         <input type="radio" name="radioTranscodingTab" class="radioTabButton" id="radioTranscodingAdvanced" value="tabTranscodingAdvanced">
                         <label for="radioTranscodingAdvanced">${TabAdvanced}</label>
                     </div>
-
+                    <br/>
                     <div class="tabContent tabTranscodingBasics" style="display: none;">
                         <div style="margin: 1em 0;">
                             <label for="selectTranscodingProfileType">${LabelType}</label>
diff --git a/dashboard-ui/dlnaserversettings.html b/dashboard-ui/dlnaserversettings.html
index c1a1af66df..a47776ba43 100644
--- a/dashboard-ui/dlnaserversettings.html
+++ b/dashboard-ui/dlnaserversettings.html
@@ -4,7 +4,7 @@
     <title>${TitleDlna}</title>
 </head>
 <body>
-    <div id="dlnaServerSettingsPage" data-role="page" class="page type-interior dlnaPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Dlna%20server" data-require="scripts/dlnaserversettings">
+    <div id="dlnaServerSettingsPage" data-role="page" class="page type-interior dlnaPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Dlna%20server" data-require="scripts/dlnaserversettings,paper-input">
 
         <div data-role="content">
             <div class="content-primary">
@@ -29,12 +29,11 @@
                             <div class="fieldDescription">${LabelEnableBlastAliveMessagesHelp}</div>
                         </li>
                         <li>
-                            <label for="txtBlastInterval">${LabelBlastMessageInterval}</label>
-                            <input type="number" id="txtBlastInterval" min="1" max="300" />
+                            <paper-input type="number" id="txtBlastInterval" min="1" max="300" label="${LabelBlastMessageInterval}"></paper-input>
                             <div class="fieldDescription">${LabelBlastMessageIntervalHelp}</div>
                         </li>
                         <li>
-                            <label for="selectUser">${LabelDefaultUser}</label>
+                            <label for="selectUser" class="selectLabel">${LabelDefaultUser}</label>
                             <select id="selectUser" data-mini="true"></select>
                             <div class="fieldDescription">${LabelDefaultUserHelp}</div>
                         </li>
diff --git a/dashboard-ui/dlnasettings.html b/dashboard-ui/dlnasettings.html
index 53380dc37d..cd55188d6f 100644
--- a/dashboard-ui/dlnasettings.html
+++ b/dashboard-ui/dlnasettings.html
@@ -4,7 +4,7 @@
     <title>${TitleDlna}</title>
 </head>
 <body>
-    <div id="dlnaSettingsPage" data-role="page" class="page type-interior dlnaPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Play%20to" data-require="scripts/dlnasettings">
+    <div id="dlnaSettingsPage" data-role="page" class="page type-interior dlnaPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Play%20to" data-require="scripts/dlnasettings,paper-input">
 
         <div data-role="content">
             <div class="content-primary">
@@ -29,8 +29,7 @@
                             <div class="fieldDescription">${LabelEnableDlnaDebugLoggingHelp}</div>
                         </li>
                         <li>
-                            <label for="txtClientDiscoveryInterval">${LabelEnableDlnaClientDiscoveryInterval}</label>
-                            <input type="number" id="txtClientDiscoveryInterval" min="1" max="300" />
+                            <paper-input type="number" id="txtClientDiscoveryInterval" min="1" max="300" label="${LabelEnableDlnaClientDiscoveryInterval}"></paper-input>
                             <div class="fieldDescription">${LabelEnableDlnaClientDiscoveryIntervalHelp}</div>
                         </li>
                     </ul>
diff --git a/dashboard-ui/encodingsettings.html b/dashboard-ui/encodingsettings.html
index cebf464ded..7443a7ee3d 100644
--- a/dashboard-ui/encodingsettings.html
+++ b/dashboard-ui/encodingsettings.html
@@ -4,7 +4,7 @@
     <title>${TitlePlayback}</title>
 </head>
 <body>
-    <div id="encodingSettingsPage" data-role="page" class="page type-interior playbackConfigurationPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Transcoding" data-require="scripts/encodingsettings,paper-input">
+    <div id="encodingSettingsPage" data-role="page" class="page type-interior playbackConfigurationPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Transcoding" data-require="scripts/encodingsettings,paper-input,paper-checkbox">
 
         <div data-role="content">
             <div class="content-primary">
@@ -44,9 +44,9 @@
                             <div class="fieldDescription">${LabelTranscodingThreadCountHelp}</div>
                         </li>
                         <li>
-                            <input type="checkbox" id="chkEnableThrottle" data-mini="true" />
-                            <label for="chkEnableThrottle">${OptionEnableTranscodingThrottle}</label>
-                            <div class="fieldDescription">${OptionEnableTranscodingThrottleHelp}</div>
+                            <br />
+                            <paper-checkbox id="chkEnableThrottle">${OptionEnableTranscodingThrottle}</paper-checkbox>
+                            <div class="fieldDescription paperCheckboxFieldDescription">${OptionEnableTranscodingThrottleHelp}</div>
                         </li>
                         <li>
                             <paper-input id="txtTranscodingTempPath" label="${LabelTranscodingTempPath}" style="width:80%;display:inline-block;"></paper-input>
@@ -54,11 +54,9 @@
                             <div class="fieldDescription">
                                 ${LabelTranscodingTempPathHelp}
                             </div>
-                            <br />
                         </li>
                         <li>
-                            <label for="txtDownMixAudioBoost">${LabelDownMixAudioScale}</label>
-                            <input type="number" id="txtDownMixAudioBoost" pattern="[0-9]*" required="required" min=".5" max="3" step=".1" />
+                            <paper-input type="number" id="txtDownMixAudioBoost" pattern="[0-9]*" required="required" min=".5" max="3" step=".1" label="${LabelDownMixAudioScale}"></paper-input>
                             <div class="fieldDescription">${LabelDownMixAudioScaleHelp}</div>
                         </li>
                         <li style="display:none;">
diff --git a/dashboard-ui/metadata.html b/dashboard-ui/metadata.html
index 82422d8de3..f577170f9c 100644
--- a/dashboard-ui/metadata.html
+++ b/dashboard-ui/metadata.html
@@ -4,7 +4,7 @@
     <title>${TitleMetadata}</title>
 </head>
 <body>
-    <div id="metadataConfigurationPage" data-role="page" class="page type-interior metadataConfigurationPage" data-require="scripts/metadataconfigurationpage">
+    <div id="metadataConfigurationPage" data-role="page" class="page type-interior metadataConfigurationPage" data-require="scripts/metadataconfigurationpage,paper-checkbox">
 
         <div data-role="content">
 
@@ -18,24 +18,16 @@
                 </div>
 
                 <form class="metadataConfigurationForm">
+
                     <ul data-role="listview" class="ulForm">
                         <li>
-                            <input type="checkbox" id="chkEnableInternetProviders" name="chkEnableInternetProviders" data-mini="true" />
-                            <label for="chkEnableInternetProviders">${LabelDownloadInternetMetadata}</label>
-                            <div class="fieldDescription">${LabelDownloadInternetMetadataHelp}</div>
+                            <paper-checkbox id="chkEnableInternetProviders">${LabelDownloadInternetMetadata}</paper-checkbox>
+                            <div class="fieldDescription paperCheckboxFieldDescription">${LabelDownloadInternetMetadataHelp}</div>
                         </li>
                         <li>
-                            <input type="checkbox" id="chkSaveLocal" name="chkSaveLocal" data-mini="true" />
-                            <label for="chkSaveLocal">${LabelSaveLocalMetadata}</label>
-                            <div class="fieldDescription">${LabelSaveLocalMetadataHelp}</div>
-                        </li>
-                        <li style="display:none;">
-                            <label for="selectImageSavingConvention" class="selectLabel">${LabelImageSavingConvention}</label>
-                            <select name="selectImageSavingConvention" id="selectImageSavingConvention" data-mini="true">
-                                <option value="Compatible">${OptionImageSavingCompatible}</option>
-                                <option value="Legacy">${OptionImageSavingStandard}</option>
-                            </select>
-                            <div class="fieldDescription">${LabelImageSavingConventionHelp}</div>
+                            <paper-checkbox id="chkSaveLocal">${LabelSaveLocalMetadata}</paper-checkbox>
+                            <div class="fieldDescription paperCheckboxFieldDescription">${LabelSaveLocalMetadataHelp}</div>
+                            <br/>
                         </li>
                         <li>
                             <label for="selectLanguage" class="selectLabel">${LabelMetadataDownloadLanguage}</label>
diff --git a/dashboard-ui/notificationsetting.html b/dashboard-ui/notificationsetting.html
index d1352aea32..4e68446a2a 100644
--- a/dashboard-ui/notificationsetting.html
+++ b/dashboard-ui/notificationsetting.html
@@ -4,7 +4,7 @@
     <title>${TitleNotifications}</title>
 </head>
 <body>
-    <div id="notificationSettingPage" data-role="page" class="page type-interior notificationConfigurationPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Notifications" data-require="scripts/notificationsetting">
+    <div id="notificationSettingPage" data-role="page" class="page type-interior notificationConfigurationPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Notifications" data-require="scripts/notificationsetting,paper-input">
 
         <div data-role="content">
             <div class="content-primary">
@@ -35,7 +35,7 @@
 
                     <div>
                         <div>
-                            <label for="selectUsers">${LabelSendNotificationToUsers}</label>
+                            <label for="selectUsers" class="selectLabel">${LabelSendNotificationToUsers}</label>
                             <select id="selectUsers">
                                 <option value="All">${OptionAllUsers}</option>
                                 <option value="Admins">${OptionAdminUsers}</option>
@@ -63,8 +63,7 @@
                     <br />
                     <ul data-role="listview" class="ulForm">
                         <li>
-                            <label for="txtTitle">${LabelMessageTitle}</label>
-                            <input id="txtTitle" type="text" required="required" />
+                            <paper-input id="txtTitle" type="text" required label="${LabelMessageTitle}"></paper-input>
                             <div class="fieldDescription tokenHelp">
                                 <div>${LabelAvailableTokens}</div>
                                 <div class="tokenList" style="margin-top: .5em;"></div>
diff --git a/dashboard-ui/scripts/autoorganizelog.js b/dashboard-ui/scripts/autoorganizelog.js
index 4282d6c162..eb0e904b5c 100644
--- a/dashboard-ui/scripts/autoorganizelog.js
+++ b/dashboard-ui/scripts/autoorganizelog.js
@@ -3,7 +3,7 @@
     var query = {
 
         StartIndex: 0,
-        Limit: 20
+        Limit: 50
     };
 
     var currentResult;
diff --git a/dashboard-ui/scripts/dlnaprofile.js b/dashboard-ui/scripts/dlnaprofile.js
index f549b71cae..91e7828085 100644
--- a/dashboard-ui/scripts/dlnaprofile.js
+++ b/dashboard-ui/scripts/dlnaprofile.js
@@ -949,7 +949,8 @@
             $(this).siblings().removeClass('ui-btn-active');
             $(this).addClass('ui-btn-active');
 
-            var elem = $('.' + this.getAttribute('data-value'), page);
+            var value = this.tagName == 'A' ? this.getAttribute('data-value') : this.value;
+            var elem = $('.' + value, page);
             elem.siblings('.tabContent').hide();
 
             elem.show();
diff --git a/dashboard-ui/scripts/encodingsettings.js b/dashboard-ui/scripts/encodingsettings.js
index bfe833bc52..7a42e3d5b4 100644
--- a/dashboard-ui/scripts/encodingsettings.js
+++ b/dashboard-ui/scripts/encodingsettings.js
@@ -3,7 +3,7 @@
     function loadPage(page, config) {
 
         $('#chkEnableDebugEncodingLogging', page).checked(config.EnableDebugLogging).checkboxradio('refresh');
-        $('#chkEnableThrottle', page).checked(config.EnableThrottling).checkboxradio('refresh');
+        page.querySelector('#chkEnableThrottle').checked = config.EnableThrottling;
 
         $('.radioEncodingQuality', page).each(function () {
 
@@ -32,10 +32,11 @@
                 config.EncodingQuality = $('.radioEncodingQuality:checked', form).val();
                 config.DownMixAudioBoost = $('#txtDownMixAudioBoost', form).val();
                 config.TranscodingTempPath = $('#txtTranscodingTempPath', form).val();
-                config.EnableThrottling = $('#chkEnableThrottle', form).checked();
                 config.EncodingThreadCount = $('#selectThreadCount', form).val();
                 config.HardwareAccelerationType = $('#selectVideoDecoder', form).val();
 
+                config.EnableThrottling = form.querySelector('#chkEnableThrottle').checked;
+
                 ApiClient.updateNamedConfiguration("encoding", config).then(Dashboard.processServerConfigurationUpdateResult);
             });
         };
diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js
index d0cbfbc862..9cdb401261 100644
--- a/dashboard-ui/scripts/librarybrowser.js
+++ b/dashboard-ui/scripts/librarybrowser.js
@@ -902,12 +902,10 @@
 
         editMetadata: function (itemId) {
 
-           Dashboard.navigate('edititemmetadata.html?id=' + itemId);
+            require(['components/metadataeditor/metadataeditor'], function (metadataeditor) {
 
-            //require(['components/metadataeditor/metadataeditor'], function (metadataeditor) {
-
-            //    metadataeditor.show(itemId);
-            //});
+                metadataeditor.show(itemId);
+            });
         },
 
         showMoreCommands: function (positionTo, itemId, commands) {
diff --git a/dashboard-ui/scripts/metadataconfigurationpage.js b/dashboard-ui/scripts/metadataconfigurationpage.js
index 89c58fdf50..a16f031a6b 100644
--- a/dashboard-ui/scripts/metadataconfigurationpage.js
+++ b/dashboard-ui/scripts/metadataconfigurationpage.js
@@ -5,13 +5,11 @@
             return;
         }
 
-        $('#chkEnableInternetProviders', page).checked(config.EnableInternetProviders).checkboxradio("refresh");
-        $('#chkSaveLocal', page).checked(config.SaveLocalMeta).checkboxradio("refresh");
+        page.querySelector('#chkEnableInternetProviders').checked = config.EnableInternetProviders;
+        page.querySelector('#chkSaveLocal').checked = config.SaveLocalMeta;
         $('#selectLanguage', page).val(config.PreferredMetadataLanguage);
         $('#selectCountry', page).val(config.MetadataCountryCode);
 
-        $('#selectImageSavingConvention', page).val(config.ImageSavingConvention);
-
         Dashboard.hideLoadingMsg();
     }
 
@@ -22,10 +20,8 @@
 
         ApiClient.getServerConfiguration().then(function (config) {
 
-            config.ImageSavingConvention = $('#selectImageSavingConvention', form).val();
-
-            config.EnableInternetProviders = $('#chkEnableInternetProviders', form).checked();
-            config.SaveLocalMeta = $('#chkSaveLocal', form).checked();
+            config.EnableInternetProviders = form.querySelector('#chkEnableInternetProviders').checked;
+            config.SaveLocalMeta = form.querySelector('#chkSaveLocal').checked;
             config.PreferredMetadataLanguage = $('#selectLanguage', form).val();
             config.MetadataCountryCode = $('#selectCountry', form).val();
 
diff --git a/dashboard-ui/scripts/sync.js b/dashboard-ui/scripts/sync.js
index fd1c94763a..c093dbdf54 100644
--- a/dashboard-ui/scripts/sync.js
+++ b/dashboard-ui/scripts/sync.js
@@ -106,7 +106,7 @@
         if (options.readOnlySyncTarget) {
             html += '<paper-input type="text" id="selectSyncTarget" readonly label="' + Globalize.translate('LabelSyncTo') + '"></paper-input>';
         } else {
-            html += '<label for="selectSyncTarget">' + Globalize.translate('LabelSyncTo') + '</label>';
+            html += '<label for="selectSyncTarget" class="selectLabel">' + Globalize.translate('LabelSyncTo') + '</label>';
             html += '<select id="selectSyncTarget" required="required" data-mini="true">';
 
             html += targets.map(function (t) {
@@ -126,7 +126,7 @@
 
         html += '<div class="fldProfile" style="display:none;">';
         html += '<br/>';
-        html += '<label for="selectProfile">' + Globalize.translate('LabelProfile') + '</label>';
+        html += '<label for="selectProfile" class="selectLabel">' + Globalize.translate('LabelProfile') + '</label>';
         html += '<select id="selectProfile" data-mini="true">';
         html += '</select>';
         html += '<div class="fieldDescription profileDescription"></div>';
@@ -134,7 +134,7 @@
 
         html += '<div class="fldQuality" style="display:none;">';
         html += '<br/>';
-        html += '<label for="selectQuality">' + Globalize.translate('LabelQuality') + '</label>';
+        html += '<label for="selectQuality" class="selectLabel">' + Globalize.translate('LabelQuality') + '</label>';
         html += '<select id="selectQuality" data-mini="true" required="required">';
         html += '</select>';
         html += '<div class="fieldDescription qualityDescription"></div>';
diff --git a/dashboard-ui/scripts/userprofilespage.js b/dashboard-ui/scripts/userprofilespage.js
index c19d76d961..bb7121a16b 100644
--- a/dashboard-ui/scripts/userprofilespage.js
+++ b/dashboard-ui/scripts/userprofilespage.js
@@ -1,33 +1,5 @@
 (function (document, window, $) {
 
-    function renderLibrarySharingList(page, result) {
-
-        var folderHtml = '';
-
-        folderHtml += '<div data-role="controlgroup">';
-
-        folderHtml += result.Items.map(function (i) {
-
-            var currentHtml = '';
-
-            var id = 'chkShareFolder' + i.Id;
-
-            currentHtml += '<label for="' + id + '">' + i.Name + '</label>';
-
-            var isChecked = true;
-            var checkedHtml = isChecked ? ' checked="checked"' : '';
-
-            currentHtml += '<input data-mini="true" class="chkShareFolder" data-folderid="' + i.Id + '" type="checkbox" id="' + id + '"' + checkedHtml + ' />';
-
-            return currentHtml;
-
-        }).join('');
-
-        folderHtml += '</div>';
-
-        $('.librarySharingList', page).html(folderHtml).trigger('create');
-    }
-
     function deleteUser(page, id) {
 
         var msg = Globalize.translate('DeleteUserConfirmation');
@@ -218,35 +190,34 @@
 
     function showPendingUserMenu(elem) {
 
-        require(['jqmpopup'], function () {
+        var menuItems = [];
+
+        menuItems.push({
+            name: Globalize.translate('ButtonCancel'),
+            id: 'delete',
+            ironIcon: 'delete'
+        });
+
+        require(['actionsheet'], function (actionsheet) {
+
             var card = $(elem).parents('.card');
             var page = $(elem).parents('.page');
             var id = card.attr('data-id');
 
-            $('.userMenu', page).popup("close").remove();
+            actionsheet.show({
+                items: menuItems,
+                positionTo: card,
+                callback: function (menuItemId) {
 
-            var html = '<div data-role="popup" class="userMenu tapHoldMenu" data-theme="a">';
+                    switch (menuItemId) {
 
-            html += '<ul data-role="listview" style="min-width: 180px;">';
-            html += '<li data-role="list-divider">' + Globalize.translate('HeaderMenu') + '</li>';
-
-            html += '<li><a href="#" class="btnDelete" data-id="' + id + '">' + Globalize.translate('ButtonCancel') + '</a></li>';
-
-            html += '</ul>';
-
-            html += '</div>';
-
-            page.append(html);
-
-            var flyout = $('.userMenu', page).popup({ positionTo: elem || "window" }).trigger('create').popup("open").on("popupafterclose", function () {
-
-                $(this).off("popupafterclose").remove();
-
-            });
-
-            $('.btnDelete', flyout).on('click', function () {
-                cancelAuthorization(page, this.getAttribute('data-id'));
-                $('.userMenu', page).popup("close").remove();
+                        case 'delete':
+                            cancelAuthorization(page, id);
+                            break;
+                        default:
+                            break;
+                    }
+                }
             });
         });
     }
@@ -352,86 +323,13 @@
 
             renderPendingGuests(page, pending);
         });
-
-        ApiClient.getJSON(ApiClient.getUrl("Library/MediaFolders", { IsHidden: false })).then(function (result) {
-
-            renderLibrarySharingList(page, result);
-        });
-    }
-
-    function inviteUser(page) {
-
-        Dashboard.showLoadingMsg();
-
-        ApiClient.getJSON(ApiClient.getUrl("Channels", {})).then(function (channelsResult) {
-
-            var shareExcludes = $(".chkShareFolder:checked", page).get().map(function (i) {
-
-                return i.getAttribute('data-folderid');
-            });
-
-            // Add/Update connect info
-            ApiClient.ajax({
-
-                type: "POST",
-                url: ApiClient.getUrl('Connect/Invite'),
-                dataType: 'json',
-                data: {
-
-                    ConnectUsername: $('#txtConnectUsername', page).val(),
-                    EnabledLibraries: shareExcludes.join(','),
-                    SendingUserId: Dashboard.getCurrentUserId(),
-                    EnableLiveTv: false
-                }
-
-            }).then(function (result) {
-
-                $('#popupInvite').popup('close');
-
-                Dashboard.hideLoadingMsg();
-
-                showNewUserInviteMessage(page, result);
-
-            });
-        });
-    }
-
-    function showNewUserInviteMessage(page, result) {
-
-        if (!result.IsNewUserInvitation && !result.IsPending) {
-
-            // It was immediately approved
-            loadData(page);
-            return;
-        }
-
-        var message = result.IsNewUserInvitation ?
-            Globalize.translate('MessageInvitationSentToNewUser', result.GuestDisplayName) :
-            Globalize.translate('MessageInvitationSentToUser', result.GuestDisplayName);
-
-        // Need a timeout because jquery mobile will not show a popup while a previous one is in the act of closing
-        setTimeout(function () {
-
-            Dashboard.alert({
-                message: message,
-                title: Globalize.translate('HeaderInvitationSent'),
-                callback: function () {
-                    loadData(page);
-                }
-            });
-
-        }, 300);
     }
 
     function showInvitePopup(page) {
 
         Dashboard.getCurrentUser().then(function (user) {
 
-            if (user.ConnectUserId) {
-
-                $('#popupInvite', page).popup('open');
-                $('#txtConnectUsername', page).val('');
-            } else {
+            if (!user.ConnectUserId) {
 
                 var msg = Globalize.translate('MessageConnectAccountRequiredToInviteGuest');
 
@@ -444,22 +342,18 @@
                     message: msg,
                     title: Globalize.translate('HeaderInviteGuest')
                 });
-
+                return;
             }
 
+            require(['components/guestinviter/guestinviter'], function (guestinviter) {
+
+                guestinviter.show().then(function () {
+                    loadData(page);
+                });
+            });
         });
     }
 
-    function onSubmit() {
-        var form = this;
-
-        var page = $(form).parents('.page');
-
-        inviteUser(page);
-
-        return false;
-    }
-
     $(document).on('pageinit', "#userProfilesPage", function () {
 
         var page = this;
@@ -474,8 +368,6 @@
             Dashboard.navigate('usernew.html');
         });
 
-        $('.addUserForm').off('submit', onSubmit).on('submit', onSubmit);
-
     }).on('pagebeforeshow', "#userProfilesPage", function () {
 
         var page = this;
diff --git a/dashboard-ui/streamingsettings.html b/dashboard-ui/streamingsettings.html
index 03bc170c7b..4b24401dd8 100644
--- a/dashboard-ui/streamingsettings.html
+++ b/dashboard-ui/streamingsettings.html
@@ -4,7 +4,7 @@
     <title>${TitlePlayback}</title>
 </head>
 <body>
-    <div id="streamingSettingsPage" data-role="page" class="page type-interior playbackConfigurationPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Streaming" data-require="scripts/streamingsettings">
+    <div id="streamingSettingsPage" data-role="page" class="page type-interior playbackConfigurationPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Streaming" data-require="scripts/streamingsettings,paper-input">
 
         <div data-role="content">
             <div class="content-primary">
@@ -20,8 +20,7 @@
 
                     <ul data-role="listview" class="ulForm">
                         <li>
-                            <label for="txtRemoteClientBitrateLimit">${LabelRemoteClientBitrateLimit}</label>
-                            <input type="number" id="txtRemoteClientBitrateLimit" pattern="[0-9]*" required="required" min="0" step=".25" />
+                            <paper-input type="number" id="txtRemoteClientBitrateLimit" pattern="[0-9]*" required min="0" step=".25" label="${LabelRemoteClientBitrateLimit}"></paper-input>
                             <div class="fieldDescription">${LabelRemoteClientBitrateLimitHelp}</div>
                         </li>
                     </ul>
diff --git a/dashboard-ui/strings/html/ar.json b/dashboard-ui/strings/html/ar.json
index 0d8e756b00..6ecbf459cb 100644
--- a/dashboard-ui/strings/html/ar.json
+++ b/dashboard-ui/strings/html/ar.json
@@ -1255,7 +1255,7 @@
     "LabelExtractChaptersDuringLibraryScan": "Extract chapter images during the library scan",
     "LabelExtractChaptersDuringLibraryScanHelp": "If enabled, chapter images will be extracted when videos are imported during the library scan. If disabled they will be extracted during the chapter images scheduled task, allowing the regular library scan to complete faster.",
     "LabelConnectGuestUserName": "Their Emby username or email address:",
-    "LabelConnectUserName": "Emby username\/email:",
+    "LabelConnectUserName": "Emby username or email address:",
     "LabelConnectUserNameHelp": "Connect this local user to an online Emby account to enable easy sign-in access from any Emby app without having to know the server ip address.",
     "ButtonLearnMoreAboutEmbyConnect": "Learn more about Emby Connect",
     "LabelExternalPlayers": "External players:",
diff --git a/dashboard-ui/strings/html/bg-BG.json b/dashboard-ui/strings/html/bg-BG.json
index bad9f3ac27..c968af0e81 100644
--- a/dashboard-ui/strings/html/bg-BG.json
+++ b/dashboard-ui/strings/html/bg-BG.json
@@ -1255,7 +1255,7 @@
     "LabelExtractChaptersDuringLibraryScan": "Extract chapter images during the library scan",
     "LabelExtractChaptersDuringLibraryScanHelp": "If enabled, chapter images will be extracted when videos are imported during the library scan. If disabled they will be extracted during the chapter images scheduled task, allowing the regular library scan to complete faster.",
     "LabelConnectGuestUserName": "\u0422\u044f\u0445\u043d\u043e\u0442\u043e Emby \u043f\u043e\u0442\u0440\u0435\u0431\u0438\u0442\u0435\u043a\u0441\u043a\u043e \u0438\u043c\u0435 \u0438\u043b\u0438 \u0438\u043c\u0435\u0439\u043b \u0430\u0434\u0440\u0435\u0441:",
-    "LabelConnectUserName": "Emby \u043f\u043e\u0442\u0440\u0435\u0431\u0438\u0442\u0435\u043a\u0441\u043a\u043e \u0438\u043c\u0435\/\u0438\u043c\u0435\u0439\u043b \u0430\u0434\u0440\u0435\u0441:",
+    "LabelConnectUserName": "Emby username or email address:",
     "LabelConnectUserNameHelp": "Connect this local user to an online Emby account to enable easy sign-in access from any Emby app without having to know the server ip address.",
     "ButtonLearnMoreAboutEmbyConnect": "Learn more about Emby Connect",
     "LabelExternalPlayers": "External players:",
diff --git a/dashboard-ui/strings/html/ca.json b/dashboard-ui/strings/html/ca.json
index 99aebe3d7e..1dc0e28499 100644
--- a/dashboard-ui/strings/html/ca.json
+++ b/dashboard-ui/strings/html/ca.json
@@ -1255,7 +1255,7 @@
     "LabelExtractChaptersDuringLibraryScan": "Extrau imatges dels episodis durant l'escaneig de la biblioteca",
     "LabelExtractChaptersDuringLibraryScanHelp": "If enabled, chapter images will be extracted when videos are imported during the library scan. If disabled they will be extracted during the chapter images scheduled task, allowing the regular library scan to complete faster.",
     "LabelConnectGuestUserName": "Their Emby username or email address:",
-    "LabelConnectUserName": "Emby username\/email:",
+    "LabelConnectUserName": "Emby username or email address:",
     "LabelConnectUserNameHelp": "Connect this local user to an online Emby account to enable easy sign-in access from any Emby app without having to know the server ip address.",
     "ButtonLearnMoreAboutEmbyConnect": "Learn more about Emby Connect",
     "LabelExternalPlayers": "External players:",
diff --git a/dashboard-ui/strings/html/cs.json b/dashboard-ui/strings/html/cs.json
index b3620df5c0..144fd2c1c7 100644
--- a/dashboard-ui/strings/html/cs.json
+++ b/dashboard-ui/strings/html/cs.json
@@ -1255,7 +1255,7 @@
     "LabelExtractChaptersDuringLibraryScan": "Extrakce obr\u00e1zk\u016f kapitol b\u011bhem prohled\u00e1v\u00e1n\u00ed va\u0161\u00ed knihovny.",
     "LabelExtractChaptersDuringLibraryScanHelp": "Jestli\u017ee povol\u00edte, budou sn\u00edmky kapitol extrahov\u00e1ny p\u0159i pravideln\u00e9m prohled\u00e1v\u00e1n\u00ed va\u0161\u00ed knihovny. Pokud zak\u00e1\u017eete budou sn\u00edmky extrahov\u00e1ny b\u011bhem napl\u00e1novan\u00e9 \u00falohy pro extrakci sn\u00edmk\u016f z kapitol, co\u017e umo\u017en\u00ed, p\u0159i pravideln\u00e9m prohled\u00e1v\u00e1n\u00ed va\u0161\u00ed knihovny, dokon\u010dit skenov\u00e1n\u00ed rychleji.",
     "LabelConnectGuestUserName": "Jejich Emby u\u017eivatelsk\u00e9 jm\u00e9no nebo emailov\u00e1 adresa:",
-    "LabelConnectUserName": "Emby u\u017eivatelsk\u00e9 jm\u00e9no\/email:",
+    "LabelConnectUserName": "Emby username or email address:",
     "LabelConnectUserNameHelp": "P\u0159ipojit tohoto lok\u00e1ln\u00edho u\u017eivatele, aby on-line Emby \u00fa\u010det umo\u017enil snadn\u00fd p\u0159\u00edstup z jak\u00e9koliv aplikace Emby, ani\u017e byste museli zn\u00e1t IP adresu serveru.",
     "ButtonLearnMoreAboutEmbyConnect": "Zjist\u011bte v\u00edce o Emby Connect",
     "LabelExternalPlayers": "Extern\u00ed p\u0159ehr\u00e1va\u010de:",
diff --git a/dashboard-ui/strings/html/da.json b/dashboard-ui/strings/html/da.json
index b05c98cedb..86a116e0e3 100644
--- a/dashboard-ui/strings/html/da.json
+++ b/dashboard-ui/strings/html/da.json
@@ -1255,7 +1255,7 @@
     "LabelExtractChaptersDuringLibraryScan": "Udtr\u00e6k kapitelbilleder under biblioteksskanning",
     "LabelExtractChaptersDuringLibraryScanHelp": "Aktiver dette for at udtr\u00e6kke kapitelbillleder mens videofiler bliver importeret under biblioteksskanningen. Hvi det ikke er aktiveret, bliver de udtrukket n\u00e5r den planlagte opgave kapitelbilleder k\u00f8rer, og lader den almindelige biblioteksskanning afslutte hurtigere.",
     "LabelConnectGuestUserName": "Hans\/hendes Emby brugernavn eller e-mailadresse:",
-    "LabelConnectUserName": "Emby brugernavn\/e-mail:",
+    "LabelConnectUserName": "Emby username or email address:",
     "LabelConnectUserNameHelp": "Connect this local user to an online Emby account to enable easy sign-in access from any Emby app without having to know the server ip address.",
     "ButtonLearnMoreAboutEmbyConnect": "L\u00e6r mere om Emby Connect",
     "LabelExternalPlayers": "Eksterne afspillere:",
diff --git a/dashboard-ui/strings/html/de.json b/dashboard-ui/strings/html/de.json
index 6720325214..cef575ba29 100644
--- a/dashboard-ui/strings/html/de.json
+++ b/dashboard-ui/strings/html/de.json
@@ -1255,7 +1255,7 @@
     "LabelExtractChaptersDuringLibraryScan": "Erzeuge Kapitelbilder w\u00e4hrend des scannens der Bibliothek",
     "LabelExtractChaptersDuringLibraryScanHelp": "Fall aktiviert, werden Kapitelbilder w\u00e4hrend des Imports von Videos beim Bibliothekenscan erzeugt. Falls deaktiviert, werden die Kapitelbilder w\u00e4hrend einer eigens daf\u00fcr geplanten Aufgabe erstellt, was den regelm\u00e4\u00dfig Bibliothekenscan beschleunigt.",
     "LabelConnectGuestUserName": "Ihr Emby Benutzername oder Emailadresse:",
-    "LabelConnectUserName": "Emby Benutzername\/ Email-Adresse:",
+    "LabelConnectUserName": "Emby username or email address:",
     "LabelConnectUserNameHelp": "Verbinden Sie diesen lokalen Benutzer mit einem Online Emby Account um vereinfachten Zugriff von jedem Emby Programm zu erhalten, auch ohne die IP-Adresse des Servers zu kennen.",
     "ButtonLearnMoreAboutEmbyConnect": "Erfahren Sie mehr \u00fcber Emby Connect",
     "LabelExternalPlayers": "Externe Abspielger\u00e4te:",
diff --git a/dashboard-ui/strings/html/el.json b/dashboard-ui/strings/html/el.json
index 8769a7854f..db4829c03f 100644
--- a/dashboard-ui/strings/html/el.json
+++ b/dashboard-ui/strings/html/el.json
@@ -1255,7 +1255,7 @@
     "LabelExtractChaptersDuringLibraryScan": "Extract chapter images during the library scan",
     "LabelExtractChaptersDuringLibraryScanHelp": "If enabled, chapter images will be extracted when videos are imported during the library scan. If disabled they will be extracted during the chapter images scheduled task, allowing the regular library scan to complete faster.",
     "LabelConnectGuestUserName": "Their Emby username or email address:",
-    "LabelConnectUserName": "Emby username\/email:",
+    "LabelConnectUserName": "Emby username or email address:",
     "LabelConnectUserNameHelp": "Connect this local user to an online Emby account to enable easy sign-in access from any Emby app without having to know the server ip address.",
     "ButtonLearnMoreAboutEmbyConnect": "Learn more about Emby Connect",
     "LabelExternalPlayers": "External players:",
diff --git a/dashboard-ui/strings/html/en-GB.json b/dashboard-ui/strings/html/en-GB.json
index 3d35880830..89afde9c5c 100644
--- a/dashboard-ui/strings/html/en-GB.json
+++ b/dashboard-ui/strings/html/en-GB.json
@@ -1255,7 +1255,7 @@
     "LabelExtractChaptersDuringLibraryScan": "Extract chapter images during the library scan",
     "LabelExtractChaptersDuringLibraryScanHelp": "If enabled, chapter images will be extracted when videos are imported during the library scan. If disabled they will be extracted during the chapter images scheduled task, allowing the regular library scan to complete faster.",
     "LabelConnectGuestUserName": "Their Emby username or email address:",
-    "LabelConnectUserName": "Emby username\/email:",
+    "LabelConnectUserName": "Emby username or email address:",
     "LabelConnectUserNameHelp": "Connect this local user to an online Emby account to enable easy sign-in access from any Emby app without having to know the server ip address.",
     "ButtonLearnMoreAboutEmbyConnect": "Learn more about Emby Connect",
     "LabelExternalPlayers": "External players:",
diff --git a/dashboard-ui/strings/html/en-US.json b/dashboard-ui/strings/html/en-US.json
index 1d878737ec..500df296d9 100644
--- a/dashboard-ui/strings/html/en-US.json
+++ b/dashboard-ui/strings/html/en-US.json
@@ -1255,7 +1255,7 @@
     "LabelExtractChaptersDuringLibraryScan": "Extract chapter images during the library scan",
     "LabelExtractChaptersDuringLibraryScanHelp": "If enabled, chapter images will be extracted when videos are imported during the library scan. If disabled they will be extracted during the chapter images scheduled task, allowing the regular library scan to complete faster.",
     "LabelConnectGuestUserName": "Their Emby username or email address:",
-    "LabelConnectUserName": "Emby username\/email:",
+    "LabelConnectUserName": "Emby username or email address:",
     "LabelConnectUserNameHelp": "Connect this local user to an online Emby account to enable easy sign-in access from any Emby app without having to know the server ip address.",
     "ButtonLearnMoreAboutEmbyConnect": "Learn more about Emby Connect",
     "LabelExternalPlayers": "External players:",
diff --git a/dashboard-ui/strings/html/es-AR.json b/dashboard-ui/strings/html/es-AR.json
index fc7874c034..d6f661a2aa 100644
--- a/dashboard-ui/strings/html/es-AR.json
+++ b/dashboard-ui/strings/html/es-AR.json
@@ -1255,7 +1255,7 @@
     "LabelExtractChaptersDuringLibraryScan": "Extract chapter images during the library scan",
     "LabelExtractChaptersDuringLibraryScanHelp": "If enabled, chapter images will be extracted when videos are imported during the library scan. If disabled they will be extracted during the chapter images scheduled task, allowing the regular library scan to complete faster.",
     "LabelConnectGuestUserName": "Their Emby username or email address:",
-    "LabelConnectUserName": "Emby username\/email:",
+    "LabelConnectUserName": "Emby username or email address:",
     "LabelConnectUserNameHelp": "Connect this local user to an online Emby account to enable easy sign-in access from any Emby app without having to know the server ip address.",
     "ButtonLearnMoreAboutEmbyConnect": "Learn more about Emby Connect",
     "LabelExternalPlayers": "External players:",
diff --git a/dashboard-ui/strings/html/es-MX.json b/dashboard-ui/strings/html/es-MX.json
index 0240ca9f46..87096aa368 100644
--- a/dashboard-ui/strings/html/es-MX.json
+++ b/dashboard-ui/strings/html/es-MX.json
@@ -1255,7 +1255,7 @@
     "LabelExtractChaptersDuringLibraryScan": "Extraer im\u00e1genes de cap\u00edtulos durante la exploraci\u00f3n de la biblioteca",
     "LabelExtractChaptersDuringLibraryScanHelp": "Si se activa, las im\u00e1genes de cap\u00edtulos ser\u00e1n extra\u00eddas cuando los videos sean importados durante la exploraci\u00f3n de la biblioteca. Si se deshabilita, ser\u00e1n extra\u00eddas durante la ejecuci\u00f3n de la tarea programada de extracci\u00f3n de im\u00e1genes de cap\u00edtulos, permiti\u00e9ndo que la exploraci\u00f3n normal de la biblioteca se complete m\u00e1s r\u00e1pidamente.",
     "LabelConnectGuestUserName": "Su nombre de usuario Emby o correo electr\u00f3nico:",
-    "LabelConnectUserName": "Usuario de Emby\/correo electr\u00f3nico:",
+    "LabelConnectUserName": "Emby username or email address:",
     "LabelConnectUserNameHelp": "Conectar este usuario local a una cuenta Emby en l\u00ednea para facilitar el ingreso desde cualquier aplicaci\u00f3n Emby sin tener que conocer la direcci\u00f3n ip del servidor.",
     "ButtonLearnMoreAboutEmbyConnect": "Conocer mas acerca de Emby Connect",
     "LabelExternalPlayers": "Reproductores Externos:",
diff --git a/dashboard-ui/strings/html/es.json b/dashboard-ui/strings/html/es.json
index bcdea5c751..093f14d011 100644
--- a/dashboard-ui/strings/html/es.json
+++ b/dashboard-ui/strings/html/es.json
@@ -1255,7 +1255,7 @@
     "LabelExtractChaptersDuringLibraryScan": "Extract chapter images during the library scan",
     "LabelExtractChaptersDuringLibraryScanHelp": "If enabled, chapter images will be extracted when videos are imported during the library scan. If disabled they will be extracted during the chapter images scheduled task, allowing the regular library scan to complete faster.",
     "LabelConnectGuestUserName": "Their Emby username or email address:",
-    "LabelConnectUserName": "Emby username\/email:",
+    "LabelConnectUserName": "Emby username or email address:",
     "LabelConnectUserNameHelp": "Connect this local user to an online Emby account to enable easy sign-in access from any Emby app without having to know the server ip address.",
     "ButtonLearnMoreAboutEmbyConnect": "Learn more about Emby Connect",
     "LabelExternalPlayers": "External players:",
diff --git a/dashboard-ui/strings/html/fi.json b/dashboard-ui/strings/html/fi.json
index 85b2a91a7f..c7cc4db0f3 100644
--- a/dashboard-ui/strings/html/fi.json
+++ b/dashboard-ui/strings/html/fi.json
@@ -1255,7 +1255,7 @@
     "LabelExtractChaptersDuringLibraryScan": "Extract chapter images during the library scan",
     "LabelExtractChaptersDuringLibraryScanHelp": "If enabled, chapter images will be extracted when videos are imported during the library scan. If disabled they will be extracted during the chapter images scheduled task, allowing the regular library scan to complete faster.",
     "LabelConnectGuestUserName": "Their Emby username or email address:",
-    "LabelConnectUserName": "Emby username\/email:",
+    "LabelConnectUserName": "Emby username or email address:",
     "LabelConnectUserNameHelp": "Connect this local user to an online Emby account to enable easy sign-in access from any Emby app without having to know the server ip address.",
     "ButtonLearnMoreAboutEmbyConnect": "Learn more about Emby Connect",
     "LabelExternalPlayers": "External players:",
diff --git a/dashboard-ui/strings/html/fr.json b/dashboard-ui/strings/html/fr.json
index 9307f664ce..26d2a2f059 100644
--- a/dashboard-ui/strings/html/fr.json
+++ b/dashboard-ui/strings/html/fr.json
@@ -1255,7 +1255,7 @@
     "LabelExtractChaptersDuringLibraryScan": "Extraire les images des chapitres pendant le scan de la biblioth\u00e8que",
     "LabelExtractChaptersDuringLibraryScanHelp": "Si activ\u00e9, les images de chapitres seront extraites lors de l'importation de vid\u00e9os pendant le scan de la librairie. Sinon elles seront extraites pendant la t\u00e2che programm\u00e9e, permettant de terminer plus rapidement les scans r\u00e9guliers de la librairie.",
     "LabelConnectGuestUserName": "Nom d'utilisateur Emby ou adresse email de l'invit\u00e9 :",
-    "LabelConnectUserName": "Nom d'utilisateur Emby ou adresse email :",
+    "LabelConnectUserName": "Emby username or email address:",
     "LabelConnectUserNameHelp": "Connectez cet utilisateur local \u00e0 un compte Emby pour activer l'acc\u00e8s par code Easy Pin depuis n'importe quelle application Emby sans avoir \u00e0 conna\u00eetre l'adresse IP du serveur.",
     "ButtonLearnMoreAboutEmbyConnect": "Plus d'infos sur Emby Connect",
     "LabelExternalPlayers": "Lecteurs externes:",
diff --git a/dashboard-ui/strings/html/gsw.json b/dashboard-ui/strings/html/gsw.json
index 546a5d076e..befc96c027 100644
--- a/dashboard-ui/strings/html/gsw.json
+++ b/dashboard-ui/strings/html/gsw.json
@@ -1255,7 +1255,7 @@
     "LabelExtractChaptersDuringLibraryScan": "Extract chapter images during the library scan",
     "LabelExtractChaptersDuringLibraryScanHelp": "If enabled, chapter images will be extracted when videos are imported during the library scan. If disabled they will be extracted during the chapter images scheduled task, allowing the regular library scan to complete faster.",
     "LabelConnectGuestUserName": "Their Emby username or email address:",
-    "LabelConnectUserName": "Emby username\/email:",
+    "LabelConnectUserName": "Emby username or email address:",
     "LabelConnectUserNameHelp": "Connect this local user to an online Emby account to enable easy sign-in access from any Emby app without having to know the server ip address.",
     "ButtonLearnMoreAboutEmbyConnect": "Learn more about Emby Connect",
     "LabelExternalPlayers": "External players:",
diff --git a/dashboard-ui/strings/html/he.json b/dashboard-ui/strings/html/he.json
index b30efda4c6..b92ac78c2b 100644
--- a/dashboard-ui/strings/html/he.json
+++ b/dashboard-ui/strings/html/he.json
@@ -1255,7 +1255,7 @@
     "LabelExtractChaptersDuringLibraryScan": "Extract chapter images during the library scan",
     "LabelExtractChaptersDuringLibraryScanHelp": "If enabled, chapter images will be extracted when videos are imported during the library scan. If disabled they will be extracted during the chapter images scheduled task, allowing the regular library scan to complete faster.",
     "LabelConnectGuestUserName": "Their Emby username or email address:",
-    "LabelConnectUserName": "Emby username\/email:",
+    "LabelConnectUserName": "Emby username or email address:",
     "LabelConnectUserNameHelp": "Connect this local user to an online Emby account to enable easy sign-in access from any Emby app without having to know the server ip address.",
     "ButtonLearnMoreAboutEmbyConnect": "Learn more about Emby Connect",
     "LabelExternalPlayers": "External players:",
diff --git a/dashboard-ui/strings/html/hr.json b/dashboard-ui/strings/html/hr.json
index a6eda04e91..2efb3da77d 100644
--- a/dashboard-ui/strings/html/hr.json
+++ b/dashboard-ui/strings/html/hr.json
@@ -1255,7 +1255,7 @@
     "LabelExtractChaptersDuringLibraryScan": "Extract chapter images during the library scan",
     "LabelExtractChaptersDuringLibraryScanHelp": "If enabled, chapter images will be extracted when videos are imported during the library scan. If disabled they will be extracted during the chapter images scheduled task, allowing the regular library scan to complete faster.",
     "LabelConnectGuestUserName": "Their Emby username or email address:",
-    "LabelConnectUserName": "Emby username\/email:",
+    "LabelConnectUserName": "Emby username or email address:",
     "LabelConnectUserNameHelp": "Connect this local user to an online Emby account to enable easy sign-in access from any Emby app without having to know the server ip address.",
     "ButtonLearnMoreAboutEmbyConnect": "Learn more about Emby Connect",
     "LabelExternalPlayers": "External players:",
diff --git a/dashboard-ui/strings/html/hu.json b/dashboard-ui/strings/html/hu.json
index d60908b154..9655013afa 100644
--- a/dashboard-ui/strings/html/hu.json
+++ b/dashboard-ui/strings/html/hu.json
@@ -1255,7 +1255,7 @@
     "LabelExtractChaptersDuringLibraryScan": "Extract chapter images during the library scan",
     "LabelExtractChaptersDuringLibraryScanHelp": "If enabled, chapter images will be extracted when videos are imported during the library scan. If disabled they will be extracted during the chapter images scheduled task, allowing the regular library scan to complete faster.",
     "LabelConnectGuestUserName": "Their Emby username or email address:",
-    "LabelConnectUserName": "Emby username\/email:",
+    "LabelConnectUserName": "Emby username or email address:",
     "LabelConnectUserNameHelp": "Connect this local user to an online Emby account to enable easy sign-in access from any Emby app without having to know the server ip address.",
     "ButtonLearnMoreAboutEmbyConnect": "Learn more about Emby Connect",
     "LabelExternalPlayers": "External players:",
diff --git a/dashboard-ui/strings/html/id.json b/dashboard-ui/strings/html/id.json
index ac5aeff824..dcb988c1db 100644
--- a/dashboard-ui/strings/html/id.json
+++ b/dashboard-ui/strings/html/id.json
@@ -1255,7 +1255,7 @@
     "LabelExtractChaptersDuringLibraryScan": "Extract chapter images during the library scan",
     "LabelExtractChaptersDuringLibraryScanHelp": "If enabled, chapter images will be extracted when videos are imported during the library scan. If disabled they will be extracted during the chapter images scheduled task, allowing the regular library scan to complete faster.",
     "LabelConnectGuestUserName": "Their Emby username or email address:",
-    "LabelConnectUserName": "Emby username\/email:",
+    "LabelConnectUserName": "Emby username or email address:",
     "LabelConnectUserNameHelp": "Connect this local user to an online Emby account to enable easy sign-in access from any Emby app without having to know the server ip address.",
     "ButtonLearnMoreAboutEmbyConnect": "Learn more about Emby Connect",
     "LabelExternalPlayers": "External players:",
diff --git a/dashboard-ui/strings/html/it.json b/dashboard-ui/strings/html/it.json
index 434bd71154..7f5f5eca3d 100644
--- a/dashboard-ui/strings/html/it.json
+++ b/dashboard-ui/strings/html/it.json
@@ -1255,7 +1255,7 @@
     "LabelExtractChaptersDuringLibraryScan": "Estrarre immagini capitolo durante la scansione biblioteca",
     "LabelExtractChaptersDuringLibraryScanHelp": "Se abilitata, le immagini capitolo verranno estratti quando i video vengono importati durante la scansione della libreria. Se disabilitata verranno estratti durante le immagini dei capitoli programmati compito, permettendo la scansione biblioteca regolare per completare pi\u00f9 velocemente.",
     "LabelConnectGuestUserName": "Username di Emby o indirizzo email:",
-    "LabelConnectUserName": "Username\/email di Emby:",
+    "LabelConnectUserName": "Emby username or email address:",
     "LabelConnectUserNameHelp": "Collegare questo utente locale a un account online ricamato per consentire un facile segno-in di accesso da qualsiasi applicazione ricamato senza dover conoscere l'indirizzo IP del server",
     "ButtonLearnMoreAboutEmbyConnect": "Scopri di pi\u00f9 su Emby Connect",
     "LabelExternalPlayers": "Player esterni:",
diff --git a/dashboard-ui/strings/html/kk.json b/dashboard-ui/strings/html/kk.json
index 3005736608..7110fb0281 100644
--- a/dashboard-ui/strings/html/kk.json
+++ b/dashboard-ui/strings/html/kk.json
@@ -1,8 +1,8 @@
 {
     "HeaderTaskTriggers": "\u0422\u0430\u043f\u0441\u044b\u0440\u043c\u0430 \u0442\u0440\u0438\u0433\u0433\u0435\u0440\u043b\u0435\u0440\u0456",
-    "TabSmartMatches": "Smart Matches",
-    "LabelOrganizeSmartMatchOption": "In the future, organize all files into the selected series if the name contains",
-    "TabSmartMatchInfo": "Manage your smart matches that were added using the Auto-Organize correction dialog",
+    "TabSmartMatches": "\u0417\u0438\u044f\u0442\u0442\u044b \u0441\u04d9\u0439\u043a\u0435\u0441\u0442\u0435\u0440",
+    "LabelOrganizeSmartMatchOption": "\u0411\u043e\u043b\u0430\u0448\u0430\u049b\u0442\u0430, \u0442\u0430\u04a3\u0434\u0430\u043b\u0493\u0430\u043d \u0442\u0435\u043b\u0435\u0445\u0438\u043a\u0430\u044f\u043b\u0430\u0440 \u0456\u0448\u0456\u043d\u0434\u0435\u0433\u0456 \u0431\u0430\u0440\u043b\u044b\u049b \u0444\u0430\u0439\u043b\u0434\u0430\u0440 \u04b1\u0439\u044b\u043c\u0434\u0430\u0441\u0442\u044b\u0440\u044b\u043b\u0430\u0434\u044b, \u0435\u0433\u0435\u0440 \u0430\u0442\u0430\u0443\u0434\u0430 \u043c\u044b\u043d\u0430\u0443 \u0431\u0430\u0440 \u0431\u043e\u043b\u0441\u0430",
+    "TabSmartMatchInfo": "\u0410\u0432\u0442\u043e\u043c\u0430\u0442\u0442\u044b \u04b1\u0439\u044b\u043c\u0434\u0430\u0441\u0442\u044b\u0440\u0443 \u0442\u04af\u0437\u0435\u0442\u0443 \u0434\u0438\u0430\u043b\u043e\u0433\u044b\u043d \u043f\u0430\u0439\u0434\u0430\u043b\u0430\u043d\u044b\u043f \u04af\u0441\u0442\u0435\u043b\u0456\u043d\u0433\u0435\u043d \u0437\u0438\u044f\u0442\u0442\u044b \u0441\u04d9\u0439\u043a\u0435\u0441\u0442\u0435\u0440\u0434\u0456 \u0431\u0430\u0441\u049b\u0430\u0440\u0443",
     "LabelExit": "\u0428\u044b\u0493\u0443",
     "LabelVisitCommunity": "\u049a\u0430\u0443\u044b\u043c\u0434\u0430\u0441\u0442\u044b\u049b\u049b\u0430 \u0431\u0430\u0440\u0443",
     "LabelGithub": "GitHub \u0440\u0435\u043f\u043e\u0437\u0438\u0442\u043e\u0440\u0438\u0439\u0456",
@@ -140,7 +140,7 @@
     "LabelAudioLanguagePreference": "\u0414\u044b\u0431\u044b\u0441 \u0442\u0456\u043b\u0456\u043d\u0456\u04a3 \u0442\u0435\u04a3\u0448\u0435\u043b\u0456\u043c\u0456:",
     "LabelSubtitleLanguagePreference": "\u0421\u0443\u0431\u0442\u0438\u0442\u0440 \u0442\u0456\u043b\u0456\u043d\u0456\u04a3 \u0442\u0435\u04a3\u0448\u0435\u043b\u0456\u043c\u0456:",
     "OptionDefaultSubtitles": "\u04d8\u0434\u0435\u043f\u043a\u0456",
-    "OptionSmartSubtitles": "\u0421\u043c\u0430\u0440\u0442",
+    "OptionSmartSubtitles": "\u0417\u0438\u044f\u0442\u0442\u044b",
     "OptionSmartSubtitlesHelp": "\u0422\u0456\u043b \u0442\u0435\u04a3\u0448\u0435\u043b\u0456\u043c\u0456\u043d\u0435 \u0441\u04d9\u0439\u043a\u0435\u0441 \u043a\u0435\u043b\u0433\u0435\u043d \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u043b\u0435\u0440 \u0434\u044b\u0431\u044b\u0441 \u0448\u0435\u0442\u0435\u043b \u0442\u0456\u043b\u0456\u043d\u0434\u0435 \u0431\u043e\u043b\u0493\u0430\u043d\u0434\u0430 \u0436\u04af\u043a\u0442\u0435\u043b\u0435\u0434\u0456.",
     "OptionOnlyForcedSubtitles": "\u0422\u0435\u043a \u049b\u0430\u043d\u0430 \u043c\u04d9\u0436\u0431\u04af\u0440\u043b\u0456 \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u043b\u0435\u0440",
     "OptionAlwaysPlaySubtitles": "\u0421\u0443\u0431\u0442\u0438\u0442\u0440\u043b\u0435\u0440\u0434\u0456 \u04d9\u0440\u049b\u0430\u0448\u0430\u043d \u043e\u0439\u043d\u0430\u0442\u0443",
@@ -1255,7 +1255,7 @@
     "LabelExtractChaptersDuringLibraryScan": "\u0421\u0430\u0445\u043d\u0430 \u0441\u0443\u0440\u0435\u0442\u0442\u0435\u0440\u0456\u043d \u0442\u0430\u0441\u044b\u0493\u044b\u0448\u0445\u0430\u043d\u0430\u043d\u044b \u0441\u043a\u0430\u043d\u0435\u0440\u043b\u0435\u0443 \u043c\u0435\u0437\u0433\u0456\u043b\u0456\u043d\u0434\u0435 \u0448\u044b\u0493\u0430\u0440\u044b\u043f \u0430\u043b\u0443",
     "LabelExtractChaptersDuringLibraryScanHelp": "\u049a\u043e\u0441\u044b\u043b\u0493\u0430\u043d\u0434\u0430, \u0441\u0430\u0445\u043d\u0430 \u0441\u0443\u0440\u0435\u0442\u0442\u0435\u0440\u0456 \u0442\u0430\u0441\u044b\u0493\u044b\u0448\u0445\u0430\u043d\u0430\u043d\u044b \u0441\u043a\u0430\u043d\u0435\u0440\u043b\u0435\u0443 \u043c\u0435\u0437\u0433\u0456\u043b\u0456\u043d\u0434\u0435, \u0431\u0435\u0439\u043d\u0435\u043b\u0435\u0440 \u0441\u044b\u0440\u0442\u0442\u0430\u043d \u0430\u043b\u044b\u043d\u0493\u0430\u043d\u0434\u0430, \u0431\u04e9\u043b\u0456\u043d\u0456\u043f \u0430\u043b\u044b\u043d\u0430\u0434\u044b. \u0410\u0436\u044b\u0440\u0430\u0442\u044b\u043b\u0493\u0430\u043d\u0434\u0430, \u0431\u04b1\u043b\u0430\u0440 \u0441\u0430\u0445\u043d\u0430 \u0441\u0443\u0440\u0435\u0442\u0442\u0435\u0440\u0456\u043d\u0435 \u0436\u043e\u0441\u043f\u0430\u0440\u043b\u0430\u0493\u0430\u043d \u0442\u0430\u043f\u0441\u044b\u0440\u043c\u0430\u0441\u044b \u043c\u0435\u0437\u0433\u0456\u043b\u0456\u043d\u0434\u0435, \u0442\u04b1\u0440\u0430\u049b\u0442\u044b \u0442\u0430\u0441\u044b\u0493\u044b\u0448\u0445\u0430\u043d\u0430\u043d\u044b \u0441\u043a\u0430\u043d\u0435\u0440\u043b\u0435\u0443\u0456\u043d \u0436\u044b\u043b\u0434\u0430\u043c\u044b\u0440\u0430\u049b \u0430\u044f\u049b\u0442\u0430\u043b\u0443\u044b \u04b1\u0448\u0456\u043d \u0440\u04b1\u049b\u0441\u0430\u0442 \u0435\u0442\u0456\u043f, \u0431\u04e9\u043b\u0456\u043d\u0456\u043f \u0430\u043b\u044b\u043d\u0430\u0434\u044b.",
     "LabelConnectGuestUserName": "\u041e\u043d\u044b\u04a3 Emby \u043f\u0430\u0439\u0434\u0430\u043b\u0430\u043d\u0443\u0448\u044b \u0430\u0442\u044b \u043d\u0435\u043c\u0435\u0441\u0435 \u044d-\u043f\u043e\u0448\u0442\u0430 \u043c\u0435\u043a\u0435\u043d\u0436\u0430\u0439\u044b:",
-    "LabelConnectUserName": "Emby \u043f\u0430\u0439\u0434\u0430\u043b\u0430\u043d\u0443\u0448\u044b \u0430\u0442\u044b \/ \u044d-\u043f\u043e\u0448\u0442\u0430\u0441\u044b:",
+    "LabelConnectUserName": "Emby \u043f\u0430\u0439\u0434\u0430\u043b\u0430\u043d\u0443\u0448\u044b \u0430\u0442\u044b \u043d\u0435\u043c\u0435\u0441\u0435 \u044d-\u043f\u043e\u0448\u0442\u0430 \u043c\u0435\u043a\u0435\u043d\u0436\u0430\u0439\u044b:",
     "LabelConnectUserNameHelp": "\u0421\u0435\u0440\u0432\u0435\u0440\u0434\u0456\u04a3 IP \u043c\u0435\u043a\u0435\u043d\u0436\u0430\u0439\u044b\u043d \u0431\u0456\u043b\u043c\u0435\u0439 \u0442\u04b1\u0440\u044b\u043f \u04d9\u0440\u049b\u0430\u0439\u0441\u044b Emby \u049b\u043e\u043b\u0434\u0430\u043d\u0431\u0430\u0441\u044b\u043d\u0430\u043d \u043e\u04a3\u0430\u0439\u0442\u044b\u043b\u0493\u0430\u043d \u043a\u0456\u0440\u0443-\u049b\u0430\u0442\u044b\u043d\u0430\u0443\u0434\u044b \u049b\u043e\u0441\u0443 \u04af\u0448\u0456\u043d \u043e\u0441\u044b \u0436\u0435\u0440\u0433\u0456\u043b\u0456\u043a\u0442\u0456 \u043f\u0430\u0439\u0434\u0430\u043b\u0430\u043d\u0443\u0448\u044b\u043d\u044b \u0436\u0435\u043b\u0456\u043b\u0456\u043a Emby \u0442\u0456\u0440\u043a\u0435\u043b\u0433\u0456\u0441\u0456\u043d\u0435 \u0431\u0430\u0439\u043b\u0430\u043d\u044b\u0441\u0442\u044b\u0440\u044b\u04a3\u044b\u0437.",
     "ButtonLearnMoreAboutEmbyConnect": "Emby Connect \u0442\u0443\u0440\u0430\u043b\u044b \u043a\u04e9\u0431\u0456\u0440\u0435\u043a \u0431\u0456\u043b\u0443",
     "LabelExternalPlayers": "\u0421\u044b\u0440\u0442\u049b\u044b \u043e\u0439\u043d\u0430\u0442\u049b\u044b\u0448\u0442\u0430\u0440:",
@@ -1532,5 +1532,5 @@
     "HeaderNewRecording": "\u0416\u0430\u04a3\u0430 \u0436\u0430\u0437\u0443",
     "ButtonAdvanced": "\u041a\u0435\u04a3\u0435\u0439\u0442\u0456\u043b\u0433\u0435\u043d",
     "LabelCodecIntrosPath": "\u041a\u043e\u0434\u0435\u043a \u043a\u04e9\u0440\u043d\u0435\u0443\u043b\u0435\u0440 \u0436\u043e\u043b\u044b:",
-    "LabelCodecIntrosPathHelp": "\u0411\u0435\u0439\u043d\u0435 \u0444\u0430\u0439\u043b\u0434\u0430\u0440\u0434\u044b \u049b\u0430\u043c\u0442\u0438\u0442\u044b\u043d \u049b\u0430\u043b\u0442\u0430. \u0415\u0433\u0435\u0440 \u043a\u04e9\u0440\u043d\u0435\u0443 \u0431\u0435\u0439\u043d\u0435 \u0444\u0430\u0439\u043b\u044b\u043d\u044b\u04a3 \u0430\u0442\u0430\u0443\u044b \u0431\u0435\u0439\u043d\u0435 \u043a\u043e\u0434\u0435\u043a\u043a\u0435, \u0434\u044b\u0431\u044b\u0441 \u043a\u043e\u0434\u0435\u043a\u043a\u0435, \u043d\u0435\u043c\u0435\u0441\u0435 \u0434\u044b\u0431\u044b\u0441 \u043f\u0440\u043e\u0444\u0430\u0439\u043b\u044b\u043d\u0430 \u0441\u04d9\u0439\u043a\u0435\u0441 \u043a\u0435\u043b\u0435\u0442\u0456\u043d \u0431\u043e\u043b\u0441\u0430, \u043e\u043d\u0434\u0430 \u043e\u043b \u043d\u0435\u0433\u0456\u0437\u0433\u0456 \u0444\u0438\u043b\u044c\u043c \u0430\u043b\u0434\u044b\u043d\u0434\u0430 \u043e\u0439\u043d\u0430\u0442\u044b\u043b\u0430\u0434\u044b."
+    "LabelCodecIntrosPathHelp": "\u0411\u0435\u0439\u043d\u0435 \u0444\u0430\u0439\u043b\u0434\u0430\u0440\u0434\u044b \u049b\u0430\u043c\u0442\u0438\u0442\u044b\u043d \u049b\u0430\u043b\u0442\u0430. \u0415\u0433\u0435\u0440 \u043a\u04e9\u0440\u043d\u0435\u0443 \u0431\u0435\u0439\u043d\u0435 \u0444\u0430\u0439\u043b\u044b\u043d\u044b\u04a3 \u0430\u0442\u0430\u0443\u044b \u0431\u0435\u0439\u043d\u0435 \u043a\u043e\u0434\u0435\u043a\u043a\u0435, \u0434\u044b\u0431\u044b\u0441 \u043a\u043e\u0434\u0435\u043a\u043a\u0435, \u0434\u044b\u0431\u044b\u0441 \u043f\u0440\u043e\u0444\u0430\u0439\u043b\u044b\u043d\u0430 \u043d\u0435\u043c\u0435\u0441\u0435 \u0442\u0435\u0433\u043a\u0435 \u0441\u04d9\u0439\u043a\u0435\u0441 \u043a\u0435\u043b\u0435\u0442\u0456\u043d \u0431\u043e\u043b\u0441\u0430, \u043e\u043d\u0434\u0430 \u043e\u043b \u043d\u0435\u0433\u0456\u0437\u0433\u0456 \u0444\u0438\u043b\u044c\u043c \u0430\u043b\u0434\u044b\u043d\u0434\u0430 \u043e\u0439\u043d\u0430\u0442\u044b\u043b\u0430\u0434\u044b."
 }
\ No newline at end of file
diff --git a/dashboard-ui/strings/html/ko.json b/dashboard-ui/strings/html/ko.json
index f17972c860..bc378dcf41 100644
--- a/dashboard-ui/strings/html/ko.json
+++ b/dashboard-ui/strings/html/ko.json
@@ -1255,7 +1255,7 @@
     "LabelExtractChaptersDuringLibraryScan": "\ub77c\uc774\ube0c\ub7ec\ub9ac\ub97c \uac80\uc0c9\ud560 \ub54c \ucc55\ud130 \uc774\ubbf8\uc9c0 \ucd94\ucd9c",
     "LabelExtractChaptersDuringLibraryScanHelp": "\uc774 \uc635\uc158\uc744 \ucf1c\uba74 \ub77c\uc774\ube0c\ub7ec\ub9ac\ub97c \uac80\uc0c9\ud558\uc5ec \ube44\ub514\uc624\ub97c \uac00\uc838\uc62c \ub54c \ucc55\ud130 \uc774\ubbf8\uc9c0\ub97c \ucd94\ucd9c\ud569\ub2c8\ub2e4. \uc635\uc158\uc744 \ub044\uba74 \uc608\uc57d \uc791\uc5c5\uc744 \ud1b5\ud574 \uc815\uae30\uc801\uc73c\ub85c \ub77c\uc774\ube0c\ub7ec\ub9ac\ub97c \uac80\uc0c9\ud560 \ub54c \ucd94\ucd9c\ud569\ub2c8\ub2e4.",
     "LabelConnectGuestUserName": "Their Emby username or email address:",
-    "LabelConnectUserName": "Emby \uc0ac\uc6a9\uc790\uba85\/\uc774\uba54\uc77c:",
+    "LabelConnectUserName": "Emby username or email address:",
     "LabelConnectUserNameHelp": "Connect this local user to an online Emby account to enable easy sign-in access from any Emby app without having to know the server ip address.",
     "ButtonLearnMoreAboutEmbyConnect": "Emby Connect\uc5d0 \ub300\ud574\uc11c \uc54c\uc544\ubcf4\uae30",
     "LabelExternalPlayers": "\uc678\ubd80 \uc7ac\uc0dd\uae30:",
diff --git a/dashboard-ui/strings/html/ms.json b/dashboard-ui/strings/html/ms.json
index 6aa5de3943..9247933051 100644
--- a/dashboard-ui/strings/html/ms.json
+++ b/dashboard-ui/strings/html/ms.json
@@ -1255,7 +1255,7 @@
     "LabelExtractChaptersDuringLibraryScan": "Extract chapter images during the library scan",
     "LabelExtractChaptersDuringLibraryScanHelp": "If enabled, chapter images will be extracted when videos are imported during the library scan. If disabled they will be extracted during the chapter images scheduled task, allowing the regular library scan to complete faster.",
     "LabelConnectGuestUserName": "Their Emby username or email address:",
-    "LabelConnectUserName": "Emby username\/email:",
+    "LabelConnectUserName": "Emby username or email address:",
     "LabelConnectUserNameHelp": "Connect this local user to an online Emby account to enable easy sign-in access from any Emby app without having to know the server ip address.",
     "ButtonLearnMoreAboutEmbyConnect": "Learn more about Emby Connect",
     "LabelExternalPlayers": "External players:",
diff --git a/dashboard-ui/strings/html/nb.json b/dashboard-ui/strings/html/nb.json
index f0fc8b70e4..299be28070 100644
--- a/dashboard-ui/strings/html/nb.json
+++ b/dashboard-ui/strings/html/nb.json
@@ -1255,7 +1255,7 @@
     "LabelExtractChaptersDuringLibraryScan": "Hent ut kapittel bilder under bibliotek skann",
     "LabelExtractChaptersDuringLibraryScanHelp": "Hvis aktivert, vil kapittel bilder bli hentet ut mens videoer importeres under bibliotek skanning.\nHvis deaktivert, vil de bli hentet ut under planlagte oppgaver for kapittel bilder, som medf\u00f8rer at vanlig bibliotek skanning blir fortere ferdig.",
     "LabelConnectGuestUserName": "Emby brukernavn eller epostadresse:",
-    "LabelConnectUserName": "Emby brukernavn\/epost",
+    "LabelConnectUserName": "Emby username or email address:",
     "LabelConnectUserNameHelp": "Connect this local user to an online Emby account to enable easy sign-in access from any Emby app without having to know the server ip address.",
     "ButtonLearnMoreAboutEmbyConnect": "L\u00e6r mer om Emby Connect",
     "LabelExternalPlayers": "Eksterne avspillere:",
diff --git a/dashboard-ui/strings/html/nl.json b/dashboard-ui/strings/html/nl.json
index ce29a3e737..6148e76e72 100644
--- a/dashboard-ui/strings/html/nl.json
+++ b/dashboard-ui/strings/html/nl.json
@@ -1255,7 +1255,7 @@
     "LabelExtractChaptersDuringLibraryScan": "Hoofdstuk afbeeldingen uitpakken tijdens het scannen van de bibliotheek",
     "LabelExtractChaptersDuringLibraryScanHelp": "Wanneer ingeschakeld worden hoofdstuk afbeeldingen uitgepakt wanneer video's worden ge\u00efmporteerd tijdens het scannen van de bibliotheek. Wanneer uitgeschakeld worden de hoofdstuk afbeeldingen uitgepakt tijdens de geplande taak \"Hoofdstukken uitpakken\", waardoor de standaard bibliotheek scan sneller voltooid is.",
     "LabelConnectGuestUserName": "Hun Emby gebruikersnaam of email adres:",
-    "LabelConnectUserName": "Emby gebruikersnaam\/email:",
+    "LabelConnectUserName": "Emby username or email address:",
     "LabelConnectUserNameHelp": "Verbind deze locale gebruiker aan een online Emby account om eenvoudig aanmelden vanaf elke Emby app toe te staan zonder dat u het IP-adres hoeft te weten.",
     "ButtonLearnMoreAboutEmbyConnect": "Leer meer over Emby Connect",
     "LabelExternalPlayers": "Externe spelers:",
diff --git a/dashboard-ui/strings/html/pl.json b/dashboard-ui/strings/html/pl.json
index 252985e7fd..b904d9fc99 100644
--- a/dashboard-ui/strings/html/pl.json
+++ b/dashboard-ui/strings/html/pl.json
@@ -1255,7 +1255,7 @@
     "LabelExtractChaptersDuringLibraryScan": "Wydobywaj obrazy rozdzia\u0142\u00f3w podczas skanowania biblioteki",
     "LabelExtractChaptersDuringLibraryScanHelp": "Je\u017celi w\u0142\u0105czone, obrazy rozdzia\u0142\u00f3w b\u0119d\u0105 wydobywane gdy widea s\u0105 importowane podczas skanowania biblioteki. Je\u017celi wy\u0142\u0105czone b\u0119d\u0105 one wydobywane podczas z zaplanowanego zadania obraz\u00f3w rozdzia\u0142\u00f3w, pozwalaj\u0105c aby zwyk\u0142e skanowanie biblioteki wykona\u0142o si\u0119 szybciej.",
     "LabelConnectGuestUserName": "Ich nazwa u\u017cytkownika Emby lub adres email:",
-    "LabelConnectUserName": "Nazwa u\u017cytkownika\/email Emby:",
+    "LabelConnectUserName": "Emby username or email address:",
     "LabelConnectUserNameHelp": "Po\u0142\u0105cz tego u\u017cytkownika z kontem Emby aby umo\u017cliwi\u0107 \u0142atwy dost\u0119p z ka\u017cdej aplikacji Emby, bez potrzeby wpisywania adresu IP serwera.",
     "ButtonLearnMoreAboutEmbyConnect": "Dowiedz si\u0119 wi\u0119cej o Emby Connect",
     "LabelExternalPlayers": "Zewn\u0119trzne odtwarzacze:",
diff --git a/dashboard-ui/strings/html/pt-BR.json b/dashboard-ui/strings/html/pt-BR.json
index 020478a3ee..7325208263 100644
--- a/dashboard-ui/strings/html/pt-BR.json
+++ b/dashboard-ui/strings/html/pt-BR.json
@@ -1255,7 +1255,7 @@
     "LabelExtractChaptersDuringLibraryScan": "Extrair imagens dos cap\u00edtulos durante o rastreamento da biblioteca",
     "LabelExtractChaptersDuringLibraryScanHelp": "Se ativado, as imagens dos cap\u00edtulos ser\u00e3o extra\u00eddas quando os v\u00eddeos forem importados durante o rastreamento da biblioteca. Se desativado, elas ser\u00e3o extra\u00eddas durante a tarefa agendada de imagens dos cap\u00edtulos, permitindo que a tarefa de rastreamento da biblioteca seja mais r\u00e1pida.",
     "LabelConnectGuestUserName": "Seu nome de usu\u00e1rio ou endere\u00e7o de email no Emby:",
-    "LabelConnectUserName": "Nome de usu\u00e1rio\/email no Emby:",
+    "LabelConnectUserName": "Emby username or email address:",
     "LabelConnectUserNameHelp": "Conecte este usu\u00e1rio local a uma conta Emby online para ativar o acesso f\u00e1cil de qualquer app do Emby sem ter que saber o endere\u00e7o ip do servidor.",
     "ButtonLearnMoreAboutEmbyConnect": "Saiba mais sobre o Emby Connect",
     "LabelExternalPlayers": "Reprodutores externos:",
@@ -1532,5 +1532,5 @@
     "HeaderNewRecording": "Nova Grava\u00e7\u00e3o",
     "ButtonAdvanced": "Avan\u00e7ado",
     "LabelCodecIntrosPath": "Caminho dos codecs das introdu\u00e7\u00f5es:",
-    "LabelCodecIntrosPathHelp": "Uma pasta contendo arquivos de v\u00eddeo. Se um nome de arquivo de v\u00eddeo de introdu\u00e7\u00e3o bater com o codec de v\u00eddeo, codec de \u00e1udio ou perfil de \u00e1udio, ser\u00e1 reproduzido antes do filme principal."
+    "LabelCodecIntrosPathHelp": "A folder containing video files. If an intro video file name matches the video codec, audio codec, audio profile, or a tag, then it will be played prior to the main feature."
 }
\ No newline at end of file
diff --git a/dashboard-ui/strings/html/pt-PT.json b/dashboard-ui/strings/html/pt-PT.json
index 3b741deff3..841132aee6 100644
--- a/dashboard-ui/strings/html/pt-PT.json
+++ b/dashboard-ui/strings/html/pt-PT.json
@@ -1255,7 +1255,7 @@
     "LabelExtractChaptersDuringLibraryScan": "Extract chapter images during the library scan",
     "LabelExtractChaptersDuringLibraryScanHelp": "If enabled, chapter images will be extracted when videos are imported during the library scan. If disabled they will be extracted during the chapter images scheduled task, allowing the regular library scan to complete faster.",
     "LabelConnectGuestUserName": "Their Emby username or email address:",
-    "LabelConnectUserName": "Emby username\/email:",
+    "LabelConnectUserName": "Emby username or email address:",
     "LabelConnectUserNameHelp": "Connect this local user to an online Emby account to enable easy sign-in access from any Emby app without having to know the server ip address.",
     "ButtonLearnMoreAboutEmbyConnect": "Saiba mais sobre o Emby Connect",
     "LabelExternalPlayers": "External players:",
diff --git a/dashboard-ui/strings/html/ro.json b/dashboard-ui/strings/html/ro.json
index 2d9f9cfa47..07a520c79b 100644
--- a/dashboard-ui/strings/html/ro.json
+++ b/dashboard-ui/strings/html/ro.json
@@ -1255,7 +1255,7 @@
     "LabelExtractChaptersDuringLibraryScan": "Extract chapter images during the library scan",
     "LabelExtractChaptersDuringLibraryScanHelp": "If enabled, chapter images will be extracted when videos are imported during the library scan. If disabled they will be extracted during the chapter images scheduled task, allowing the regular library scan to complete faster.",
     "LabelConnectGuestUserName": "Their Emby username or email address:",
-    "LabelConnectUserName": "Emby username\/email:",
+    "LabelConnectUserName": "Emby username or email address:",
     "LabelConnectUserNameHelp": "Connect this local user to an online Emby account to enable easy sign-in access from any Emby app without having to know the server ip address.",
     "ButtonLearnMoreAboutEmbyConnect": "Learn more about Emby Connect",
     "LabelExternalPlayers": "External players:",
diff --git a/dashboard-ui/strings/html/ru.json b/dashboard-ui/strings/html/ru.json
index f1fb7e5064..3f8d7453a7 100644
--- a/dashboard-ui/strings/html/ru.json
+++ b/dashboard-ui/strings/html/ru.json
@@ -1,8 +1,8 @@
 {
     "HeaderTaskTriggers": "\u0422\u0440\u0438\u0433\u0433\u0435\u0440\u044b \u0437\u0430\u0434\u0430\u0447\u0438",
-    "TabSmartMatches": "Smart Matches",
-    "LabelOrganizeSmartMatchOption": "In the future, organize all files into the selected series if the name contains",
-    "TabSmartMatchInfo": "Manage your smart matches that were added using the Auto-Organize correction dialog",
+    "TabSmartMatches": "\u0418\u043d\u0442\u0435\u043b\u043b\u0435\u043a\u0442\u0443\u0430\u043b\u044c\u043d\u044b\u0435 \u0441\u043e\u043e\u0442\u0432\u0435\u0442\u0441\u0442\u0432\u0438\u044f",
+    "LabelOrganizeSmartMatchOption": "\u0412 \u0431\u0443\u0434\u0443\u0449\u0435\u043c, \u0443\u043f\u043e\u0440\u044f\u0434\u043e\u0447\u0438\u0442\u044c \u0432\u0441\u0435 \u0444\u0430\u0439\u043b\u044b \u0432 \u0432\u044b\u0431\u0440\u0430\u043d\u043d\u044b\u0445 \u0441\u0435\u0440\u0438\u0430\u043b\u0430\u0445, \u0435\u0441\u043b\u0438 \u043d\u0430\u0437\u0432\u0430\u043d\u0438\u0435 \u0441\u043e\u0434\u0435\u0440\u0436\u0438\u0442 \u0441\u043e\u0434\u0435\u0440\u0436\u0438\u0442",
+    "TabSmartMatchInfo": "\u0423\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u0435 \u0432\u0430\u0448\u0438\u043c\u0438 \u0438\u043d\u0442\u0435\u043b\u043b\u0435\u043a\u0442\u0443\u0430\u043b\u044c\u043d\u044b\u043c\u0438 \u0441\u043e\u043e\u0442\u0432\u0435\u0442\u0441\u0442\u0432\u0438\u044f\u043c\u0438, \u043a\u043e\u0442\u043e\u0440\u044b\u0435 \u0431\u044b\u043b\u0438 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u044b \u0441 \u043f\u043e\u043c\u043e\u0449\u044c\u044e \u0434\u0438\u0430\u043b\u043e\u0433\u0430 \u043a\u043e\u0440\u0440\u0435\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u044f \u0432 \u0410\u0432\u0442\u043e\u043f\u043e\u0440\u044f\u0434\u043a\u0435",
     "LabelExit": "\u0412\u044b\u0445\u043e\u0434",
     "LabelVisitCommunity": "\u041f\u043e\u0441\u0435\u0449\u0435\u043d\u0438\u0435 \u0421\u043e\u043e\u0431\u0449\u0435\u0441\u0442\u0432\u0430",
     "LabelGithub": "GitHub",
@@ -1255,7 +1255,7 @@
     "LabelExtractChaptersDuringLibraryScan": "\u0418\u0437\u0432\u043b\u0435\u043a\u0430\u0442\u044c \u0440\u0438\u0441\u0443\u043d\u043a\u0438 \u0441\u0446\u0435\u043d \u0432 \u043f\u0440\u043e\u0446\u0435\u0441\u0441\u0435 \u0441\u043a\u0430\u043d\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u044f \u043c\u0435\u0434\u0438\u0430\u0442\u0435\u043a\u0438",
     "LabelExtractChaptersDuringLibraryScanHelp": "\u041f\u0440\u0438 \u0432\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0438, \u0440\u0438\u0441\u0443\u043d\u043a\u0438 \u0441\u0446\u0435\u043d \u0431\u0443\u0434\u0443\u0442 \u0438\u0437\u0432\u043b\u0435\u0447\u0435\u043d\u044b, \u043a\u043e\u0433\u0434\u0430 \u0432\u0438\u0434\u0435\u043e \u0438\u043c\u043f\u043e\u0440\u0442\u0438\u0440\u0443\u0435\u0442\u0441\u044f \u0432 \u043f\u0440\u043e\u0446\u0435\u0441\u0441\u0435 \u0441\u043a\u0430\u043d\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u044f \u043c\u0435\u0434\u0438\u0430\u0442\u0435\u043a\u0438. \u041f\u0440\u0438 \u0432\u044b\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0438, \u043e\u043d\u0438 \u0431\u0443\u0434\u0443\u0442 \u0438\u0437\u0432\u043b\u0435\u0447\u0435\u043d\u044b \u0432 \u043f\u0440\u043e\u0446\u0435\u0441\u0441\u0435 \u043d\u0430\u0437\u043d\u0430\u0447\u0435\u043d\u043d\u043e\u0439 \u0437\u0430\u0434\u0430\u0447\u0438 \u00ab\u0420\u0438\u0441\u0443\u043d\u043a\u0438 \u0441\u0446\u0435\u043d\u00bb, \u043f\u043e\u0437\u0432\u043e\u043b\u044f\u044f \u0440\u0435\u0433\u0443\u043b\u044f\u0440\u043d\u043e\u043c\u0443 \u0441\u043a\u0430\u043d\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u044e \u043c\u0435\u0434\u0438\u0430\u0442\u0435\u043a\u0438 \u0437\u0430\u0432\u0435\u0440\u0448\u0430\u0442\u044c\u0441\u044f \u0431\u044b\u0441\u0442\u0440\u0435\u0435.",
     "LabelConnectGuestUserName": "\u0418\u043c\u044f \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f Emby \u0438\u043b\u0438 \u0430\u0434\u0440\u0435\u0441 \u044d-\u043f\u043e\u0447\u0442\u044b:",
-    "LabelConnectUserName": "\u0418\u043c\u044f \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f Emby \/ \u044d-\u043f\u043e\u0447\u0442\u0430:",
+    "LabelConnectUserName": "\u0418\u043c\u044f \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f Emby \u0438\u043b\u0438 \u0430\u0434\u0440\u0435\u0441 \u044d-\u043f\u043e\u0447\u0442\u044b:",
     "LabelConnectUserNameHelp": "\u0421\u043e\u0435\u0434\u0438\u043d\u044f\u0435\u0442 \u044d\u0442\u043e\u0433\u043e \u043b\u043e\u043a\u0430\u043b\u044c\u043d\u043e\u0433\u043e \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f c \u0441\u0435\u0442\u0435\u0432\u043e\u0439 \u0443\u0447\u0451\u0442\u043d\u043e\u0439 \u0437\u0430\u043f\u0438\u0441\u044c\u044e Emby, \u0447\u0442\u043e\u0431\u044b \u0432\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u0434\u043e\u0441\u0442\u0443\u043f \u0441 \u0443\u043f\u0440\u043e\u0449\u0451\u043d\u043d\u044b\u043c \u0432\u0445\u043e\u0434\u043e\u043c \u0438\u0437 \u043b\u044e\u0431\u043e\u0433\u043e Emby-\u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u044f, \u043d\u0435 \u0437\u043d\u0430\u044f IP-\u0430\u0434\u0440\u0435\u0441 \u0441\u0435\u0440\u0432\u0435\u0440\u0430.",
     "ButtonLearnMoreAboutEmbyConnect": "\u0423\u0437\u043d\u0430\u0442\u044c \u0431\u043e\u043b\u044c\u0448\u0435 \u043e\u0431 Emby Connect",
     "LabelExternalPlayers": "\u0412\u043d\u0435\u0448\u043d\u0438\u0435 \u043f\u0440\u043e\u0438\u0433\u0440\u044b\u0432\u0430\u0442\u0435\u043b\u0438:",
@@ -1532,5 +1532,5 @@
     "HeaderNewRecording": "\u041d\u043e\u0432\u0430\u044f \u0437\u0430\u043f\u0438\u0441\u044c",
     "ButtonAdvanced": "\u0420\u0430\u0441\u0448\u0438\u0440\u0435\u043d\u043d\u043e\u0435",
     "LabelCodecIntrosPath": "\u041f\u0443\u0442\u044c \u043a \u0437\u0430\u0441\u0442\u0430\u0432\u043a\u0430\u043c \u043a\u043e\u0434\u0435\u043a\u0430:",
-    "LabelCodecIntrosPathHelp": "\u041f\u0430\u043f\u043a\u0430, \u0441\u043e\u0434\u0435\u0440\u0436\u0430\u0449\u0430\u044f \u0432\u0438\u0434\u0435\u043e\u0444\u0430\u0439\u043b\u044b. \u0415\u0441\u043b\u0438 \u0438\u043c\u044f \u0432\u0438\u0434\u0435\u043e\u0444\u0430\u0439\u043b\u0430 \u0437\u0430\u0441\u0442\u0430\u0432\u043a\u0438 \u0441\u043e\u043e\u0442\u0432\u0435\u0442\u0441\u0442\u0432\u0443\u0435\u0442 \u0432\u0438\u0434\u0435\u043e\u043a\u043e\u0434\u0435\u043a\u0443, \u0430\u0443\u0434\u0438\u043e\u043a\u043e\u0434\u0435\u043a\u0443 \u0438\u043b\u0438  \u0430\u0443\u0434\u0438\u043e\u043f\u0440\u043e\u0444\u0438\u043b\u044e, \u0442\u043e \u043e\u043d\u0430 \u0431\u0443\u0434\u0435\u0442 \u0432\u043e\u0441\u043f\u0440\u043e\u0438\u0437\u0432\u043e\u0434\u0438\u0442\u044c\u0441\u044f \u043f\u0435\u0440\u0435\u0434 \u043e\u0441\u043d\u043e\u0432\u043d\u044b\u043c \u0444\u0438\u043b\u044c\u043c\u043e\u043c."
+    "LabelCodecIntrosPathHelp": "\u041f\u0430\u043f\u043a\u0430, \u0441\u043e\u0434\u0435\u0440\u0436\u0430\u0449\u0430\u044f \u0432\u0438\u0434\u0435\u043e\u0444\u0430\u0439\u043b\u044b. \u0415\u0441\u043b\u0438 \u0438\u043c\u044f \u0432\u0438\u0434\u0435\u043e\u0444\u0430\u0439\u043b\u0430 \u0437\u0430\u0441\u0442\u0430\u0432\u043a\u0438 \u0441\u043e\u043e\u0442\u0432\u0435\u0442\u0441\u0442\u0432\u0443\u0435\u0442 \u0432\u0438\u0434\u0435\u043e\u043a\u043e\u0434\u0435\u043a\u0443, \u0430\u0443\u0434\u0438\u043e\u043a\u043e\u0434\u0435\u043a\u0443, \u0430\u0443\u0434\u0438\u043e\u043f\u0440\u043e\u0444\u0438\u043b\u044e \u0438\u043b\u0438 \u0442\u0435\u0433\u0443, \u0442\u043e \u043e\u043d\u0430 \u0431\u0443\u0434\u0435\u0442 \u0432\u043e\u0441\u043f\u0440\u043e\u0438\u0437\u0432\u043e\u0434\u0438\u0442\u044c\u0441\u044f \u043f\u0435\u0440\u0435\u0434 \u043e\u0441\u043d\u043e\u0432\u043d\u044b\u043c \u0444\u0438\u043b\u044c\u043c\u043e\u043c."
 }
\ No newline at end of file
diff --git a/dashboard-ui/strings/html/sl-SI.json b/dashboard-ui/strings/html/sl-SI.json
index bfff6bdad5..e986bc2f32 100644
--- a/dashboard-ui/strings/html/sl-SI.json
+++ b/dashboard-ui/strings/html/sl-SI.json
@@ -1255,7 +1255,7 @@
     "LabelExtractChaptersDuringLibraryScan": "Extract chapter images during the library scan",
     "LabelExtractChaptersDuringLibraryScanHelp": "If enabled, chapter images will be extracted when videos are imported during the library scan. If disabled they will be extracted during the chapter images scheduled task, allowing the regular library scan to complete faster.",
     "LabelConnectGuestUserName": "Their Emby username or email address:",
-    "LabelConnectUserName": "Emby username\/email:",
+    "LabelConnectUserName": "Emby username or email address:",
     "LabelConnectUserNameHelp": "Connect this local user to an online Emby account to enable easy sign-in access from any Emby app without having to know the server ip address.",
     "ButtonLearnMoreAboutEmbyConnect": "Learn more about Emby Connect",
     "LabelExternalPlayers": "External players:",
diff --git a/dashboard-ui/strings/html/sv.json b/dashboard-ui/strings/html/sv.json
index 707d93c41d..69d36d7596 100644
--- a/dashboard-ui/strings/html/sv.json
+++ b/dashboard-ui/strings/html/sv.json
@@ -1255,7 +1255,7 @@
     "LabelExtractChaptersDuringLibraryScan": "Extrahera kapitelbildrutor vid genoms\u00f6kning av biblioteket",
     "LabelExtractChaptersDuringLibraryScanHelp": "Om aktiverat extraheras kapitelbildrutor n\u00e4r videor importeras vid genoms\u00f6kning av biblioteket. Om avaktiverat kommer extrahering att ske vid schemalagd kapitelbildrutebehandling, f\u00f6r att snabba upp den regelbundna genoms\u00f6kningen av biblioteket.",
     "LabelConnectGuestUserName": "Their Emby username or email address:",
-    "LabelConnectUserName": "Emby username\/email:",
+    "LabelConnectUserName": "Emby username or email address:",
     "LabelConnectUserNameHelp": "Connect this local user to an online Emby account to enable easy sign-in access from any Emby app without having to know the server ip address.",
     "ButtonLearnMoreAboutEmbyConnect": "Learn more about Emby Connect",
     "LabelExternalPlayers": "Externa uppspelare:",
diff --git a/dashboard-ui/strings/html/tr.json b/dashboard-ui/strings/html/tr.json
index 166616ab0b..bb0636634e 100644
--- a/dashboard-ui/strings/html/tr.json
+++ b/dashboard-ui/strings/html/tr.json
@@ -1255,7 +1255,7 @@
     "LabelExtractChaptersDuringLibraryScan": "Extract chapter images during the library scan",
     "LabelExtractChaptersDuringLibraryScanHelp": "If enabled, chapter images will be extracted when videos are imported during the library scan. If disabled they will be extracted during the chapter images scheduled task, allowing the regular library scan to complete faster.",
     "LabelConnectGuestUserName": "Their Emby username or email address:",
-    "LabelConnectUserName": "Emby username\/email:",
+    "LabelConnectUserName": "Emby username or email address:",
     "LabelConnectUserNameHelp": "Connect this local user to an online Emby account to enable easy sign-in access from any Emby app without having to know the server ip address.",
     "ButtonLearnMoreAboutEmbyConnect": "Learn more about Emby Connect",
     "LabelExternalPlayers": "External players:",
diff --git a/dashboard-ui/strings/html/uk.json b/dashboard-ui/strings/html/uk.json
index 21451bb761..22aa5039fb 100644
--- a/dashboard-ui/strings/html/uk.json
+++ b/dashboard-ui/strings/html/uk.json
@@ -1255,7 +1255,7 @@
     "LabelExtractChaptersDuringLibraryScan": "Extract chapter images during the library scan",
     "LabelExtractChaptersDuringLibraryScanHelp": "If enabled, chapter images will be extracted when videos are imported during the library scan. If disabled they will be extracted during the chapter images scheduled task, allowing the regular library scan to complete faster.",
     "LabelConnectGuestUserName": "Their Emby username or email address:",
-    "LabelConnectUserName": "Emby username\/email:",
+    "LabelConnectUserName": "Emby username or email address:",
     "LabelConnectUserNameHelp": "Connect this local user to an online Emby account to enable easy sign-in access from any Emby app without having to know the server ip address.",
     "ButtonLearnMoreAboutEmbyConnect": "Learn more about Emby Connect",
     "LabelExternalPlayers": "External players:",
diff --git a/dashboard-ui/strings/html/vi.json b/dashboard-ui/strings/html/vi.json
index 650872e5a0..a61d676341 100644
--- a/dashboard-ui/strings/html/vi.json
+++ b/dashboard-ui/strings/html/vi.json
@@ -1255,7 +1255,7 @@
     "LabelExtractChaptersDuringLibraryScan": "Extract chapter images during the library scan",
     "LabelExtractChaptersDuringLibraryScanHelp": "If enabled, chapter images will be extracted when videos are imported during the library scan. If disabled they will be extracted during the chapter images scheduled task, allowing the regular library scan to complete faster.",
     "LabelConnectGuestUserName": "Their Emby username or email address:",
-    "LabelConnectUserName": "Emby username\/email:",
+    "LabelConnectUserName": "Emby username or email address:",
     "LabelConnectUserNameHelp": "Connect this local user to an online Emby account to enable easy sign-in access from any Emby app without having to know the server ip address.",
     "ButtonLearnMoreAboutEmbyConnect": "Learn more about Emby Connect",
     "LabelExternalPlayers": "External players:",
diff --git a/dashboard-ui/strings/html/zh-CN.json b/dashboard-ui/strings/html/zh-CN.json
index 1b4cee113a..84d05a13c9 100644
--- a/dashboard-ui/strings/html/zh-CN.json
+++ b/dashboard-ui/strings/html/zh-CN.json
@@ -1255,7 +1255,7 @@
     "LabelExtractChaptersDuringLibraryScan": "\u5a92\u4f53\u5e93\u626b\u63cf\u8fc7\u7a0b\u4e2d\u89e3\u538b\u7ae0\u8282\u56fe\u7247",
     "LabelExtractChaptersDuringLibraryScanHelp": "\u5982\u679c\u542f\u7528\uff0c\u5f53\u5a92\u4f53\u5e93\u5bfc\u5165\u89c6\u9891\u5e76\u626b\u63cf\u65f6\uff0c\u5c06\u63d0\u53d6\u7ae0\u8282\u56fe\u50cf\u3002\u5982\u679c\u7981\u7528\uff0c\u7ae0\u8282\u56fe\u50cf\u5c06\u5728\u4e4b\u540e\u7684\u8ba1\u5212\u4efb\u52a1\u63d0\u53d6\uff0c\u800c\u5a92\u4f53\u5e93\u4f1a\u66f4\u5feb\u5b8c\u6210\u626b\u63cf\u3002",
     "LabelConnectGuestUserName": "Their Emby username or email address:",
-    "LabelConnectUserName": "Emby username\/email:",
+    "LabelConnectUserName": "Emby username or email address:",
     "LabelConnectUserNameHelp": "Connect this local user to an online Emby account to enable easy sign-in access from any Emby app without having to know the server ip address.",
     "ButtonLearnMoreAboutEmbyConnect": "Learn more about Emby Connect",
     "LabelExternalPlayers": "\u5916\u90e8\u64ad\u653e\u5668\uff1a",
diff --git a/dashboard-ui/strings/html/zh-HK.json b/dashboard-ui/strings/html/zh-HK.json
index c9f39005f2..ed8e34e089 100644
--- a/dashboard-ui/strings/html/zh-HK.json
+++ b/dashboard-ui/strings/html/zh-HK.json
@@ -1255,7 +1255,7 @@
     "LabelExtractChaptersDuringLibraryScan": "Extract chapter images during the library scan",
     "LabelExtractChaptersDuringLibraryScanHelp": "If enabled, chapter images will be extracted when videos are imported during the library scan. If disabled they will be extracted during the chapter images scheduled task, allowing the regular library scan to complete faster.",
     "LabelConnectGuestUserName": "Their Emby username or email address:",
-    "LabelConnectUserName": "Emby username\/email:",
+    "LabelConnectUserName": "Emby username or email address:",
     "LabelConnectUserNameHelp": "Connect this local user to an online Emby account to enable easy sign-in access from any Emby app without having to know the server ip address.",
     "ButtonLearnMoreAboutEmbyConnect": "Learn more about Emby Connect",
     "LabelExternalPlayers": "External players:",
diff --git a/dashboard-ui/strings/html/zh-TW.json b/dashboard-ui/strings/html/zh-TW.json
index 173329ca49..c44d3c1435 100644
--- a/dashboard-ui/strings/html/zh-TW.json
+++ b/dashboard-ui/strings/html/zh-TW.json
@@ -1255,7 +1255,7 @@
     "LabelExtractChaptersDuringLibraryScan": "Extract chapter images during the library scan",
     "LabelExtractChaptersDuringLibraryScanHelp": "If enabled, chapter images will be extracted when videos are imported during the library scan. If disabled they will be extracted during the chapter images scheduled task, allowing the regular library scan to complete faster.",
     "LabelConnectGuestUserName": "Their Emby username or email address:",
-    "LabelConnectUserName": "Emby username\/email:",
+    "LabelConnectUserName": "Emby username or email address:",
     "LabelConnectUserNameHelp": "Connect this local user to an online Emby account to enable easy sign-in access from any Emby app without having to know the server ip address.",
     "ButtonLearnMoreAboutEmbyConnect": "Learn more about Emby Connect",
     "LabelExternalPlayers": "External players:",
diff --git a/dashboard-ui/strings/javascript/ar.json b/dashboard-ui/strings/javascript/ar.json
index c4e92ca6b4..abd2d6013c 100644
--- a/dashboard-ui/strings/javascript/ar.json
+++ b/dashboard-ui/strings/javascript/ar.json
@@ -129,7 +129,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/strings/javascript/bg-BG.json b/dashboard-ui/strings/javascript/bg-BG.json
index 94cf235252..02a4dfbfc5 100644
--- a/dashboard-ui/strings/javascript/bg-BG.json
+++ b/dashboard-ui/strings/javascript/bg-BG.json
@@ -129,7 +129,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/strings/javascript/ca.json b/dashboard-ui/strings/javascript/ca.json
index 9b9733f442..1b910b9426 100644
--- a/dashboard-ui/strings/javascript/ca.json
+++ b/dashboard-ui/strings/javascript/ca.json
@@ -129,7 +129,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/strings/javascript/cs.json b/dashboard-ui/strings/javascript/cs.json
index 4f15c036c9..954026acc6 100644
--- a/dashboard-ui/strings/javascript/cs.json
+++ b/dashboard-ui/strings/javascript/cs.json
@@ -129,7 +129,6 @@
     "LabelAbortedByServerShutdown": "(P\u0159eru\u0161eno p\u0159i vypnut\u00ed serveru)",
     "LabelScheduledTaskLastRan": "Posledn\u00ed spu\u0161t\u011bn\u00ed {0}, zabralo {1}.",
     "HeaderDeleteTaskTrigger": "Zru\u0161it spu\u0161t\u011bn\u00ed \u00falohy",
-    "HeaderTaskTriggers": "Spou\u0161t\u011b\u010de \u00faloh",
     "MessageDeleteTaskTrigger": "Opravdu si p\u0159ejete odebrat spou\u0161t\u011bn\u00ed \u00falohy?",
     "MessageNoPluginsInstalled": "Nem\u00e1te instalov\u00e1ny \u017e\u00e1dn\u00e9 z\u00e1suvn\u00e9 moduly.",
     "LabelVersionInstalled": "{0} instalov\u00e1no",
diff --git a/dashboard-ui/strings/javascript/da.json b/dashboard-ui/strings/javascript/da.json
index fcda08ee3c..78b7ff928f 100644
--- a/dashboard-ui/strings/javascript/da.json
+++ b/dashboard-ui/strings/javascript/da.json
@@ -129,7 +129,6 @@
     "LabelAbortedByServerShutdown": "(Annulleret grundet server nedlukning)",
     "LabelScheduledTaskLastRan": "Sidst k\u00f8rt {0}, og tog {1}.",
     "HeaderDeleteTaskTrigger": "Slet Task Trigger",
-    "HeaderTaskTriggers": "Task Triggers",
     "MessageDeleteTaskTrigger": "Er du sikker p\u00e5 du \u00f8nsker at slette denne task trigger?",
     "MessageNoPluginsInstalled": "Du har ingen plugins installeret.",
     "LabelVersionInstalled": "{0} installeret",
diff --git a/dashboard-ui/strings/javascript/de.json b/dashboard-ui/strings/javascript/de.json
index c1006b98dd..a1eb006b5c 100644
--- a/dashboard-ui/strings/javascript/de.json
+++ b/dashboard-ui/strings/javascript/de.json
@@ -129,7 +129,6 @@
     "LabelAbortedByServerShutdown": "(Durch herunterfahrenden Server abgebrochen)",
     "LabelScheduledTaskLastRan": "Zuletzt ausgef\u00fchrt vor: {0}. Ben\u00f6tigte Zeit: {1}.",
     "HeaderDeleteTaskTrigger": "Entferne Aufgabenausl\u00f6ser",
-    "HeaderTaskTriggers": "Aufgabenausl\u00f6ser",
     "MessageDeleteTaskTrigger": "Bist du dir sicher, dass du diesen Aufgabenausl\u00f6ser entfernen m\u00f6chtest?",
     "MessageNoPluginsInstalled": "Du hast keine Plugins installiert.",
     "LabelVersionInstalled": "{0} installiert",
diff --git a/dashboard-ui/strings/javascript/el.json b/dashboard-ui/strings/javascript/el.json
index 1c43b54a4c..bf76540fe3 100644
--- a/dashboard-ui/strings/javascript/el.json
+++ b/dashboard-ui/strings/javascript/el.json
@@ -129,7 +129,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/strings/javascript/en-GB.json b/dashboard-ui/strings/javascript/en-GB.json
index 29cf04be35..73efd269ea 100644
--- a/dashboard-ui/strings/javascript/en-GB.json
+++ b/dashboard-ui/strings/javascript/en-GB.json
@@ -129,7 +129,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/strings/javascript/en-US.json b/dashboard-ui/strings/javascript/en-US.json
index 0c0db199e9..639cc0fa7d 100644
--- a/dashboard-ui/strings/javascript/en-US.json
+++ b/dashboard-ui/strings/javascript/en-US.json
@@ -129,7 +129,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/strings/javascript/es-AR.json b/dashboard-ui/strings/javascript/es-AR.json
index 352ca8045c..232b696e1f 100644
--- a/dashboard-ui/strings/javascript/es-AR.json
+++ b/dashboard-ui/strings/javascript/es-AR.json
@@ -129,7 +129,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/strings/javascript/es-MX.json b/dashboard-ui/strings/javascript/es-MX.json
index 1f8b854419..3792e40494 100644
--- a/dashboard-ui/strings/javascript/es-MX.json
+++ b/dashboard-ui/strings/javascript/es-MX.json
@@ -129,7 +129,6 @@
     "LabelAbortedByServerShutdown": "(Abortada por apagado del servidor)",
     "LabelScheduledTaskLastRan": "Ejecutado hace {0}, tomando {1}.",
     "HeaderDeleteTaskTrigger": "Borrar Disparador de Tarea",
-    "HeaderTaskTriggers": "Disparadores de Tarea",
     "MessageDeleteTaskTrigger": "\u00bfEst\u00e1 seguro de querer eliminar este disparador de tarea?",
     "MessageNoPluginsInstalled": "No tienes extensiones instaladas.",
     "LabelVersionInstalled": "{0} instalado",
diff --git a/dashboard-ui/strings/javascript/es.json b/dashboard-ui/strings/javascript/es.json
index aeafc35544..fb087ca5fe 100644
--- a/dashboard-ui/strings/javascript/es.json
+++ b/dashboard-ui/strings/javascript/es.json
@@ -129,7 +129,6 @@
     "LabelAbortedByServerShutdown": "(Abortado por cierre del servidor)",
     "LabelScheduledTaskLastRan": "\u00daltima ejecuci\u00f3n {0}, teniendo {1}.",
     "HeaderDeleteTaskTrigger": "Eliminar tarea de activaci\u00f3n",
-    "HeaderTaskTriggers": "Tareas de activaci\u00f3n",
     "MessageDeleteTaskTrigger": "\u00bfEst\u00e1 seguro que desea eliminar esta tarea de activaci\u00f3n?",
     "MessageNoPluginsInstalled": "No tiene plugins instalados.",
     "LabelVersionInstalled": "{0} instalado",
diff --git a/dashboard-ui/strings/javascript/fi.json b/dashboard-ui/strings/javascript/fi.json
index e4ab6ce9a8..276cef52c2 100644
--- a/dashboard-ui/strings/javascript/fi.json
+++ b/dashboard-ui/strings/javascript/fi.json
@@ -129,7 +129,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/strings/javascript/fr.json b/dashboard-ui/strings/javascript/fr.json
index 34c0744b85..826e022059 100644
--- a/dashboard-ui/strings/javascript/fr.json
+++ b/dashboard-ui/strings/javascript/fr.json
@@ -129,7 +129,6 @@
     "LabelAbortedByServerShutdown": "(Annul\u00e9 par fermeture du serveur)",
     "LabelScheduledTaskLastRan": "Derni\u00e8re ex\u00e9cution {0}, dur\u00e9e {1}.",
     "HeaderDeleteTaskTrigger": "Supprimer le d\u00e9clencheur de t\u00e2che",
-    "HeaderTaskTriggers": "D\u00e9clencheurs de t\u00e2ches",
     "MessageDeleteTaskTrigger": "\u00cates-vous s\u00fbr de vouloir supprimer ce d\u00e9clencheur de t\u00e2che?",
     "MessageNoPluginsInstalled": "Vous n'avez aucun plugin install\u00e9.",
     "LabelVersionInstalled": "{0} install\u00e9(s)",
diff --git a/dashboard-ui/strings/javascript/gsw.json b/dashboard-ui/strings/javascript/gsw.json
index 4d862d4a7a..aafff040f7 100644
--- a/dashboard-ui/strings/javascript/gsw.json
+++ b/dashboard-ui/strings/javascript/gsw.json
@@ -129,7 +129,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/strings/javascript/he.json b/dashboard-ui/strings/javascript/he.json
index 16fae2d753..58bc4e9f89 100644
--- a/dashboard-ui/strings/javascript/he.json
+++ b/dashboard-ui/strings/javascript/he.json
@@ -129,7 +129,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/strings/javascript/hr.json b/dashboard-ui/strings/javascript/hr.json
index bce379aa23..c6a3691368 100644
--- a/dashboard-ui/strings/javascript/hr.json
+++ b/dashboard-ui/strings/javascript/hr.json
@@ -129,7 +129,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/strings/javascript/it.json b/dashboard-ui/strings/javascript/it.json
index 0c96111410..4285fbecca 100644
--- a/dashboard-ui/strings/javascript/it.json
+++ b/dashboard-ui/strings/javascript/it.json
@@ -129,7 +129,6 @@
     "LabelAbortedByServerShutdown": "(Interrotto dallo spegnimento del server)",
     "LabelScheduledTaskLastRan": "Ultima esecuzione  {0}, taking {1}.",
     "HeaderDeleteTaskTrigger": "Elimina Operazione pianificata",
-    "HeaderTaskTriggers": "Operazione Pianificata",
     "MessageDeleteTaskTrigger": "Sei sicuro di voler cancellare questo evento?",
     "MessageNoPluginsInstalled": "Non hai plugin installati",
     "LabelVersionInstalled": "{0} installato",
diff --git a/dashboard-ui/strings/javascript/kk.json b/dashboard-ui/strings/javascript/kk.json
index ccea6dec67..19ec2b068c 100644
--- a/dashboard-ui/strings/javascript/kk.json
+++ b/dashboard-ui/strings/javascript/kk.json
@@ -1,6 +1,6 @@
 {
     "HeaderTo": "\u049a\u0430\u0439\u0434\u0430",
-    "MessageNoPluginsDueToAppStore": "To manage plugins, please use the Emby web app.",
+    "MessageNoPluginsDueToAppStore": "\u041f\u043b\u0430\u0433\u0438\u043d\u0434\u0435\u0440\u0434\u0456 \u0431\u0430\u0441\u049b\u0430\u0440\u0443 \u04af\u0448\u0456\u043d, Emby \u0432\u0435\u0431-\u049b\u043e\u043b\u0434\u0430\u043d\u0431\u0430\u0441\u044b\u043d \u043f\u0430\u0439\u0434\u0430\u043b\u0430\u043d\u044b\u04a3\u044b\u0437.",
     "SettingsSaved": "\u041f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u043b\u0435\u0440 \u0441\u0430\u049b\u0442\u0430\u043b\u0434\u044b.",
     "AddUser": "\u041f\u0430\u0439\u0434\u0430\u043b\u0430\u043d\u0443\u0448\u044b\u043d\u044b \u04af\u0441\u0442\u0435\u0443",
     "Users": "\u041f\u0430\u0439\u0434\u0430\u043b\u0430\u043d\u0443\u0448\u044b\u043b\u0430\u0440",
@@ -129,7 +129,6 @@
     "LabelAbortedByServerShutdown": "(\u0421\u0435\u0440\u0432\u0435\u0440 \u0436\u04b1\u043c\u044b\u0441\u0442\u044b \u0430\u044f\u049b\u0442\u0430\u0443 \u0441\u0435\u0431\u0435\u0431\u0456\u043d\u0435\u043d \u0442\u043e\u049b\u0442\u0430\u0442\u044b\u043b\u0434\u044b)",
     "LabelScheduledTaskLastRan": "\u041a\u0435\u0439\u0456\u043d\u0433\u0456 \u049b\u043e\u0441\u044b\u043b\u0493\u0430\u043d\u044b {0}, {1} \u0430\u043b\u0434\u044b.",
     "HeaderDeleteTaskTrigger": "\u0422\u0430\u043f\u0441\u044b\u0440\u043c\u0430 \u0442\u0440\u0438\u0433\u0433\u0435\u0440\u0456\u043d \u0436\u043e\u044e",
-    "HeaderTaskTriggers": "\u0422\u0430\u043f\u0441\u044b\u0440\u043c\u0430 \u0442\u0440\u0438\u0433\u0433\u0435\u0440\u043b\u0435\u0440\u0456",
     "MessageDeleteTaskTrigger": "\u0428\u044b\u043d\u044b\u043c\u0435\u043d \u043e\u0441\u044b \u0442\u0430\u043f\u0441\u044b\u0440\u043c\u0430 \u0442\u0440\u0438\u0433\u0433\u0435\u0440\u0456\u043d \u0436\u043e\u044e \u049b\u0430\u0436\u0435\u0442 \u043f\u0435?",
     "MessageNoPluginsInstalled": "\u041e\u0440\u043d\u0430\u0442\u044b\u043b\u0493\u0430\u043d \u043f\u043b\u0430\u0433\u0438\u043d\u0434\u0435\u0440 \u0436\u043e\u049b.",
     "LabelVersionInstalled": "{0} \u043e\u0440\u043d\u0430\u0442\u044b\u043b\u0493\u0430\u043d",
diff --git a/dashboard-ui/strings/javascript/ko.json b/dashboard-ui/strings/javascript/ko.json
index bb2d268805..01f752ed45 100644
--- a/dashboard-ui/strings/javascript/ko.json
+++ b/dashboard-ui/strings/javascript/ko.json
@@ -129,7 +129,6 @@
     "LabelAbortedByServerShutdown": "(\uc11c\ubc84\uac00 \uc885\ub8cc\ub418\uc5b4 \ucde8\uc18c\ub428)",
     "LabelScheduledTaskLastRan": "Last ran {0}, taking {1}.",
     "HeaderDeleteTaskTrigger": "\uc791\uc5c5 \ud2b8\ub9ac\uac70 \uc0ad\uc81c",
-    "HeaderTaskTriggers": "\uc791\uc5c5 \ud2b8\ub9ac\uac70",
     "MessageDeleteTaskTrigger": "\uc774 \uc791\uc5c5 \ud2b8\ub9ac\uac70\ub97c \uc0ad\uc81c\ud558\uaca0\uc2b5\ub2c8\uae4c?",
     "MessageNoPluginsInstalled": "\uc124\uce58\ub41c \ud50c\ub7ec\uadf8\uc778\uc774 \uc5c6\uc2b5\ub2c8\ub2e4.",
     "LabelVersionInstalled": "{0} \uc124\uce58\ub428",
diff --git a/dashboard-ui/strings/javascript/ms.json b/dashboard-ui/strings/javascript/ms.json
index a104f9e090..edcd8acf09 100644
--- a/dashboard-ui/strings/javascript/ms.json
+++ b/dashboard-ui/strings/javascript/ms.json
@@ -129,7 +129,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/strings/javascript/nb.json b/dashboard-ui/strings/javascript/nb.json
index 2903179f51..f85066a995 100644
--- a/dashboard-ui/strings/javascript/nb.json
+++ b/dashboard-ui/strings/javascript/nb.json
@@ -129,7 +129,6 @@
     "LabelAbortedByServerShutdown": "(Avbrutt av server shutdown)",
     "LabelScheduledTaskLastRan": "Sist kj\u00f8rt {0}, tar {1}.",
     "HeaderDeleteTaskTrigger": "Slett Oppgave Trigger",
-    "HeaderTaskTriggers": "Oppgave Triggers",
     "MessageDeleteTaskTrigger": "Er du sikker p\u00e5 at du vil slette denne oppgave triggeren?",
     "MessageNoPluginsInstalled": "Du har ingen programtillegg installert.",
     "LabelVersionInstalled": "{0} installert.",
diff --git a/dashboard-ui/strings/javascript/nl.json b/dashboard-ui/strings/javascript/nl.json
index 8605422bb4..ff2c118aeb 100644
--- a/dashboard-ui/strings/javascript/nl.json
+++ b/dashboard-ui/strings/javascript/nl.json
@@ -129,7 +129,6 @@
     "LabelAbortedByServerShutdown": "(Afgebroken door afsluiten van de server)",
     "LabelScheduledTaskLastRan": "Laatste keer {0}, duur {1}.",
     "HeaderDeleteTaskTrigger": "Verwijderen Taak Trigger",
-    "HeaderTaskTriggers": "Taak Triggers",
     "MessageDeleteTaskTrigger": "Weet u zeker dat u deze taak trigger wilt verwijderen?",
     "MessageNoPluginsInstalled": "U heeft geen Plugins ge\u00efnstalleerd.",
     "LabelVersionInstalled": "{0} ge\u00efnstalleerd",
diff --git a/dashboard-ui/strings/javascript/pl.json b/dashboard-ui/strings/javascript/pl.json
index 8a6238bd31..846ab870b6 100644
--- a/dashboard-ui/strings/javascript/pl.json
+++ b/dashboard-ui/strings/javascript/pl.json
@@ -129,7 +129,6 @@
     "LabelAbortedByServerShutdown": "(Przerwano w skuter wy\u0142\u0105czenia serwera)",
     "LabelScheduledTaskLastRan": "Ostation uruchomiono {0}, czas trwania {1}.",
     "HeaderDeleteTaskTrigger": "Usu\u0144 Wyzwalacz Zadania",
-    "HeaderTaskTriggers": "Wyzwalacze Zada\u0144",
     "MessageDeleteTaskTrigger": "Jeste\u015b pewien \u017ce chcesz usun\u0105\u0107 ten wyzwalacz zadania?",
     "MessageNoPluginsInstalled": "Nie masz \u017cadnych wtyczek zainstalowanych.",
     "LabelVersionInstalled": "{0} zainstalowanych",
diff --git a/dashboard-ui/strings/javascript/pt-BR.json b/dashboard-ui/strings/javascript/pt-BR.json
index f218bf411f..72b4009c6a 100644
--- a/dashboard-ui/strings/javascript/pt-BR.json
+++ b/dashboard-ui/strings/javascript/pt-BR.json
@@ -129,7 +129,6 @@
     "LabelAbortedByServerShutdown": "(Abortada pelo desligamento do servidor)",
     "LabelScheduledTaskLastRan": "\u00daltima execu\u00e7\u00e3o {0}, demorando {1}.",
     "HeaderDeleteTaskTrigger": "Excluir Disparador da Tarefa",
-    "HeaderTaskTriggers": "Disparadores de Tarefa",
     "MessageDeleteTaskTrigger": "Deseja realmente excluir este disparador de tarefa?",
     "MessageNoPluginsInstalled": "Voc\u00ea n\u00e3o possui plugins instalados.",
     "LabelVersionInstalled": "{0} instalado",
diff --git a/dashboard-ui/strings/javascript/pt-PT.json b/dashboard-ui/strings/javascript/pt-PT.json
index 2533ce7a81..1241b2bb46 100644
--- a/dashboard-ui/strings/javascript/pt-PT.json
+++ b/dashboard-ui/strings/javascript/pt-PT.json
@@ -129,7 +129,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/strings/javascript/ro.json b/dashboard-ui/strings/javascript/ro.json
index a026aac5ca..ee10c45305 100644
--- a/dashboard-ui/strings/javascript/ro.json
+++ b/dashboard-ui/strings/javascript/ro.json
@@ -129,7 +129,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/strings/javascript/ru.json b/dashboard-ui/strings/javascript/ru.json
index 5a4e0ad29c..ea1de734c3 100644
--- a/dashboard-ui/strings/javascript/ru.json
+++ b/dashboard-ui/strings/javascript/ru.json
@@ -1,6 +1,6 @@
 {
     "HeaderTo": "\u041a\u043e\u043d\u0435\u0447\u043d\u043e\u0435",
-    "MessageNoPluginsDueToAppStore": "To manage plugins, please use the Emby web app.",
+    "MessageNoPluginsDueToAppStore": "\u0427\u0442\u043e\u0431\u044b \u0443\u043f\u0440\u0430\u0432\u043b\u044f\u0442\u044c \u043f\u043b\u0430\u0433\u0438\u043d\u0430\u043c\u0438, \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0439\u0442\u0435 \u0432\u0435\u0431-\u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u0435 Emby.",
     "SettingsSaved": "\u041f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u044b \u0441\u043e\u0445\u0440\u0430\u043d\u0435\u043d\u044b.",
     "AddUser": "\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f",
     "Users": "\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0438",
@@ -129,7 +129,6 @@
     "LabelAbortedByServerShutdown": "(\u041f\u0440\u0435\u0440\u0432\u0430\u043d\u043e \u043e\u0442\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0435\u043c \u0441\u0435\u0440\u0432\u0435\u0440\u0430)",
     "LabelScheduledTaskLastRan": "\u041f\u043e\u0441\u043b\u0435\u0434\u043d\u0438\u0439 \u0437\u0430\u043f\u0443\u0441\u043a \u0431\u044b\u043b {0}, \u0437\u0430\u043d\u044f\u043b {1}.",
     "HeaderDeleteTaskTrigger": "\u0423\u0434\u0430\u043b\u0435\u043d\u0438\u0435 \u0442\u0440\u0438\u0433\u0433\u0435\u0440\u0430 \u0437\u0430\u0434\u0430\u0447\u0438",
-    "HeaderTaskTriggers": "\u0422\u0440\u0438\u0433\u0433\u0435\u0440\u044b \u0437\u0430\u0434\u0430\u0447\u0438",
     "MessageDeleteTaskTrigger": "\u0412\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u0443\u0434\u0430\u043b\u0438\u0442\u044c \u0434\u0430\u043d\u043d\u044b\u0439 \u0442\u0440\u0438\u0433\u0433\u0435\u0440 \u0437\u0430\u0434\u0430\u0447\u0438?",
     "MessageNoPluginsInstalled": "\u041d\u0435\u0442 \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d\u043d\u044b\u0445 \u043f\u043b\u0430\u0433\u0438\u043d\u043e\u0432.",
     "LabelVersionInstalled": "\u0423\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d\u0430: {0}",
diff --git a/dashboard-ui/strings/javascript/sl-SI.json b/dashboard-ui/strings/javascript/sl-SI.json
index 5fb1ae89a0..d5fc6d12de 100644
--- a/dashboard-ui/strings/javascript/sl-SI.json
+++ b/dashboard-ui/strings/javascript/sl-SI.json
@@ -129,7 +129,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/strings/javascript/sv.json b/dashboard-ui/strings/javascript/sv.json
index 2e0f0657f8..9aad6308fb 100644
--- a/dashboard-ui/strings/javascript/sv.json
+++ b/dashboard-ui/strings/javascript/sv.json
@@ -129,7 +129,6 @@
     "LabelAbortedByServerShutdown": "(avbr\u00f6ts eftersom servern st\u00e4ngdes av)",
     "LabelScheduledTaskLastRan": "Senast k\u00f6rd {0}, tog {1}",
     "HeaderDeleteTaskTrigger": "Ta bort aktivitetsutl\u00f6sare",
-    "HeaderTaskTriggers": "Aktivitetsutl\u00f6sare",
     "MessageDeleteTaskTrigger": "Vill du ta bort denna aktivitetsutl\u00f6sare?",
     "MessageNoPluginsInstalled": "Inga till\u00e4gg har installerats.",
     "LabelVersionInstalled": "{0} installerade",
diff --git a/dashboard-ui/strings/javascript/tr.json b/dashboard-ui/strings/javascript/tr.json
index e0fe3c2995..67d1b13e09 100644
--- a/dashboard-ui/strings/javascript/tr.json
+++ b/dashboard-ui/strings/javascript/tr.json
@@ -129,7 +129,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/strings/javascript/uk.json b/dashboard-ui/strings/javascript/uk.json
index 37b87e3a16..10c920c519 100644
--- a/dashboard-ui/strings/javascript/uk.json
+++ b/dashboard-ui/strings/javascript/uk.json
@@ -129,7 +129,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/strings/javascript/vi.json b/dashboard-ui/strings/javascript/vi.json
index f520104f93..56711b3fd8 100644
--- a/dashboard-ui/strings/javascript/vi.json
+++ b/dashboard-ui/strings/javascript/vi.json
@@ -129,7 +129,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/strings/javascript/zh-CN.json b/dashboard-ui/strings/javascript/zh-CN.json
index 72d5926250..4fd298a5a2 100644
--- a/dashboard-ui/strings/javascript/zh-CN.json
+++ b/dashboard-ui/strings/javascript/zh-CN.json
@@ -129,7 +129,6 @@
     "LabelAbortedByServerShutdown": "(\u56e0\u4e3a\u670d\u52a1\u5668\u5173\u95ed\u88ab\u4e2d\u6b62)",
     "LabelScheduledTaskLastRan": "\u6700\u540e\u8fd0\u884c {0}, \u82b1\u8d39\u65f6\u95f4 {1}.",
     "HeaderDeleteTaskTrigger": "\u5220\u9664\u4efb\u52a1\u89e6\u53d1\u6761\u4ef6",
-    "HeaderTaskTriggers": "\u4efb\u52a1\u89e6\u53d1\u6761\u4ef6",
     "MessageDeleteTaskTrigger": "\u4f60\u786e\u5b9a\u5220\u9664\u8fd9\u4e2a\u4efb\u52a1\u89e6\u53d1\u6761\u4ef6\uff1f",
     "MessageNoPluginsInstalled": "\u4f60\u6ca1\u6709\u5b89\u88c5\u63d2\u4ef6\u3002",
     "LabelVersionInstalled": "{0} \u5df2\u5b89\u88c5",
diff --git a/dashboard-ui/strings/javascript/zh-HK.json b/dashboard-ui/strings/javascript/zh-HK.json
index 2e646dc564..308b7a9e60 100644
--- a/dashboard-ui/strings/javascript/zh-HK.json
+++ b/dashboard-ui/strings/javascript/zh-HK.json
@@ -129,7 +129,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/strings/javascript/zh-TW.json b/dashboard-ui/strings/javascript/zh-TW.json
index ba50ec1f6e..ff4832253d 100644
--- a/dashboard-ui/strings/javascript/zh-TW.json
+++ b/dashboard-ui/strings/javascript/zh-TW.json
@@ -129,7 +129,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/thirdparty/paper-button-style.css b/dashboard-ui/thirdparty/paper-button-style.css
index 421dba23d3..d8108045eb 100644
--- a/dashboard-ui/thirdparty/paper-button-style.css
+++ b/dashboard-ui/thirdparty/paper-button-style.css
@@ -537,15 +537,23 @@ paper-dialog paper-radio-group paper-radio-button {
 }
 
 div.dialogHeader {
-    margin: 0 0 2.5em !important;
+    margin: 0 0 2em !important;
     padding: .35em .5em;
-    background-color: #101010;
     display: flex;
     align-items: center;
     line-height: normal;
     font-size: 110%;
 }
 
+.background-theme-a div.dialogHeader {
+    background-color: #52B54B;
+    color: #fff;
+}
+
+.background-theme-b div.dialogHeader {
+    background-color: #101010;
+}
+
 .dialogHeaderTitle {
     margin-left: .75em;
 }
@@ -557,6 +565,11 @@ paper-dialog.popupEditor h2.dialogHeader {
     margin-top: .7em;
 }
 
+.dialogHeader paper-button {
+    margin-top: 0;
+    margin-bottom: 0;
+}
+
 paper-dialog.popupEditor {
     padding-bottom: 100px;
 }
diff --git a/dashboard-ui/useredit.html b/dashboard-ui/useredit.html
index d395a333f4..17e9ad8873 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="jqmcollapsible,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,paper-input">
 
         <div data-role="content">
             <div class="content-primary">
@@ -18,7 +18,6 @@
                 <p class="lnkEditUserPreferencesContainer">
                     <a class="lnkEditUserPreferences" href="#" target="_blank">${ButtonEditOtherUserPreferences}</a>
                 </p>
-                <br />
                 <form class="editUserProfileForm">
 
                     <div class="disabledUserBanner" style="display:none;">
@@ -34,17 +33,19 @@
                     </div>
                     <ul data-role="listview" class="ulForm">
                         <li id="fldUserName">
-                            <label for="txtUserName">${LabelName}</label>
-                            <input id="txtUserName" required="required" type="text" />
+                            <paper-input id="txtUserName" required type="text" label="${LabelName}"></paper-input>
                         </li>
-                        <li id="fldConnectInfo" style="display: none; background: #e8eef7;padding:1em;border-radius:5px;">
-                            <label for="txtConnectUserName">${LabelConnectUserName}</label>
-                            <input id="txtConnectUserName" type="text" />
-                            <div class="fieldDescription">
-                                <div>${LabelConnectUserNameHelp}</div>
-                                <div style="margin-top: .75em;"><a href="http://emby.media/connect" target="_blank">${ButtonLearnMoreAboutEmbyConnect}</a></div>
+                        <li id="fldConnectInfo" style="display: none;">
+                            <div class="paperList" style="padding: 1em; border-radius: 5px;">
+                                <paper-input id="txtConnectUserName" type="text" label="${LabelConnectUserName}"></paper-input>
+                                <div class="fieldDescription">
+                                    <div>${LabelConnectUserNameHelp}</div>
+                                    <div style="margin-top: .75em;">
+                                        <a href="http://emby.media/connect" target="_blank">${ButtonLearnMoreAboutEmbyConnect}</a>
+                                    </div>
+                                </div>
+                                <br />
                             </div>
-                            <br />
                         </li>
                         <li>
                             <input type="checkbox" id="chkIsAdmin" name="chkIsAdmin" />
diff --git a/dashboard-ui/usernew.html b/dashboard-ui/usernew.html
index 49c2f7af50..e0e6403a5d 100644
--- a/dashboard-ui/usernew.html
+++ b/dashboard-ui/usernew.html
@@ -4,7 +4,7 @@
     <title>${TitleNewUser}</title>
 </head>
 <body>
-    <div id="newUserPage" data-role="page" class="page type-interior userProfilesPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Users" data-require="scripts/usernew">
+    <div id="newUserPage" data-role="page" class="page type-interior userProfilesPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Users" data-require="scripts/usernew,paper-input">
 
         <div data-role="content">
             <div class="content-primary">
@@ -12,8 +12,7 @@
                 <form class="newUserProfileForm">
                     <ul data-role="listview" class="ulForm">
                         <li id="fldUserName">
-                            <label for="txtUserName">${LabelName}</label>
-                            <input id="txtUserName" required="required" type="text" />
+                            <paper-input id="txtUserName" required type="text" label="${LabelName}"></paper-input>
                             <div class="fieldDescription labelNewUserNameHelp">${LabelNewUserNameHelp}</div>
                         </li>
                     </ul>
diff --git a/dashboard-ui/userprofiles.html b/dashboard-ui/userprofiles.html
index b275866392..749136af58 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,jqmcollapsible,scripts/userprofilespage">
+    <div id="userProfilesPage" data-role="page" class="page type-interior userProfilesPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Users" data-require="scripts/userprofilespage">
 
         <div data-role="content">
             <div class="content-primary">
@@ -41,48 +41,6 @@
                 </div>
             </div>
 
-            <div data-role="popup" id="popupInvite" data-theme="a">
-
-                <a href="#" data-rel="back" class="ui-btn ui-corner-all ui-shadow ui-btn-b ui-icon-delete ui-btn-icon-notext ui-btn-right">${ButtonClose}</a>
-
-                <div class="ui-bar-a" style="text-align: center; padding: 5px 20px;">
-                    <h3 style="margin: .5em;">${HeaderInviteUser}</h3>
-                </div>
-
-                <div style="padding:10px 20px;">
-
-                    <p style="margin:1em 0 1.25em;">${HeaderInviteUserHelp}</p>
-                    <form class="addUserForm">
-                        <div>
-                            <label for="txtConnectUsername">${LabelConnectGuestUserName}</label>
-                            <input type="text" id="txtConnectUsername" value="" placeholder="${PlaceholderUsername}" required="required">
-                            <div class="fieldDescription">
-                                <div>${LabelConnectGuestUserNameHelp}</div>
-                                <div style="margin-top: .75em;"><a href="http://emby.media/connect" target="_blank">${ButtonLearnMoreAboutEmbyConnect}</a></div>
-                            </div>
-
-                            <br />
-
-                            <div data-role="collapsible" data-mini="true">
-                                <h2>${HeaderShareMediaFolders}</h2>
-                                <div>
-                                    <div class="librarySharingList" style="margin-top:1em;">
-
-                                    </div>
-                                </div>
-                            </div>
-                            <div style="margin:1.25em 0;" class="fieldDescription">${MessageGuestSharingPermissionsHelp}</div>
-                            <div>
-                                <button type="submit" data-icon="mail" data-theme="b" data-mini="true">${ButtonSendInvitation}</button>
-                                <a href="#" data-rel="back" data-icon="delete" data-role="button" data-mini="true">${ButtonCancel}</a>
-                            </div>
-                        </div>
-                    </form>
-
-                </div>
-
-            </div>
-
         </div>
     </div>
 </body>