diff --git a/.ci/azure-pipelines-build.yml b/.ci/azure-pipelines-build.yml
new file mode 100644
index 0000000000..128fe54605
--- /dev/null
+++ b/.ci/azure-pipelines-build.yml
@@ -0,0 +1,63 @@
+jobs:
+- job: Build
+  displayName: 'Build'
+
+  strategy:
+    matrix:
+      Development:
+        BuildConfiguration: development
+      Production:
+        BuildConfiguration: production
+      Standalone:
+        BuildConfiguration: standalone
+
+  pool:
+    vmImage: 'ubuntu-latest'
+
+  steps:
+  - task: NodeTool@0
+    displayName: 'Install Node'
+    inputs:
+      versionSpec: '12.x'
+
+  - task: Cache@2
+    displayName: 'Check Cache'
+    inputs:
+      key: 'yarn | yarn.lock'
+      path: 'node_modules'
+      cacheHitVar: CACHE_RESTORED
+
+  - script: 'yarn install --frozen-lockfile'
+    displayName: 'Install Dependencies'
+    condition: ne(variables.CACHE_RESTORED, 'true')
+
+  - script: 'yarn build:development'
+    displayName: 'Build Development'
+    condition: eq(variables['BuildConfiguration'], 'development')
+
+  - script: 'yarn build:production'
+    displayName: 'Build Production'
+    condition: eq(variables['BuildConfiguration'], 'production')
+
+  - script: 'yarn build:standalone'
+    displayName: 'Build Standalone'
+    condition: eq(variables['BuildConfiguration'], 'standalone')
+
+  - script: 'test -d dist'
+    displayName: 'Check Build'
+
+  - script: 'mv dist jellyfin-web'
+    displayName: 'Rename Directory'
+
+  - task: ArchiveFiles@2
+    displayName: 'Archive Directory'
+    inputs:
+      rootFolderOrFile: 'jellyfin-web'
+      includeRootFolder: true
+      archiveFile: 'jellyfin-web-$(BuildConfiguration)'
+
+  - task: PublishPipelineArtifact@1
+    displayName: 'Publish Release'
+    inputs:
+      targetPath: '$(Build.SourcesDirectory)/jellyfin-web-$(BuildConfiguration).zip'
+      artifactName: 'jellyfin-web-$(BuildConfiguration)'
diff --git a/.ci/azure-pipelines-lint.yml b/.ci/azure-pipelines-lint.yml
new file mode 100644
index 0000000000..1e4bddbd04
--- /dev/null
+++ b/.ci/azure-pipelines-lint.yml
@@ -0,0 +1,29 @@
+jobs:
+- job: Lint
+  displayName: 'Lint'
+
+  pool:
+    vmImage: 'ubuntu-latest'
+
+  steps:
+  - task: NodeTool@0
+    displayName: 'Install Node'
+    inputs:
+      versionSpec: '12.x'
+
+  - task: Cache@2
+    displayName: 'Check Cache'
+    inputs:
+      key: 'yarn | yarn.lock'
+      path: 'node_modules'
+      cacheHitVar: CACHE_RESTORED
+
+  - script: 'yarn install --frozen-lockfile'
+    displayName: 'Install Dependencies'
+    condition: ne(variables.CACHE_RESTORED, 'true')
+
+  - script: 'yarn run lint --quiet'
+    displayName: 'Run ESLint'
+
+  - script: 'yarn run stylelint'
+    displayName: 'Run Stylelint'
diff --git a/.ci/azure-pipelines-package.yml b/.ci/azure-pipelines-package.yml
new file mode 100644
index 0000000000..bf4234ec97
--- /dev/null
+++ b/.ci/azure-pipelines-package.yml
@@ -0,0 +1,114 @@
+jobs:
+- job: BuildPackage
+  displayName: 'Build Packages'
+
+  strategy:
+    matrix:
+      CentOS:
+        BuildConfiguration: centos
+      Debian:
+        BuildConfiguration: debian
+      Fedora:
+        BuildConfiguration: fedora
+      Portable:
+        BuildConfiguration: portable
+
+  pool:
+    vmImage: 'ubuntu-latest'
+
+  steps:
+  - script: 'docker build -f deployment/Dockerfile.$(BuildConfiguration) -t jellyfin-web-$(BuildConfiguration) deployment'
+    displayName: 'Build Dockerfile'
+    condition: or(startsWith(variables['Build.SourceBranch'], 'refs/tags'), startsWith(variables['Build.SourceBranch'], 'refs/heads/master'))
+
+  - script: 'docker image ls -a && docker run -v $(pwd)/deployment/dist:/dist -v $(pwd):/jellyfin -e IS_UNSTABLE="yes" -e BUILD_ID=$(Build.BuildNumber) jellyfin-web-$(BuildConfiguration)'
+    displayName: 'Run Dockerfile (unstable)'
+    condition: startsWith(variables['Build.SourceBranch'], 'refs/heads/master')
+
+  - script: 'docker image ls -a && docker run -v $(pwd)/deployment/dist:/dist -v $(pwd):/jellyfin -e IS_UNSTABLE="no" -e BUILD_ID=$(Build.BuildNumber) jellyfin-web-$(BuildConfiguration)'
+    displayName: 'Run Dockerfile (stable)'
+    condition: startsWith(variables['Build.SourceBranch'], 'refs/tags')
+
+  - task: PublishPipelineArtifact@1
+    displayName: 'Publish Release'
+    condition: or(startsWith(variables['Build.SourceBranch'], 'refs/tags'), startsWith(variables['Build.SourceBranch'], 'refs/heads/master'))
+    inputs:
+      targetPath: '$(Build.SourcesDirectory)/deployment/dist'
+      artifactName: 'jellyfin-web-$(BuildConfiguration)'
+
+  - task: SSH@0
+    displayName: 'Create target directory on repository server'
+    condition: or(startsWith(variables['Build.SourceBranch'], 'refs/tags'), startsWith(variables['Build.SourceBranch'], 'refs/heads/master'))
+    inputs:
+      sshEndpoint: repository
+      runOptions: 'inline'
+      inline: 'mkdir -p /srv/repository/incoming/azure/$(Build.BuildNumber)/$(BuildConfiguration)'
+
+  - task: CopyFilesOverSSH@0
+    displayName: 'Upload artifacts to repository server'
+    condition: or(startsWith(variables['Build.SourceBranch'], 'refs/tags'), startsWith(variables['Build.SourceBranch'], 'refs/heads/master'))
+    inputs:
+      sshEndpoint: repository
+      sourceFolder: '$(Build.SourcesDirectory)/deployment/dist'
+      contents: '**'
+      targetFolder: '/srv/repository/incoming/azure/$(Build.BuildNumber)/$(BuildConfiguration)'
+
+- job: BuildDocker
+  displayName: 'Build Docker'
+
+  pool:
+    vmImage: 'ubuntu-latest'
+
+  steps:
+  - task: Docker@2
+    displayName: 'Push Unstable Image'
+    condition: startsWith(variables['Build.SourceBranch'], 'refs/heads/master')
+    inputs:
+      repository: 'jellyfin/jellyfin-web'
+      command: buildAndPush
+      buildContext: '.'
+      Dockerfile: 'deployment/Dockerfile.docker'
+      containerRegistry: Docker Hub
+      tags: |
+        unstable-$(Build.BuildNumber)
+        unstable
+
+  - task: Docker@2
+    displayName: 'Push Stable Image'
+    condition: startsWith(variables['Build.SourceBranch'], 'refs/tags')
+    inputs:
+      repository: 'jellyfin/jellyfin-web'
+      command: buildAndPush
+      buildContext: '.'
+      Dockerfile: 'deployment/Dockerfile.docker'
+      containerRegistry: Docker Hub
+      tags: |
+        stable-$(Build.BuildNumber)
+        stable
+
+- job: CollectArtifacts
+  displayName: 'Collect Artifacts'
+  dependsOn:
+  - BuildPackage
+  - BuildDocker
+  condition: and(succeeded('BuildPackage'), succeeded('BuildDocker'))
+
+  pool:
+    vmImage: 'ubuntu-latest'
+
+  steps:
+  - task: SSH@0
+    displayName: 'Update Unstable Repository'
+    condition: startsWith(variables['Build.SourceBranch'], 'refs/heads/master')
+    inputs:
+      sshEndpoint: repository
+      runOptions: 'inline'
+      inline: 'sudo /srv/repository/collect-server.azure.sh /srv/repository/incoming/azure $(Build.BuildNumber) unstable'
+
+  - task: SSH@0
+    displayName: 'Update Stable Repository'
+    condition: startsWith(variables['Build.SourceBranch'], 'refs/tags')
+    inputs:
+      sshEndpoint: repository
+      runOptions: 'inline'
+      inline: 'sudo /srv/repository/collect-server.azure.sh /srv/repository/incoming/azure $(Build.BuildNumber)'
diff --git a/.ci/azure-pipelines.yml b/.ci/azure-pipelines.yml
index 31f00754f5..3d7a5f1cde 100644
--- a/.ci/azure-pipelines.yml
+++ b/.ci/azure-pipelines.yml
@@ -12,94 +12,6 @@ pr:
     - '*'
 
 jobs:
-- job: Build
-  displayName: 'Build'
-
-  strategy:
-    matrix:
-      Development:
-        BuildConfiguration: development
-      Production:
-        BuildConfiguration: production
-      Standalone:
-        BuildConfiguration: standalone
-
-  pool:
-    vmImage: 'ubuntu-latest'
-
-  steps:
-  - task: NodeTool@0
-    displayName: 'Install Node'
-    inputs:
-      versionSpec: '12.x'
-
-  - task: Cache@2
-    displayName: 'Check Cache'
-    inputs:
-      key: 'yarn | yarn.lock'
-      path: 'node_modules'
-      cacheHitVar: CACHE_RESTORED
-
-  - script: 'yarn install --frozen-lockfile'
-    displayName: 'Install Dependencies'
-    condition: ne(variables.CACHE_RESTORED, 'true')
-
-  - script: 'yarn build:development'
-    displayName: 'Build Development'
-    condition: eq(variables['BuildConfiguration'], 'development')
-
-  - script: 'yarn build:production'
-    displayName: 'Build Bundle'
-    condition: eq(variables['BuildConfiguration'], 'production')
-
-  - script: 'yarn build:standalone'
-    displayName: 'Build Standalone'
-    condition: eq(variables['BuildConfiguration'], 'standalone')
-
-  - script: 'test -d dist'
-    displayName: 'Check Build'
-
-  - script: 'mv dist jellyfin-web'
-    displayName: 'Rename Directory'
-
-  - task: ArchiveFiles@2
-    displayName: 'Archive Directory'
-    inputs:
-      rootFolderOrFile: 'jellyfin-web'
-      includeRootFolder: true
-      archiveFile: 'jellyfin-web-$(BuildConfiguration)'
-
-  - task: PublishPipelineArtifact@1
-    displayName: 'Publish Release'
-    inputs:
-      targetPath: '$(Build.SourcesDirectory)/jellyfin-web-$(BuildConfiguration).zip'
-      artifactName: 'jellyfin-web-$(BuildConfiguration)'
-
-- job: Lint
-  displayName: 'Lint'
-
-  pool:
-    vmImage: 'ubuntu-latest'
-
-  steps:
-  - task: NodeTool@0
-    displayName: 'Install Node'
-    inputs:
-      versionSpec: '12.x'
-
-  - task: Cache@2
-    displayName: 'Check Cache'
-    inputs:
-      key: 'yarn | yarn.lock'
-      path: 'node_modules'
-      cacheHitVar: CACHE_RESTORED
-
-  - script: 'yarn install --frozen-lockfile'
-    displayName: 'Install Dependencies'
-    condition: ne(variables.CACHE_RESTORED, 'true')
-
-  - script: 'yarn run lint --quiet'
-    displayName: 'Run ESLint'
-
-  - script: 'yarn run stylelint'
-    displayName: 'Run Stylelint'
+- template: azure-pipelines-build.yml
+- template: azure-pipelines-lint.yml
+- template: azure-pipelines-package.yml
diff --git a/.dependabot/config.yml b/.dependabot/config.yml
index 02dfd18aac..4ee827471a 100644
--- a/.dependabot/config.yml
+++ b/.dependabot/config.yml
@@ -2,4 +2,4 @@ version: 1
 update_configs:
   - package_manager: "javascript"
     directory: "/"
-    update_schedule: "weekly"
+    update_schedule: "live"
diff --git a/.eslintrc.js b/.eslintrc.js
index 8b9a7dea13..baf6d0e084 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -27,29 +27,30 @@ module.exports = {
         'plugin:compat/recommended'
     ],
     rules: {
-        'block-spacing': ["error"],
-        'brace-style': ["error"],
-        'comma-dangle': ["error", "never"],
-        'comma-spacing': ["error"],
-        'eol-last': ["error"],
-        'indent': ["error", 4, { "SwitchCase": 1 }],
-        'keyword-spacing': ["error"],
-        'max-statements-per-line': ["error"],
-        'no-floating-decimal': ["error"],
-        'no-multi-spaces': ["error"],
-        'no-multiple-empty-lines': ["error", { "max": 1 }],
-        'no-trailing-spaces': ["error"],
-        'one-var': ["error", "never"],
-        'quotes': ["error", "single", { "avoidEscape": true, "allowTemplateLiterals": false }],
-        'semi': ["error"],
-        'space-before-blocks': ["error"],
-        "space-infix-ops": "error"
+        'block-spacing': ['error'],
+        'brace-style': ['error'],
+        'comma-dangle': ['error', 'never'],
+        'comma-spacing': ['error'],
+        'eol-last': ['error'],
+        'indent': ['error', 4, { 'SwitchCase': 1 }],
+        'keyword-spacing': ['error'],
+        'max-statements-per-line': ['error'],
+        'no-floating-decimal': ['error'],
+        'no-multi-spaces': ['error'],
+        'no-multiple-empty-lines': ['error', { 'max': 1 }],
+        'no-trailing-spaces': ['error'],
+        'one-var': ['error', 'never'],
+        'quotes': ['error', 'single', { 'avoidEscape': true, 'allowTemplateLiterals': false }],
+        'semi': ['error'],
+        'space-before-blocks': ['error'],
+        'space-infix-ops': 'error'
     },
     overrides: [
         {
             files: [
                 './src/**/*.js'
             ],
+            parser: 'babel-eslint',
             env: {
                 node: false,
                 amd: true,
@@ -97,11 +98,11 @@ module.exports = {
             },
             rules: {
                 // TODO: Fix warnings and remove these rules
-                'no-redeclare': ["warn"],
-                'no-unused-vars': ["warn"],
-                'no-useless-escape': ["warn"],
+                'no-redeclare': ['warn'],
+                'no-unused-vars': ['warn'],
+                'no-useless-escape': ['warn'],
                 // TODO: Remove after ES6 migration is complete
-                'import/no-unresolved': ["off"]
+                'import/no-unresolved': ['off']
             },
             settings: {
                 polyfills: [
@@ -131,6 +132,7 @@ module.exports = {
                     'Object.getOwnPropertyDescriptor',
                     'Object.getPrototypeOf',
                     'Object.keys',
+                    'Object.entries',
                     'Object.getOwnPropertyNames',
                     'Function.name',
                     'Function.hasInstance',
@@ -191,4 +193,4 @@ module.exports = {
             }
         }
     ]
-}
+};
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index a35eb9981f..186dbcd12c 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,4 +1,6 @@
 .ci             @dkanada @EraYaN
 .github         @jellyfin/core
-build.sh        @joshuaboniface
+fedora          @joshuaboniface
+debian          @joshuaboniface
+.copr           @joshuaboniface
 deployment      @joshuaboniface
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/1-bug-report.md
similarity index 67%
rename from .github/ISSUE_TEMPLATE/bug_report.md
rename to .github/ISSUE_TEMPLATE/1-bug-report.md
index 137a689e8b..15efff9954 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/1-bug-report.md
@@ -1,23 +1,20 @@
 ---
-name: Bug report
-about: Create a bug report
-title: ''
+name: Bug Report
+about: You have noticed a general issue or regression, and would like to report it
 labels: bug
-assignees: ''
-
 ---
 
-**Describe the bug**
+**Describe The Bug**
 <!-- A clear and concise description of what the bug is. -->
 
-**To Reproduce**
+**Steps To Reproduce**
 <!-- Steps to reproduce the behavior: -->
 1. Go to '...'
 2. Click on '....'
 3. Scroll down to '....'
 4. See error
 
-**Expected behavior**
+**Expected Behavior**
 <!-- A clear and concise description of what you expected to happen. -->
 
 **Logs**
@@ -27,9 +24,9 @@ assignees: ''
 <!-- If applicable, add screenshots to help explain your problem. -->
 
 **System (please complete the following information):**
- - OS: [e.g. Docker, Debian, Windows]
+ - Platform: [e.g. Linux, Windows, iPhone, Tizen]
  - Browser: [e.g. Firefox, Chrome, Safari]
- - Jellyfin Version: [e.g. 10.0.1]
+ - Jellyfin Version: [e.g. 10.6.0]
 
-**Additional context**
+**Additional Context**
 <!-- Add any other context about the problem here. -->
diff --git a/.github/ISSUE_TEMPLATE/2-playback-issue.md b/.github/ISSUE_TEMPLATE/2-playback-issue.md
new file mode 100644
index 0000000000..bed7315abb
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/2-playback-issue.md
@@ -0,0 +1,22 @@
+---
+name: Playback Issue
+about: You have playback issues with some files
+labels: playback
+---
+
+**Describe The Bug**
+<!-- A clear and concise description of what the bug is. -->
+
+**Media Information**
+<!-- Please paste any ffprobe or MediaInfo logs. -->
+
+**Screenshots**
+<!-- Add screenshots from the Playback Data and Media Info. -->
+
+**System (please complete the following information):**
+ - Platform: [e.g. Linux, Windows, iPhone, Tizen]
+ - Browser: [e.g. Firefox, Chrome, Safari]
+ - Jellyfin Version: [e.g. 10.6.0]
+
+**Additional Context**
+<!-- Add any other context about the problem here. -->
diff --git a/.github/ISSUE_TEMPLATE/3-technical-discussion.md b/.github/ISSUE_TEMPLATE/3-technical-discussion.md
new file mode 100644
index 0000000000..d8140fce75
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/3-technical-discussion.md
@@ -0,0 +1,13 @@
+---
+name: Technical Discussion
+about: You want to discuss technical aspects of changes you intend to make
+labels: enhancement
+---
+
+<!-- Explain the change and the motivations behind it.
+
+For example, if you plan to rely on a new dependency, explain why and what
+it brings to the project.
+
+If you plan to make significant changes, go roughly over the steps you intend
+to take and how you would divide the change in PRs of a manageable size. -->
diff --git a/.github/ISSUE_TEMPLATE/4-meta-issue.md b/.github/ISSUE_TEMPLATE/4-meta-issue.md
new file mode 100644
index 0000000000..e034302e45
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/4-meta-issue.md
@@ -0,0 +1,9 @@
+---
+name: Meta Issue
+about: You want to track a number of other issues as part of a larger project
+labels: meta
+---
+
+* [ ] Issue 1 [#123]
+* [ ] Issue 2 [#456]
+* [ ] ...
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 0000000000..2ed06fae39
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,8 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Feature Request
+    url: https://features.jellyfin.org/
+    about: Please head over to our feature request hub to vote on or submit a feature.
+  - name: Help Or Question
+    url: https://matrix.to/#/#jellyfin-troubleshooting:matrix.org
+    about: Please join the troubleshooting Matrix channel to get some help.
diff --git a/.github/SUPPORT.md b/.github/SUPPORT.md
new file mode 100644
index 0000000000..a62bc7522a
--- /dev/null
+++ b/.github/SUPPORT.md
@@ -0,0 +1,24 @@
+# Support
+
+Jellyfin contributors have limited availability to address general support
+questions. Please make sure you are using the latest version of Jellyfin.
+
+When looking for support or information, please first search for your
+question in these venues:
+
+* [Jellyfin Forum](https://forum.jellyfin.org)
+* [Jellyfin Documentation](https://docs.jellyfin.org)
+* [Open or **closed** issues in the organization](https://github.com/issues?q=sort%3Aupdated-desc+org%3Ajellyfin+is%3Aissue+)
+
+If you didn't find an answer in the resources above, contributors and other
+users are reachable through the following channels:
+
+* #jellyfin on [Matrix](https://matrix.to/#/#jellyfin:matrix.org%22) or [IRC](https://webchat.freenode.net/#jellyfin)
+* #jellyfin-troubleshooting on [Matrix](https://matrix.to/#/#jellyfin-troubleshooting:matrix.org) or [IRC](https://webchat.freenode.net/#jellyfin-troubleshooting)
+* [/r/jellyfin on Reddit](https://www.reddit.com/r/jellyfin)
+
+GitHub issues are for tracking enhancements and bugs, not general support.
+
+The open source license grants you the freedom to use Jellyfin.
+It does not guarantee commitments of other people's time.
+Please be respectful and manage your expectations.
diff --git a/.gitignore b/.gitignore
index 9bccd32fb8..36b843f022 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,3 @@
-# config
-config.json
-
 # npm
 dist
 web
@@ -10,5 +7,5 @@ node_modules
 .idea
 .vscode
 
-#log
+# log
 yarn-error.log
diff --git a/deployment/Dockerfile.centos.all b/deployment/Dockerfile.centos
similarity index 51%
rename from deployment/Dockerfile.centos.all
rename to deployment/Dockerfile.centos
index 93bf8d6988..64cffc7eed 100644
--- a/deployment/Dockerfile.centos.all
+++ b/deployment/Dockerfile.centos
@@ -1,7 +1,9 @@
 FROM centos:7
+
 # Docker build arguments
 ARG SOURCE_DIR=/jellyfin
 ARG ARTIFACT_DIR=/dist
+
 # Docker run environment
 ENV SOURCE_DIR=/jellyfin
 ENV ARTIFACT_DIR=/dist
@@ -9,19 +11,19 @@ ENV IS_DOCKER=YES
 
 # Prepare CentOS environment
 RUN yum update -y \
- && yum install -y epel-release \
- && yum install -y @buildsys-build rpmdevtools git yum-plugins-core nodejs-yarn autoconf automake glibc-devel
+  && yum install -y epel-release \
+  && yum install -y @buildsys-build rpmdevtools git yum-plugins-core nodejs-yarn autoconf automake glibc-devel
 
 # Install recent NodeJS and Yarn
 RUN curl -fSsLo /etc/yum.repos.d/yarn.repo https://dl.yarnpkg.com/rpm/yarn.repo \
- && rpm -i https://rpm.nodesource.com/pub_10.x/el/7/x86_64/nodesource-release-el7-1.noarch.rpm \
- && yum install -y yarn
+  && rpm -i https://rpm.nodesource.com/pub_10.x/el/7/x86_64/nodesource-release-el7-1.noarch.rpm \
+  && yum install -y yarn
 
 # Link to build script
-RUN ln -sf ${SOURCE_DIR}/deployment/build.centos.all /build.sh
+RUN ln -sf ${SOURCE_DIR}/deployment/build.centos /build.sh
 
-VOLUME ${SOURCE_DIR}/
+VOLUME ${SOURCE_DIR}
 
-VOLUME ${ARTIFACT_DIR}/
+VOLUME ${ARTIFACT_DIR}
 
 ENTRYPOINT ["/build.sh"]
diff --git a/deployment/Dockerfile.debian.all b/deployment/Dockerfile.debian
similarity index 69%
rename from deployment/Dockerfile.debian.all
rename to deployment/Dockerfile.debian
index 54281a5eb4..80ea103b92 100644
--- a/deployment/Dockerfile.debian.all
+++ b/deployment/Dockerfile.debian
@@ -1,7 +1,9 @@
 FROM debian:10
+
 # Docker build arguments
 ARG SOURCE_DIR=/jellyfin
 ARG ARTIFACT_DIR=/dist
+
 # Docker run environment
 ENV SOURCE_DIR=/jellyfin
 ENV ARTIFACT_DIR=/dist
@@ -10,16 +12,16 @@ ENV IS_DOCKER=YES
 
 # Prepare Debian build environment
 RUN apt-get update \
- && apt-get install -y debhelper mmv npm git
+  && apt-get install -y debhelper mmv npm git
 
 # Prepare Yarn
 RUN npm install -g yarn
 
 # Link to build script
-RUN ln -sf ${SOURCE_DIR}/deployment/build.debian.all /build.sh
+RUN ln -sf ${SOURCE_DIR}/deployment/build.debian /build.sh
 
-VOLUME ${SOURCE_DIR}/
+VOLUME ${SOURCE_DIR}
 
-VOLUME ${ARTIFACT_DIR}/
+VOLUME ${ARTIFACT_DIR}
 
 ENTRYPOINT ["/build.sh"]
diff --git a/deployment/Dockerfile.docker b/deployment/Dockerfile.docker
new file mode 100644
index 0000000000..5d12938185
--- /dev/null
+++ b/deployment/Dockerfile.docker
@@ -0,0 +1,11 @@
+FROM node:alpine
+
+ARG SOURCE_DIR=/src
+ARG ARTIFACT_DIR=/jellyfin-web
+
+RUN apk add autoconf g++ make libpng-dev gifsicle alpine-sdk automake libtool make gcc musl-dev nasm python
+
+WORKDIR ${SOURCE_DIR}
+COPY . .
+
+RUN yarn install && mv dist ${ARTIFACT_DIR}
diff --git a/deployment/Dockerfile.fedora.all b/deployment/Dockerfile.fedora
similarity index 56%
rename from deployment/Dockerfile.fedora.all
rename to deployment/Dockerfile.fedora
index d47f4ff4da..e6026985d1 100644
--- a/deployment/Dockerfile.fedora.all
+++ b/deployment/Dockerfile.fedora
@@ -1,7 +1,9 @@
 FROM fedora:31
+
 # Docker build arguments
 ARG SOURCE_DIR=/jellyfin
 ARG ARTIFACT_DIR=/dist
+
 # Docker run environment
 ENV SOURCE_DIR=/jellyfin
 ENV ARTIFACT_DIR=/dist
@@ -9,13 +11,13 @@ ENV IS_DOCKER=YES
 
 # Prepare Fedora environment
 RUN dnf update -y \
- && dnf install -y @buildsys-build rpmdevtools git dnf-plugins-core nodejs-yarn autoconf automake glibc-devel
+  && dnf install -y @buildsys-build rpmdevtools git dnf-plugins-core nodejs-yarn autoconf automake glibc-devel
 
 # Link to build script
-RUN ln -sf ${SOURCE_DIR}/deployment/build.fedora.all /build.sh
+RUN ln -sf ${SOURCE_DIR}/deployment/build.fedora /build.sh
 
-VOLUME ${SOURCE_DIR}/
+VOLUME ${SOURCE_DIR}
 
-VOLUME ${ARTIFACT_DIR}/
+VOLUME ${ARTIFACT_DIR}
 
 ENTRYPOINT ["/build.sh"]
diff --git a/deployment/Dockerfile.portable b/deployment/Dockerfile.portable
index e0d1f45265..0d4c79bb2f 100644
--- a/deployment/Dockerfile.portable
+++ b/deployment/Dockerfile.portable
@@ -1,16 +1,17 @@
 FROM debian:10
+
 # Docker build arguments
 ARG SOURCE_DIR=/jellyfin
 ARG ARTIFACT_DIR=/dist
+
 # Docker run environment
 ENV SOURCE_DIR=/jellyfin
 ENV ARTIFACT_DIR=/dist
-ENV DEB_BUILD_OPTIONS=noddebs
 ENV IS_DOCKER=YES
 
 # Prepare Debian build environment
 RUN apt-get update \
- && apt-get install -y mmv npm git
+  && apt-get install -y mmv npm git
 
 # Prepare Yarn
 RUN npm install -g yarn
@@ -18,8 +19,8 @@ RUN npm install -g yarn
 # Link to build script
 RUN ln -sf ${SOURCE_DIR}/deployment/build.portable /build.sh
 
-VOLUME ${SOURCE_DIR}/
+VOLUME ${SOURCE_DIR}
 
-VOLUME ${ARTIFACT_DIR}/
+VOLUME ${ARTIFACT_DIR}
 
 ENTRYPOINT ["/build.sh"]
diff --git a/deployment/build.centos b/deployment/build.centos
new file mode 100755
index 0000000000..25d1e8c175
--- /dev/null
+++ b/deployment/build.centos
@@ -0,0 +1,41 @@
+#!/bin/bash
+
+set -o errexit
+set -o xtrace
+
+# move to source directory
+pushd ${SOURCE_DIR}
+
+cp -a yarn.lock /tmp/yarn.lock
+
+# modify changelog to unstable configuration if IS_UNSTABLE
+if [[ ${IS_UNSTABLE} == 'yes' ]]; then
+    pushd fedora
+
+    PR_ID=$( git log --grep 'Merge pull request' --oneline --single-worktree --first-parent | head -1 | grep --color=none -Eo '#[0-9]+' | tr -d '#' )
+
+    sed -i "s/Version:.*/Version:        ${BUILD_ID}/" jellyfin-web.spec
+    sed -i "/%changelog/q" jellyfin-web.spec
+
+    cat <<EOF >>jellyfin-web.spec
+* $( LANG=C date '+%a %b %d %Y' ) Jellyfin Packaging Team <packaging@jellyfin.org>
+- Jellyfin Web unstable build ${BUILD_ID} for merged PR #${PR_ID}
+EOF
+    popd
+fi
+
+# build rpm
+make -f fedora/Makefile srpm outdir=/root/rpmbuild/SRPMS
+rpmbuild --rebuild -bb /root/rpmbuild/SRPMS/jellyfin-*.src.rpm
+
+# move the artifacts
+mv /root/rpmbuild/RPMS/noarch/jellyfin-*.rpm /root/rpmbuild/SRPMS/jellyfin-*.src.rpm ${ARTIFACT_DIR}/
+
+if [[ ${IS_DOCKER} == YES ]]; then
+    chown -Rc $(stat -c %u:%g ${ARTIFACT_DIR}) ${ARTIFACT_DIR}
+fi
+
+rm -f fedora/jellyfin*.tar.gz
+cp -a /tmp/yarn.lock yarn.lock
+
+popd
diff --git a/deployment/build.centos.all b/deployment/build.centos.all
deleted file mode 100755
index 8c2cec6d33..0000000000
--- a/deployment/build.centos.all
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-
-#= CentOS 7 all .rpm
-
-set -o errexit
-set -o xtrace
-
-# Move to source directory
-pushd ${SOURCE_DIR}
-
-cp -a yarn.lock /tmp/yarn.lock
-
-# Build RPM
-make -f fedora/Makefile srpm outdir=/root/rpmbuild/SRPMS
-rpmbuild --rebuild -bb /root/rpmbuild/SRPMS/jellyfin-*.src.rpm
-
-# Move the artifacts out
-mv /root/rpmbuild/RPMS/noarch/jellyfin-*.rpm /root/rpmbuild/SRPMS/jellyfin-*.src.rpm ${ARTIFACT_DIR}/
-
-if [[ ${IS_DOCKER} == YES ]]; then
-    chown -Rc $(stat -c %u:%g ${ARTIFACT_DIR}) ${ARTIFACT_DIR}
-fi
-
-rm -f fedora/jellyfin*.tar.gz
-cp -a /tmp/yarn.lock yarn.lock
-
-popd
diff --git a/deployment/build.debian b/deployment/build.debian
new file mode 100755
index 0000000000..9fe3fb51e9
--- /dev/null
+++ b/deployment/build.debian
@@ -0,0 +1,39 @@
+#!/bin/bash
+
+set -o errexit
+set -o xtrace
+
+# move to source directory
+pushd ${SOURCE_DIR}
+
+cp -a yarn.lock /tmp/yarn.lock
+
+# modify changelog to unstable configuration if IS_UNSTABLE
+if [[ ${IS_UNSTABLE} == 'yes' ]]; then
+    pushd debian
+
+    PR_ID=$( git log --grep 'Merge pull request' --oneline --single-worktree --first-parent | head -1 | grep --color=none -Eo '#[0-9]+' | tr -d '#' )
+
+    cat <<EOF >changelog
+jellyfin-web (${BUILD_ID}-unstable) unstable; urgency=medium
+
+  * Jellyfin Web unstable build ${BUILD_ID} for merged PR #${PR_ID}
+
+ -- Jellyfin Packaging Team <packaging@jellyfin.org>  $( date --rfc-2822 )
+EOF
+    popd
+fi
+
+# build deb
+dpkg-buildpackage -us -uc --pre-clean --post-clean
+
+mkdir -p ${ARTIFACT_DIR}
+mv ../jellyfin*.{deb,dsc,tar.gz,buildinfo,changes} ${ARTIFACT_DIR}
+
+cp -a /tmp/yarn.lock yarn.lock
+
+if [[ ${IS_DOCKER} == YES ]]; then
+    chown -Rc $(stat -c %u:%g ${ARTIFACT_DIR}) ${ARTIFACT_DIR}
+fi
+
+popd
diff --git a/deployment/build.debian.all b/deployment/build.debian.all
deleted file mode 100755
index 8d617a288e..0000000000
--- a/deployment/build.debian.all
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-
-#= Debian/Ubuntu all .deb
-
-set -o errexit
-set -o xtrace
-
-# Move to source directory
-pushd ${SOURCE_DIR}
-
-cp -a yarn.lock /tmp/yarn.lock
-
-# Build DEB
-dpkg-buildpackage -us -uc --pre-clean --post-clean
-
-mkdir -p ${ARTIFACT_DIR}/
-mv ../jellyfin*.{deb,dsc,tar.gz,buildinfo,changes} ${ARTIFACT_DIR}/
-
-cp -a /tmp/yarn.lock yarn.lock
-
-if [[ ${IS_DOCKER} == YES ]]; then
-    chown -Rc $(stat -c %u:%g ${ARTIFACT_DIR}) ${ARTIFACT_DIR}
-fi
-
-popd
diff --git a/deployment/build.fedora b/deployment/build.fedora
new file mode 100755
index 0000000000..60d270ed6c
--- /dev/null
+++ b/deployment/build.fedora
@@ -0,0 +1,41 @@
+#!/bin/bash
+
+set -o errexit
+set -o xtrace
+
+# move to source directory
+pushd ${SOURCE_DIR}
+
+cp -a yarn.lock /tmp/yarn.lock
+
+# modify changelog to unstable configuration if IS_UNSTABLE
+if [[ ${IS_UNSTABLE} == 'yes' ]]; then
+    pushd fedora
+
+    PR_ID=$( git log --grep 'Merge pull request' --oneline --single-worktree --first-parent | head -1 | grep --color=none -Eo '#[0-9]+' | tr -d '#' )
+
+    sed -i "s/Version:.*/Version:        ${BUILD_ID}/" jellyfin-web.spec
+    sed -i "/%changelog/q" jellyfin-web.spec
+
+    cat <<EOF >>jellyfin-web.spec
+* $( LANG=C date '+%a %b %d %Y' ) Jellyfin Packaging Team <packaging@jellyfin.org>
+- Jellyfin Web unstable build ${BUILD_ID} for merged PR #${PR_ID}
+EOF
+    popd
+fi
+
+# build rpm
+make -f fedora/Makefile srpm outdir=/root/rpmbuild/SRPMS
+rpmbuild -rb /root/rpmbuild/SRPMS/jellyfin-*.src.rpm
+
+# move the artifacts
+mv /root/rpmbuild/RPMS/noarch/jellyfin-*.rpm /root/rpmbuild/SRPMS/jellyfin-*.src.rpm ${ARTIFACT_DIR}
+
+if [[ ${IS_DOCKER} == YES ]]; then
+    chown -Rc $(stat -c %u:%g ${ARTIFACT_DIR}) ${ARTIFACT_DIR}
+fi
+
+rm -f fedora/jellyfin*.tar.gz
+cp -a /tmp/yarn.lock yarn.lock
+
+popd
diff --git a/deployment/build.fedora.all b/deployment/build.fedora.all
deleted file mode 100755
index 4ba12f35ea..0000000000
--- a/deployment/build.fedora.all
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-
-#= Fedora 29+ all .rpm
-
-set -o errexit
-set -o xtrace
-
-# Move to source directory
-pushd ${SOURCE_DIR}
-
-cp -a yarn.lock /tmp/yarn.lock
-
-# Build RPM
-make -f fedora/Makefile srpm outdir=/root/rpmbuild/SRPMS
-rpmbuild -rb /root/rpmbuild/SRPMS/jellyfin-*.src.rpm
-
-# Move the artifacts out
-mv /root/rpmbuild/RPMS/noarch/jellyfin-*.rpm /root/rpmbuild/SRPMS/jellyfin-*.src.rpm ${ARTIFACT_DIR}/
-
-if [[ ${IS_DOCKER} == YES ]]; then
-    chown -Rc $(stat -c %u:%g ${ARTIFACT_DIR}) ${ARTIFACT_DIR}
-fi
-
-rm -f fedora/jellyfin*.tar.gz
-cp -a /tmp/yarn.lock yarn.lock
-
-popd
diff --git a/deployment/build.portable b/deployment/build.portable
index c4cbe927e4..873c145fab 100755
--- a/deployment/build.portable
+++ b/deployment/build.portable
@@ -1,25 +1,27 @@
 #!/bin/bash
 
-#= Portable .NET DLL .tar.gz
-
 set -o errexit
 set -o xtrace
 
-# Move to source directory
+# move to source directory
 pushd ${SOURCE_DIR}
 
-# Get version
-version="$( grep "version:" ./build.yaml | sed -E 's/version: "([0-9\.]+.*)"/\1/' )"
+# get version
+if [[ ${IS_UNSTABLE} == 'yes' ]]; then
+    version="${BUILD_ID}"
+else
+    version="$( grep "version:" ./build.yaml | sed -E 's/version: "([0-9\.]+.*)"/\1/' )"
+fi
 
-# Build archives
+# build archives
 npx yarn install
-mv dist/ jellyfin-web_${version}
+mv dist jellyfin-web_${version}
 tar -czf jellyfin-web_${version}_portable.tar.gz jellyfin-web_${version}
-rm -rf dist/
+rm -rf dist
 
-# Move the artifacts out
-mkdir -p ${ARTIFACT_DIR}/
-mv jellyfin[-_]*.tar.gz ${ARTIFACT_DIR}/
+# move the artifacts
+mkdir -p ${ARTIFACT_DIR}
+mv jellyfin[-_]*.tar.gz ${ARTIFACT_DIR}
 
 if [[ ${IS_DOCKER} == YES ]]; then
     chown -Rc $(stat -c %u:%g ${ARTIFACT_DIR}) ${ARTIFACT_DIR}
diff --git a/fedora/jellyfin-web.spec b/fedora/jellyfin-web.spec
index dbc0bd0efa..dcc9d9d2ab 100644
--- a/fedora/jellyfin-web.spec
+++ b/fedora/jellyfin-web.spec
@@ -12,7 +12,7 @@ Source0:        jellyfin-web-%{version}.tar.gz
 %if 0%{?centos}
 BuildRequires:  yarn
 %else
-BuildRequires   nodejs-yarn
+BuildRequires:  nodejs-yarn
 %endif
 BuildArch:		noarch
 
diff --git a/gulpfile.js b/gulpfile.js
index 538497d4d0..8b407ec2aa 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -181,16 +181,15 @@ function copy(query) {
         .pipe(browserSync.stream());
 }
 
-function copyIndex() {
-    return src(options.injectBundle.query, { base: './src/' })
-        .pipe(dest('dist/'))
-        .pipe(browserSync.stream());
-}
-
 function injectBundle() {
     return src(options.injectBundle.query, { base: './src/' })
         .pipe(inject(
-            src(['src/scripts/apploader.js'], { read: false }, { base: './src/' }), { relative: true }
+            src(['src/scripts/apploader.js'], { read: false }, { base: './src/' }), {
+                relative: true,
+                transform: function (filepath) {
+                    return `<script src="${filepath}" defer></script>`;
+                }
+            }
         ))
         .pipe(dest('dist/'))
         .pipe(browserSync.stream());
@@ -200,6 +199,6 @@ function build(standalone) {
     return series(clean, parallel(javascript, apploader(standalone), webpack, css, html, images, copy));
 }
 
-exports.default = series(build(false), copyIndex);
+exports.default = series(build(false), injectBundle);
 exports.standalone = series(build(true), injectBundle);
 exports.serve = series(exports.standalone, serve);
diff --git a/package.json b/package.json
index 749c62d39c..d1831b13ee 100644
--- a/package.json
+++ b/package.json
@@ -5,27 +5,29 @@
   "repository": "https://github.com/jellyfin/jellyfin-web",
   "license": "GPL-2.0-or-later",
   "devDependencies": {
-    "@babel/core": "^7.9.6",
-    "@babel/plugin-transform-modules-amd": "^7.9.6",
+    "@babel/core": "^7.10.5",
+    "@babel/plugin-proposal-class-properties": "^7.10.1",
+    "@babel/plugin-proposal-private-methods": "^7.10.1",
+    "@babel/plugin-transform-modules-amd": "^7.10.5",
     "@babel/polyfill": "^7.8.7",
-    "@babel/preset-env": "^7.8.6",
-    "autoprefixer": "^9.8.0",
+    "@babel/preset-env": "^7.10.3",
+    "autoprefixer": "^9.8.5",
+    "babel-eslint": "^11.0.0-beta.2",
     "babel-loader": "^8.0.6",
-    "browser-sync": "^2.26.7",
-    "clean-webpack-plugin": "^3.0.0",
+    "browser-sync": "^2.26.10",
     "copy-webpack-plugin": "^5.1.1",
-    "css-loader": "^3.4.2",
+    "css-loader": "^4.0.0",
     "cssnano": "^4.1.10",
     "del": "^5.1.0",
     "eslint": "^6.8.0",
     "eslint-plugin-compat": "^3.5.1",
-    "eslint-plugin-eslint-comments": "^3.1.2",
-    "eslint-plugin-import": "^2.20.2",
+    "eslint-plugin-eslint-comments": "^3.2.0",
+    "eslint-plugin-import": "^2.21.2",
     "eslint-plugin-promise": "^4.2.1",
     "file-loader": "^6.0.0",
     "gulp": "^4.0.2",
     "gulp-babel": "^8.0.0",
-    "gulp-cli": "^2.2.1",
+    "gulp-cli": "^2.3.0",
     "gulp-concat": "^2.6.1",
     "gulp-htmlmin": "^5.0.1",
     "gulp-if": "^3.0.0",
@@ -35,52 +37,50 @@
     "gulp-postcss": "^8.0.0",
     "gulp-sass": "^4.0.2",
     "gulp-sourcemaps": "^2.6.5",
-    "gulp-terser": "^1.2.0",
+    "gulp-terser": "^1.2.1",
     "html-webpack-plugin": "^4.3.0",
     "lazypipe": "^1.0.2",
     "node-sass": "^4.13.1",
     "postcss-loader": "^3.0.0",
     "postcss-preset-env": "^6.7.0",
     "style-loader": "^1.1.3",
-    "stylelint": "^13.5.0",
+    "stylelint": "^13.6.1",
     "stylelint-config-rational-order": "^0.1.2",
     "stylelint-no-browser-hacks": "^1.2.1",
-    "stylelint-order": "^4.0.0",
-    "webpack": "^4.41.5",
-    "webpack-cli": "^3.3.10",
-    "webpack-concat-plugin": "^3.0.0",
-    "webpack-dev-server": "^3.11.0",
+    "stylelint-order": "^4.1.0",
+    "webpack": "^4.44.0",
     "webpack-merge": "^4.2.2",
     "webpack-stream": "^5.2.1"
   },
   "dependencies": {
     "alameda": "^1.4.0",
+    "blurhash": "^1.1.3",
     "classlist.js": "https://github.com/eligrey/classList.js/archive/1.2.20180112.tar.gz",
     "core-js": "^3.6.5",
-    "date-fns": "^2.14.0",
-    "document-register-element": "^1.14.3",
-    "fast-text-encoding": "^1.0.1",
+    "date-fns": "^2.15.0",
+    "epubjs": "^0.3.85",
+    "fast-text-encoding": "^1.0.3",
     "flv.js": "^1.5.0",
     "headroom.js": "^0.11.0",
-    "hls.js": "^0.13.1",
+    "hls.js": "^0.14.5",
     "howler": "^2.2.0",
-    "intersection-observer": "^0.10.0",
-    "jellyfin-apiclient": "^1.2.0",
+    "intersection-observer": "^0.11.0",
+    "jellyfin-apiclient": "^1.4.1",
     "jellyfin-noto": "https://github.com/jellyfin/jellyfin-noto",
     "jquery": "^3.5.1",
-    "jstree": "^3.3.7",
+    "jstree": "^3.3.10",
     "libass-wasm": "https://github.com/jellyfin/JavascriptSubtitlesOctopus#4.0.0-jf-smarttv",
     "material-design-icons-iconfont": "^5.0.1",
     "native-promise-only": "^0.8.0-a",
     "page": "^1.11.6",
-    "query-string": "^6.11.1",
+    "query-string": "^6.13.1",
     "resize-observer-polyfill": "^1.5.1",
     "screenfull": "^5.0.2",
-    "shaka-player": "^2.5.11",
+    "shaka-player": "^2.5.13",
     "sortablejs": "^1.10.2",
-    "swiper": "^5.4.1",
+    "swiper": "^5.4.5",
     "webcomponents.js": "^0.7.24",
-    "whatwg-fetch": "^3.0.0"
+    "whatwg-fetch": "^3.2.0"
   },
   "babel": {
     "presets": [
@@ -89,34 +89,178 @@
     "overrides": [
       {
         "test": [
+          "src/components/accessSchedule/accessSchedule.js",
+          "src/components/actionSheet/actionSheet.js",
+          "src/components/activitylog.js",
+          "src/components/alert.js",
+          "src/components/alphaPicker/alphaPicker.js",
+          "src/components/appFooter/appFooter.js",
           "src/components/autoFocuser.js",
+          "src/components/backdrop/backdrop.js",
           "src/components/cardbuilder/cardBuilder.js",
-          "src/scripts/fileDownloader.js",
+          "src/components/cardbuilder/chaptercardbuilder.js",
+          "src/components/cardbuilder/peoplecardbuilder.js",
+          "src/components/channelMapper/channelMapper.js",
+          "src/components/collectionEditor/collectionEditor.js",
+          "src/components/confirm/confirm.js",
+          "src/components/dialog/dialog.js",
+          "src/components/dialogHelper/dialogHelper.js",
+          "src/components/directorybrowser/directorybrowser.js",
+          "src/components/displaySettings/displaySettings.js",
+          "src/components/fetchhelper.js",
+          "src/components/filterdialog/filterdialog.js",
+          "src/components/groupedcards.js",
+          "src/components/homeScreenSettings/homeScreenSettings.js",
+          "src/components/homesections/homesections.js",
+          "src/components/htmlMediaHelper.js",
+          "src/components/imageOptionsEditor/imageOptionsEditor.js",
           "src/components/images/imageLoader.js",
+          "src/components/imageUploader/imageUploader.js",
+          "src/components/indicators/indicators.js",
+          "src/components/itemContextMenu.js",
+          "src/components/itemidentifier/itemidentifier.js",
+          "src/components/itemMediaInfo/itemMediaInfo.js",
           "src/components/lazyLoader/lazyLoaderIntersectionObserver.js",
+          "src/components/libraryoptionseditor/libraryoptionseditor.js",
+          "src/components/listview/listview.js",
+          "src/components/maintabsmanager.js",
+          "src/components/mediainfo/mediainfo.js",
+          "src/components/mediaLibraryCreator/mediaLibraryCreator.js",
+          "src/components/mediaLibraryEditor/mediaLibraryEditor.js",
+          "src/components/metadataEditor/metadataEditor.js",
+          "src/components/metadataEditor/personEditor.js",
+          "src/components/multiSelect/multiSelect.js",
+          "src/components/nowPlayingBar/nowPlayingBar.js",
+          "src/components/playback/brightnessosd.js",
           "src/components/playback/mediasession.js",
+          "src/components/playback/nowplayinghelper.js",
+          "src/components/playback/playbackorientation.js",
+          "src/components/playback/playerSelectionMenu.js",
+          "src/components/playback/playersettingsmenu.js",
+          "src/components/playback/playmethodhelper.js",
+          "src/components/playback/remotecontrolautoplay.js",
+          "src/components/playback/volumeosd.js",
+          "src/components/playbackSettings/playbackSettings.js",
+          "src/components/playerstats/playerstats.js",
+          "src/components/playlisteditor/playlisteditor.js",
+          "src/components/playmenu.js",
+          "src/components/prompt/prompt.js",
           "src/components/sanatizefilename.js",
           "src/components/scrollManager.js",
-          "src/components/syncplay/playbackPermissionManager.js",
-          "src/components/syncplay/groupSelectionMenu.js",
-          "src/components/syncplay/timeSyncManager.js",
-          "src/components/syncplay/syncPlayManager.js",
+          "src/components/search/searchfields.js",
+          "src/components/search/searchresults.js",
+          "src/components/settingshelper.js",
+          "src/components/shortcuts.js",
+          "src/components/subtitlesettings/subtitleappearancehelper.js",
+          "src/components/subtitlesettings/subtitlesettings.js",
+          "src/components/syncPlay/groupSelectionMenu.js",
+          "src/components/syncPlay/playbackPermissionManager.js",
+          "src/components/syncPlay/syncPlayManager.js",
+          "src/components/syncPlay/timeSyncManager.js",
+          "src/controllers/session/addServer/index.js",
+          "src/controllers/session/forgotPassword/index.js",
+          "src/controllers/session/redeemPassword/index.js",
+          "src/controllers/session/login/index.js",
+          "src/controllers/sessopm/selectServer/index.js",
+          "src/controllers/dashboard/apikeys.js",
+          "src/controllers/dashboard/dashboard.js",
+          "src/controllers/dashboard/devices/device.js",
+          "src/controllers/dashboard/devices/devices.js",
+          "src/controllers/dashboard/dlna/profile.js",
+          "src/controllers/dashboard/dlna/profiles.js",
+          "src/controllers/dashboard/dlna/settings.js",
+          "src/controllers/dashboard/encodingsettings.js",
+          "src/controllers/dashboard/general.js",
+          "src/controllers/dashboard/librarydisplay.js",
+          "src/controllers/dashboard/logs.js",
+          "src/controllers/dashboard/mediaLibrary.js",
+          "src/controllers/dashboard/metadataImages.js",
+          "src/controllers/dashboard/metadatanfo.js",
+          "src/controllers/dashboard/networking.js",
+          "src/controllers/dashboard/playback.js",
+          "src/controllers/dashboard/plugins/repositories/index.js",
+          "src/controllers/dashboard/scheduledtasks/scheduledtask.js",
+          "src/controllers/dashboard/scheduledtasks/scheduledtasks.js",
+          "src/controllers/dashboard/serveractivity.js",
+          "src/controllers/dashboard/streaming.js",
+          "src/controllers/dashboard/users/useredit.js",
+          "src/controllers/dashboard/users/userlibraryaccess.js",
+          "src/controllers/dashboard/users/usernew.js",
+          "src/controllers/dashboard/users/userparentalcontrol.js",
+          "src/controllers/dashboard/users/userpasswordpage.js",
+          "src/controllers/dashboard/users/userprofilespage.js",
+          "src/controllers/playback/queue/index.js",
+          "src/controllers/playback/video/index.js",
+          "src/controllers/searchpage.js",
+          "src/controllers/shows/episodes.js",
+          "src/controllers/shows/tvgenres.js",
+          "src/controllers/shows/tvlatest.js",
+          "src/controllers/shows/tvrecommended.js",
+          "src/controllers/shows/tvshows.js",
+          "src/controllers/shows/tvstudios.js",
+          "src/controllers/shows/tvupcoming.js",
+          "src/controllers/user/display/index.js",
+          "src/controllers/user/home/index.js",
+          "src/controllers/user/menu/index.js",
+          "src/controllers/user/playback/index.js",
+          "src/controllers/user/profile/index.js",
+          "src/controllers/user/subtitles/index.js",
+          "src/controllers/user/subtitles/index.js",
+          "src/controllers/wizard/finish/index.js",
+          "src/controllers/wizard/remote/index.js",
+          "src/controllers/wizard/settings/index.js",
+          "src/controllers/wizard/start/index.js",
+          "src/controllers/wizard/user/index.js",
+          "src/elements/emby-button/emby-button.js",
+          "src/elements/emby-button/paper-icon-button-light.js",
+          "src/elements/emby-checkbox/emby-checkbox.js",
+          "src/elements/emby-collapse/emby-collapse.js",
+          "src/elements/emby-input/emby-input.js",
+          "src/elements/emby-itemrefreshindicator/emby-itemrefreshindicator.js",
+          "src/elements/emby-itemscontainer/emby-itemscontainer.js",
+          "src/elements/emby-playstatebutton/emby-playstatebutton.js",
+          "src/elements/emby-programcell/emby-programcell.js",
+          "src/elements/emby-progressbar/emby-progressbar.js",
+          "src/elements/emby-progressring/emby-progressring.js",
+          "src/elements/emby-radio/emby-radio.js",
+          "src/elements/emby-ratingbutton/emby-ratingbutton.js",
+          "src/elements/emby-scrollbuttons/emby-scrollbuttons.js",
+          "src/elements/emby-scroller/emby-scroller.js",
+          "src/elements/emby-select/emby-select.js",
+          "src/elements/emby-slider/emby-slider.js",
+          "src/elements/emby-tabs/emby-tabs.js",
+          "src/elements/emby-textarea/emby-textarea.js",
+          "src/elements/emby-toggle/emby-toggle.js",
+          "src/plugins/backdropScreensaver/plugin.js",
+          "src/plugins/bookPlayer/plugin.js",
+          "src/plugins/bookPlayer/tableOfContents.js",
+          "src/plugins/photoPlayer/plugin.js",
+          "src/plugins/youtubePlayer/plugin.js",
+          "src/scripts/alphanumericshortcuts.js",
+          "src/scripts/autoBackdrops.js",
+          "src/scripts/datetime.js",
+          "src/scripts/deleteHelper.js",
           "src/scripts/dfnshelper.js",
           "src/scripts/dom.js",
+          "src/scripts/editorsidebar.js",
+          "src/scripts/fileDownloader.js",
           "src/scripts/filesystem.js",
+          "src/scripts/globalize.js",
           "src/scripts/imagehelper.js",
           "src/scripts/inputManager.js",
-          "src/scripts/deleteHelper.js",
-          "src/components/actionSheet/actionSheet.js",
-          "src/components/playmenu.js",
-          "src/components/indicators/indicators.js",
           "src/scripts/keyboardNavigation.js",
+          "src/scripts/playlists.js",
           "src/scripts/settings/appSettings.js",
           "src/scripts/settings/userSettings.js",
-          "src/scripts/settings/webSettings.js"
+          "src/scripts/settings/webSettings.js",
+          "src/scripts/taskbutton.js",
+          "src/scripts/themeLoader.js",
+          "src/scripts/touchHelper.js"
         ],
         "plugins": [
-          "@babel/plugin-transform-modules-amd"
+          "@babel/plugin-transform-modules-amd",
+          "@babel/plugin-proposal-class-properties",
+          "@babel/plugin-proposal-private-methods"
         ]
       }
     ]
diff --git a/src/assets/css/dashboard.css b/src/assets/css/dashboard.css
index 894d7332f4..48e6fe807e 100644
--- a/src/assets/css/dashboard.css
+++ b/src/assets/css/dashboard.css
@@ -235,6 +235,15 @@ div[data-role=controlgroup] a.ui-btn-active {
     width: 50%;
 }
 
+.localUsers .cardText-secondary {
+    white-space: pre-wrap;
+    height: 3em;
+}
+
+.customCssContainer textarea {
+    resize: none;
+}
+
 @media all and (min-width: 70em) {
     .dashboardSections {
         -webkit-flex-wrap: wrap;
diff --git a/src/assets/css/flexstyles.css b/src/assets/css/flexstyles.css
index a5a479f2f5..429ed7a650 100644
--- a/src/assets/css/flexstyles.css
+++ b/src/assets/css/flexstyles.css
@@ -30,6 +30,10 @@
     align-items: flex-start;
 }
 
+.align-items-flex-end {
+    align-items: flex-end;
+}
+
 .justify-content-center {
     justify-content: center;
 }
@@ -38,6 +42,10 @@
     justify-content: flex-end;
 }
 
+.justify-content-space-between {
+    justify-content: space-between;
+}
+
 .flex-wrap-wrap {
     flex-wrap: wrap;
 }
diff --git a/src/assets/css/ios.css b/src/assets/css/ios.css
index 57de0c5fdd..2b61f49a4e 100644
--- a/src/assets/css/ios.css
+++ b/src/assets/css/ios.css
@@ -1,8 +1,3 @@
 html {
     font-size: 82% !important;
 }
-
-.formDialogFooter {
-    position: static !important;
-    margin: 0 -1em !important;
-}
diff --git a/src/assets/css/librarybrowser.css b/src/assets/css/librarybrowser.css
index 82e704f074..61815a590f 100644
--- a/src/assets/css/librarybrowser.css
+++ b/src/assets/css/librarybrowser.css
@@ -24,10 +24,6 @@
     padding-top: 7em !important;
 }
 
-.layout-mobile .libraryPage {
-    padding-top: 4em !important;
-}
-
 .itemDetailPage {
     padding-top: 0 !important;
 }
@@ -164,6 +160,7 @@
     display: flex;
     flex-direction: column;
     contain: layout style paint;
+    transition: background ease-in-out 0.5s;
 }
 
 .hiddenViewMenuBar .skinHeader {
@@ -178,6 +175,10 @@
     width: 100%;
 }
 
+.layout-tv .sectionTabs {
+    width: 55%;
+}
+
 .selectedMediaFolder {
     background-color: #f2f2f2 !important;
 }
@@ -272,7 +273,7 @@
     }
 }
 
-@media all and (max-width: 84em) {
+@media all and (max-width: 100em) {
     .withSectionTabs .headerTop {
         padding-bottom: 0.55em;
     }
@@ -280,9 +281,13 @@
     .sectionTabs {
         font-size: 83.5%;
     }
+
+    .layout-tv .sectionTabs {
+        width: 100%;
+    }
 }
 
-@media all and (min-width: 84em) {
+@media all and (min-width: 100em) {
     .headerTop {
         padding: 0.8em 0.8em;
     }
@@ -438,12 +443,14 @@
     background-repeat: no-repeat;
     background-position: center;
     background-attachment: fixed;
-    height: 50vh;
+    height: 40vh;
     position: relative;
+    animation: backdrop-fadein 800ms ease-in normal both;
 }
 
 .layout-mobile .itemBackdrop {
     background-attachment: scroll;
+    height: 26.5vh;
 }
 
 .layout-desktop .itemBackdrop::after,
@@ -463,10 +470,20 @@
 .detailPageContent {
     display: flex;
     flex-direction: column;
-    padding-left: 2%;
+    padding-left: 32.45vw;
     padding-right: 2%;
 }
 
+.layout-mobile .detailPageContent {
+    padding-left: 5%;
+    padding-right: 5%;
+}
+
+.layout-desktop .detailPageContent .emby-scroller,
+.layout-tv .detailPageContent .emby-scroller {
+    margin-left: 0;
+}
+
 .layout-desktop .noBackdrop .detailPageContent,
 .layout-tv .noBackdrop .detailPageContent {
     margin-top: 2.5em;
@@ -477,6 +494,10 @@
     margin-top: 0;
 }
 
+.detailSectionContent a {
+    color: inherit;
+}
+
 .personBackdrop {
     background-size: contain;
 }
@@ -495,7 +516,23 @@
 
 .parentName {
     display: block;
-    margin-bottom: 0.5em;
+    margin: 0 0 0;
+}
+
+.layout-mobile .parentName {
+    margin: 0.6em 0 0;
+}
+
+.musicParentName {
+    margin: 0.15em 0 0.2em;
+}
+
+.layout-mobile .musicParentName {
+    margin: -0.25em 0 0.25em;
+}
+
+.layout-mobile .itemExternalLinks {
+    display: none;
 }
 
 .mainDetailButtons {
@@ -503,8 +540,6 @@
     -webkit-box-align: center;
     -webkit-align-items: center;
     align-items: center;
-    -webkit-flex-wrap: wrap;
-    flex-wrap: wrap;
     margin: 1em 0;
 }
 
@@ -520,6 +555,35 @@
     font-weight: 600;
 }
 
+.itemName.originalTitle {
+    margin: 0.2em 0 0.2em;
+}
+
+.itemName.parentNameLast {
+    margin: 0 0 0;
+}
+
+.layout-mobile .itemName.parentNameLast {
+    margin: 0.4em 0 0.4em;
+}
+
+.layout-mobile h1.itemName,
+.layout-mobile h1.parentName {
+    font-size: 1.6em;
+}
+
+.itemName.parentNameLast.withOriginalTitle {
+    margin: 0 0 0;
+}
+
+.layout-mobile .itemName.parentNameLast.withOriginalTitle {
+    margin: 0.6em 0 0;
+}
+
+.layout-mobile .itemName.originalTitle {
+    margin: 0.5em 0 0.5em;
+}
+
 .nameContainer {
     display: flex;
     flex-direction: column;
@@ -546,6 +610,19 @@
     text-align: center;
 }
 
+.layout-mobile .mainDetailButtons {
+    margin-top: 1em;
+    margin-bottom: 0.5em;
+}
+
+.subtitle {
+    margin: 0.15em 0 0.2em;
+}
+
+.layout-mobile .subtitle {
+    margin: 0.2em 0 0.2em;
+}
+
 .detailPagePrimaryContainer {
     display: flex;
     align-items: center;
@@ -556,7 +633,7 @@
 .layout-mobile .detailPagePrimaryContainer {
     display: block;
     position: relative;
-    top: 0;
+    padding: 0.5em 3.3% 0.5em;
 }
 
 .layout-tv #itemDetailPage:not(.noBackdrop) .detailPagePrimaryContainer,
@@ -566,13 +643,14 @@
     padding-left: 32.45vw;
 }
 
-.layout-desktop .detailSticky,
-.layout-tv .detailSticky {
+.layout-desktop .detailRibbon,
+.layout-tv .detailRibbon {
     margin-top: -7.2em;
+    height: 7.18em;
 }
 
-.layout-desktop .noBackdrop .detailSticky,
-.layout-tv .noBackdrop .detailSticky {
+.layout-desktop .noBackdrop .detailRibbon,
+.layout-tv .noBackdrop .detailRibbon {
     margin-top: 0;
 }
 
@@ -584,6 +662,9 @@
     white-space: nowrap;
     text-overflow: ellipsis;
     text-align: left;
+    min-width: 0;
+    max-width: 100%;
+    overflow: hidden;
 }
 
 .layout-mobile .infoText {
@@ -594,12 +675,29 @@
     margin: 1.25em 0;
 }
 
-.detailImageContainer {
-    position: relative;
-    margin-top: -25vh;
+.layout-mobile .detailPageSecondaryContainer {
+    margin: 1em 0;
+}
+
+.layout-mobile .detailImageContainer {
+    display: none;
+}
+
+.detailImageContainer .card {
+    position: absolute;
+    top: 50%;
     float: left;
     width: 25vw;
     z-index: 3;
+    transform: translateY(-50%);
+}
+
+.detailImageContainer .card.backdropCard {
+    top: 35%;
+}
+
+.detailImageContainer .card.squareCard {
+    top: 40%;
 }
 
 .layout-desktop .noBackdrop .detailImageContainer,
@@ -612,11 +710,11 @@
 }
 
 .detailLogo {
-    width: 30vw;
-    height: 25vh;
+    width: 25vw;
+    height: 16vh;
     position: absolute;
     top: 10vh;
-    right: 20vw;
+    right: 25vw;
     background-size: contain;
 }
 
@@ -641,7 +739,8 @@ div.itemDetailGalleryLink.defaultCardBackground {
 }
 
 .itemDetailGalleryLink.defaultCardBackground {
-    height: 23vw; /* Dirty hack to get it to look somewhat square. Less than ideal. */
+    /* Dirty hack to get it to look somewhat square. Less than ideal. */
+    height: 23vw;
 }
 
 .itemDetailGalleryLink.defaultCardBackground > .material-icons {
@@ -655,14 +754,19 @@ div.itemDetailGalleryLink.defaultCardBackground {
         position: relative;
     }
 
-    .layout-desktop .detailPageWrapperContainer,
-    .layout-tv .detailPageWrapperContainer {
-        margin-top: 7.2em;
+    .layout-desktop .itemBackdrop,
+    .layout-tv .itemBackdrop {
+        height: 40vh;
     }
 
-    .layout-tv #itemDetailPage:not(.noBackdrop) .detailPagePrimaryContainer,
-    .layout-desktop #itemDetailPage:not(.noBackdrop) .detailPagePrimaryContainer {
-        padding-left: 3.3%;
+    .layout-desktop .detailPageWrapperContainer,
+    .layout-tv .detailPageWrapperContainer {
+        margin-top: 0.1em;
+    }
+
+    .layout-desktop .detailImageContainer .card,
+    .layout-tv .detailImageContainer .card {
+        top: 10%;
     }
 
     .btnPlaySimple {
@@ -678,12 +782,12 @@ div.itemDetailGalleryLink.defaultCardBackground {
 
 .emby-button.detailFloatingButton {
     position: absolute;
-    background-color: rgba(0, 0, 0, 0.5) !important;
-    z-index: 1;
-    top: 50%;
-    left: 50%;
+    background-color: rgba(0, 0, 0, 0.5);
+    z-index: 3;
+    top: 100%;
+    left: 90%;
     margin: -2.2em 0 0 -2.2em;
-    padding: 0.4em !important;
+    padding: 0.4em;
     color: rgba(255, 255, 255, 0.76);
 }
 
@@ -693,16 +797,12 @@ div.itemDetailGalleryLink.defaultCardBackground {
 
 @media all and (max-width: 62.5em) {
     .parentName {
-        margin-bottom: 1em;
+        margin-bottom: 0;
     }
 
     .itemDetailPage {
         padding-top: 0 !important;
     }
-
-    .detailimg-hidemobile {
-        display: none;
-    }
 }
 
 @media all and (min-width: 31.25em) {
@@ -797,9 +897,9 @@ div.itemDetailGalleryLink.defaultCardBackground {
 }
 
 .detailImageProgressContainer {
-    position: absolute;
     bottom: 0;
-    width: 22.786458333333332vw;
+    margin-top: -0.4vw;
+    width: 100%;
 }
 
 .detailButton-text {
@@ -818,21 +918,7 @@ div.itemDetailGalleryLink.defaultCardBackground {
     }
 }
 
-@media all and (min-width: 62.5em) {
-    .headerTop {
-        padding-left: 0.8em;
-        padding-right: 0.8em;
-    }
-
-    .headerTabs {
-        align-self: center;
-        width: auto;
-        align-items: center;
-        justify-content: center;
-        margin-top: -4.2em;
-        position: relative;
-    }
-
+@media all and (min-width: 100em) {
     .detailFloatingButton {
         display: none !important;
     }
@@ -866,6 +952,10 @@ div.itemDetailGalleryLink.defaultCardBackground {
     }
 }
 
+.detailVerticalSection .emby-scrollbuttons {
+    padding-top: 0.4em;
+}
+
 .layout-tv .detailVerticalSection {
     margin-bottom: 3.4em !important;
 }
@@ -954,6 +1044,10 @@ div.itemDetailGalleryLink.defaultCardBackground {
     margin-bottom: 2.7em;
 }
 
+.layout-mobile .verticalSection-extrabottompadding {
+    margin-bottom: 1em;
+}
+
 .sectionTitleButton,
 .sectionTitleIconButton {
     margin-right: 0 !important;
@@ -979,7 +1073,13 @@ div.itemDetailGalleryLink.defaultCardBackground {
 
 div:not(.sectionTitleContainer-cards) > .sectionTitle-cards {
     margin: 0;
-    padding-top: 1.25em;
+    padding-top: 0.5em;
+    padding-bottom: 0.2em;
+}
+
+.layout-mobile :not(.sectionTitleContainer-cards) > .sectionTitle-cards {
+    margin: 0;
+    padding-top: 0.5em;
 }
 
 .sectionTitleButton {
@@ -1132,6 +1232,12 @@ div:not(.sectionTitleContainer-cards) > .sectionTitle-cards {
 
 .trackSelections .selectContainer .selectLabel {
     margin: 0 0.2em 0 0;
+    line-height: 1.75;
+}
+
+.layout-mobile .detailsGroupItem .label,
+.layout-mobile .trackSelections .selectContainer .selectLabel {
+    flex-basis: 4.5em;
 }
 
 .trackSelections .selectContainer .detailTrackSelect {
@@ -1144,3 +1250,21 @@ div:not(.sectionTitleContainer-cards) > .sectionTitle-cards {
     margin-top: 0;
     font-size: 1.4em;
 }
+
+.overview-controls {
+    display: flex;
+    justify-content: flex-end;
+}
+
+.detail-clamp-text {
+    overflow: hidden;
+    display: -webkit-box;
+    -webkit-line-clamp: 12;
+    -webkit-box-orient: vertical;
+}
+
+@media all and (min-width: 40em) {
+    .detail-clamp-text {
+        -webkit-line-clamp: 6;
+    }
+}
diff --git a/src/assets/css/scrollstyles.css b/src/assets/css/scrollstyles.css
index 1cb3207e06..67c6202252 100644
--- a/src/assets/css/scrollstyles.css
+++ b/src/assets/css/scrollstyles.css
@@ -12,6 +12,7 @@
 .hiddenScrollX,
 .layout-tv .scrollX {
     -ms-overflow-style: none;
+    scrollbar-width: none;
 }
 
 .hiddenScrollX-forced {
@@ -40,6 +41,7 @@
 .hiddenScrollY,
 .layout-tv .smoothScrollY {
     -ms-overflow-style: none;
+    scrollbar-width: none;
 
     /* Can't do this because it not only hides the scrollbar, but also prevents scrolling */
 
diff --git a/src/assets/css/site.css b/src/assets/css/site.css
index d489f77f01..38e056df89 100644
--- a/src/assets/css/site.css
+++ b/src/assets/css/site.css
@@ -5,6 +5,12 @@ html {
     height: 100%;
 }
 
+.layout-mobile,
+.layout-tv {
+    -webkit-touch-callout: none;
+    user-select: none;
+}
+
 .clipForScreenReader {
     clip: rect(1px, 1px, 1px, 1px);
     clip-path: inset(50%);
@@ -18,7 +24,7 @@ html {
 
 .material-icons {
     /* Fix font ligatures on older WebOS versions */
-    -webkit-font-feature-settings: "liga";
+    font-feature-settings: "liga";
 }
 
 .backgroundContainer {
@@ -34,16 +40,6 @@ html {
     line-height: 1.35;
 }
 
-.layout-mobile,
-.layout-tv {
-    -webkit-touch-callout: none;
-    -webkit-user-select: none;
-    -khtml-user-select: none;
-    -moz-user-select: none;
-    -ms-user-select: none;
-    user-select: none;
-}
-
 body {
     overflow-x: hidden;
     background-color: transparent !important;
@@ -121,6 +117,11 @@ div[data-role=page] {
     transform: translateY(-100%);
 }
 
+.drawerContent {
+    /* make sure the bottom of the drawer is visible when music is playing */
+    padding-bottom: 4em;
+}
+
 .force-scroll {
     overflow-y: scroll;
 }
@@ -128,3 +129,17 @@ div[data-role=page] {
 .hide-scroll {
     overflow-y: hidden;
 }
+
+.w-100 {
+    width: 100%;
+}
+
+.margin-auto-x {
+    margin-left: auto;
+    margin-right: auto;
+}
+
+.margin-auto-y {
+    margin-top: auto;
+    margin-bottom: auto;
+}
diff --git a/src/bundle.js b/src/bundle.js
index d7ba6c6a51..dd1ff6548b 100644
--- a/src/bundle.js
+++ b/src/bundle.js
@@ -4,18 +4,18 @@
 // Use define from require.js not webpack's define
 var _define = window.define;
 
-// document-register-element
-var docRegister = require('document-register-element');
-_define('document-register-element', function() {
-    return docRegister;
-});
-
 // fetch
 var fetch = require('whatwg-fetch');
 _define('fetch', function() {
     return fetch;
 });
 
+// Blurhash
+var blurhash = require('blurhash');
+_define('blurhash', function() {
+    return blurhash;
+});
+
 // query-string
 var query = require('query-string');
 _define('queryString', function() {
@@ -59,12 +59,6 @@ _define('resize-observer-polyfill', function() {
     return resize;
 });
 
-// shaka
-var shaka = require('shaka-player');
-_define('shaka', function() {
-    return shaka;
-});
-
 // swiper
 var swiper = require('swiper/js/swiper');
 require('swiper/css/swiper.min.css');
@@ -84,6 +78,12 @@ _define('webcomponents', function() {
     return webcomponents;
 });
 
+// shaka
+var shaka = require('shaka-player');
+_define('shaka', function() {
+    return shaka;
+});
+
 // libass-wasm
 var libassWasm = require('libass-wasm');
 _define('JavascriptSubtitlesOctopus', function() {
@@ -102,6 +102,11 @@ _define('jellyfin-noto', function () {
     return noto;
 });
 
+var epubjs = require('epubjs');
+_define('epubjs', function () {
+    return epubjs;
+});
+
 // page.js
 var page = require('page');
 _define('page', function() {
diff --git a/src/components/accessSchedule/accessSchedule.js b/src/components/accessSchedule/accessSchedule.js
index 2209f57615..6b96aad1d4 100644
--- a/src/components/accessSchedule/accessSchedule.js
+++ b/src/components/accessSchedule/accessSchedule.js
@@ -1,9 +1,20 @@
-define(['dialogHelper', 'datetime', 'globalize', 'emby-select', 'paper-icon-button-light', 'formDialogStyle'], function (dialogHelper, datetime, globalize) {
-    'use strict';
+/* eslint-disable indent */
+
+/**
+ * Module for controlling user parental control from.
+ * @module components/accessSchedule/accessSchedule
+ */
+
+import dialogHelper from 'dialogHelper';
+import datetime from 'datetime';
+import globalize from 'globalize';
+import 'emby-select';
+import 'paper-icon-button-light';
+import 'formDialogStyle';
 
     function getDisplayTime(hours) {
-        var minutes = 0;
-        var pct = hours % 1;
+        let minutes = 0;
+        const pct = hours % 1;
 
         if (pct) {
             minutes = parseInt(60 * pct);
@@ -13,25 +24,25 @@ define(['dialogHelper', 'datetime', 'globalize', 'emby-select', 'paper-icon-butt
     }
 
     function populateHours(context) {
-        var html = '';
+        let html = '';
 
-        for (var i = 0; i < 24; i++) {
-            html += '<option value="' + i + '">' + getDisplayTime(i) + '</option>';
+        for (let i = 0; i < 24; i++) {
+            html += `<option value="${i}">${getDisplayTime(i)}</option>`;
         }
 
-        html += '<option value="24">' + getDisplayTime(0) + '</option>';
+        html += `<option value="24">${getDisplayTime(0)}</option>`;
         context.querySelector('#selectStart').innerHTML = html;
         context.querySelector('#selectEnd').innerHTML = html;
     }
 
-    function loadSchedule(context, schedule) {
-        context.querySelector('#selectDay').value = schedule.DayOfWeek || 'Sunday';
-        context.querySelector('#selectStart').value = schedule.StartHour || 0;
-        context.querySelector('#selectEnd').value = schedule.EndHour || 0;
+    function loadSchedule(context, {DayOfWeek, StartHour, EndHour}) {
+        context.querySelector('#selectDay').value = DayOfWeek || 'Sunday';
+        context.querySelector('#selectStart').value = StartHour || 0;
+        context.querySelector('#selectEnd').value = EndHour || 0;
     }
 
     function submitSchedule(context, options) {
-        var updatedSchedule = {
+        const updatedSchedule = {
             DayOfWeek: context.querySelector('#selectDay').value,
             StartHour: context.querySelector('#selectStart').value,
             EndHour: context.querySelector('#selectEnd').value
@@ -46,44 +57,41 @@ define(['dialogHelper', 'datetime', 'globalize', 'emby-select', 'paper-icon-butt
         dialogHelper.close(context);
     }
 
-    return {
-        show: function (options) {
-            return new Promise(function (resolve, reject) {
-                var xhr = new XMLHttpRequest();
-                xhr.open('GET', 'components/accessSchedule/accessSchedule.template.html', true);
-
-                xhr.onload = function (e) {
-                    var template = this.response;
-                    var dlg = dialogHelper.createDialog({
-                        removeOnClose: true,
-                        size: 'small'
-                    });
-                    dlg.classList.add('formDialog');
-                    var html = '';
-                    html += globalize.translateDocument(template);
-                    dlg.innerHTML = html;
-                    populateHours(dlg);
-                    loadSchedule(dlg, options.schedule);
-                    dialogHelper.open(dlg);
-                    dlg.addEventListener('close', function () {
-                        if (dlg.submitted) {
-                            resolve(options.schedule);
-                        } else {
-                            reject();
-                        }
-                    });
-                    dlg.querySelector('.btnCancel').addEventListener('click', function (e) {
-                        dialogHelper.close(dlg);
-                    });
-                    dlg.querySelector('form').addEventListener('submit', function (e) {
-                        submitSchedule(dlg, options);
-                        e.preventDefault();
-                        return false;
-                    });
-                };
-
-                xhr.send();
+    export function show(options) {
+        return new Promise((resolve, reject) => {
+            import('text!./accessSchedule.template.html').then(({default: template}) => {
+                const dlg = dialogHelper.createDialog({
+                    removeOnClose: true,
+                    size: 'small'
+                });
+                dlg.classList.add('formDialog');
+                let html = '';
+                html += globalize.translateHtml(template);
+                dlg.innerHTML = html;
+                populateHours(dlg);
+                loadSchedule(dlg, options.schedule);
+                dialogHelper.open(dlg);
+                dlg.addEventListener('close', () => {
+                    if (dlg.submitted) {
+                        resolve(options.schedule);
+                    } else {
+                        reject();
+                    }
+                });
+                dlg.querySelector('.btnCancel').addEventListener('click', () => {
+                    dialogHelper.close(dlg);
+                });
+                dlg.querySelector('form').addEventListener('submit', event => {
+                    submitSchedule(dlg, options);
+                    event.preventDefault();
+                    return false;
+                });
             });
-        }
-    };
-});
+        });
+    }
+
+/* eslint-enable indent */
+
+export default {
+    show: show
+};
diff --git a/src/components/actionSheet/actionSheet.js b/src/components/actionSheet/actionSheet.js
index 9f916d097e..a68d6a6acd 100644
--- a/src/components/actionSheet/actionSheet.js
+++ b/src/components/actionSheet/actionSheet.js
@@ -16,15 +16,8 @@ function getOffsets(elems) {
         return results;
     }
 
-    let box;
-    for (let elem of elems) {
-        // Support: BlackBerry 5, iOS 3 (original iPhone)
-        // If we don't have gBCR, just use 0,0 rather than error
-        if (elem.getBoundingClientRect) {
-            box = elem.getBoundingClientRect();
-        } else {
-            box = { top: 0, left: 0 };
-        }
+    for (const elem of elems) {
+        let box = elem.getBoundingClientRect();
 
         results.push({
             top: box.top,
@@ -80,7 +73,7 @@ function getPosition(options, dlg) {
 }
 
 function centerFocus(elem, horiz, on) {
-    require(['scrollHelper'], function (scrollHelper) {
+    import('scrollHelper').then(({default: scrollHelper}) => {
         const fn = on ? 'on' : 'off';
         scrollHelper.centerFocus[fn](elem, horiz);
     });
@@ -142,7 +135,7 @@ export function show(options) {
     let renderIcon = false;
     let icons = [];
     let itemIcon;
-    for (let item of options.items) {
+    for (const item of options.items) {
 
         itemIcon = item.icon || (item.selected ? 'check' : null);
 
@@ -153,7 +146,9 @@ export function show(options) {
     }
 
     if (layoutManager.tv) {
-        html += '<button is="paper-icon-button-light" class="btnCloseActionSheet hide-mouse-idle-tv" tabindex="-1"><span class="material-icons arrow_back"></span></button>';
+        html += `<button is="paper-icon-button-light" class="btnCloseActionSheet hide-mouse-idle-tv" tabindex="-1">
+                     <span class="material-icons arrow_back"></span>
+                 </button>`;
     }
 
     // If any items have an icon, give them all an icon just to make sure they're all lined up evenly
@@ -216,7 +211,7 @@ export function show(options) {
         itemIcon = icons[i];
 
         if (itemIcon) {
-            html += '<span class="actionsheetMenuItemIcon listItemIcon listItemIcon-transparent material-icons ' + itemIcon + '"></span>';
+            html += `<span class="actionsheetMenuItemIcon listItemIcon listItemIcon-transparent material-icons ${itemIcon}"></span>`;
         } else if (renderIcon && !center) {
             html += '<span class="actionsheetMenuItemIcon listItemIcon listItemIcon-transparent material-icons check" style="visibility:hidden;"></span>';
         }
@@ -228,13 +223,13 @@ export function show(options) {
         html += '</div>';
 
         if (item.secondaryText) {
-            html += '<div class="listItemBodyText secondary">' + item.secondaryText + '</div>';
+            html += `<div class="listItemBodyText secondary">${item.secondaryText}</div>`;
         }
 
         html += '</div>';
 
         if (item.asideText) {
-            html += '<div class="listItemAside actionSheetItemAsideText">' + item.asideText + '</div>';
+            html += `<div class="listItemAside actionSheetItemAsideText">${item.asideText}</div>`;
         }
 
         html += '</button>';
@@ -242,7 +237,7 @@ export function show(options) {
 
     if (options.showCancel) {
         html += '<div class="buttons">';
-        html += '<button is="emby-button" type="button" class="btnCloseActionSheet">' + globalize.translate('ButtonCancel') + '</button>';
+        html += `<button is="emby-button" type="button" class="btnCloseActionSheet">${globalize.translate('ButtonCancel')}</button>`;
         html += '</div>';
     }
     html += '</div>';
diff --git a/src/components/activitylog.js b/src/components/activitylog.js
index a7b3f48bc2..2d5a21756f 100644
--- a/src/components/activitylog.js
+++ b/src/components/activitylog.js
@@ -1,11 +1,21 @@
-define(['events', 'globalize', 'dom', 'date-fns', 'dfnshelper', 'userSettings', 'serverNotifications', 'connectionManager', 'emby-button', 'listViewStyle'], function (events, globalize, dom, datefns, dfnshelper, userSettings, serverNotifications, connectionManager) {
-    'use strict';
+import events from 'events';
+import globalize from 'globalize';
+import dom from 'dom';
+import * as datefns from 'date-fns';
+import dfnshelper from 'dfnshelper';
+import userSettings from 'userSettings';
+import serverNotifications from 'serverNotifications';
+import connectionManager from 'connectionManager';
+import 'emby-button';
+import 'listViewStyle';
+
+/* eslint-disable indent */
 
     function getEntryHtml(entry, apiClient) {
-        var html = '';
+        let html = '';
         html += '<div class="listItem listItem-border">';
-        var color = '#00a4dc';
-        var icon = 'notifications';
+        let color = '#00a4dc';
+        let icon = 'notifications';
 
         if ('Error' == entry.Severity || 'Fatal' == entry.Severity || 'Warn' == entry.Severity) {
             color = '#cc0000';
@@ -34,10 +44,14 @@ define(['events', 'globalize', 'dom', 'date-fns', 'dfnshelper', 'userSettings',
         html += '</div>';
 
         if (entry.Overview) {
-            html += '<button type="button" is="paper-icon-button-light" class="btnEntryInfo" data-id="' + entry.Id + '" title="' + globalize.translate('Info') + '"><span class="material-icons info"></span></button>';
+            html += `<button type="button" is="paper-icon-button-light" class="btnEntryInfo" data-id="${entry.Id}" title="${globalize.translate('Info')}">
+                       <span class="material-icons info"></span>
+                    </button>`;
         }
 
-        return html += '</div>';
+        html += '</div>';
+
+        return html;
     }
 
     function renderList(elem, apiClient, result, startIndex, limit) {
@@ -52,8 +66,8 @@ define(['events', 'globalize', 'dom', 'date-fns', 'dfnshelper', 'userSettings',
         }
 
         limit = limit || parseInt(elem.getAttribute('data-activitylimit') || '7');
-        var minDate = new Date();
-        var hasUserId = 'false' !== elem.getAttribute('data-useractivity');
+        const minDate = new Date();
+        const hasUserId = 'false' !== elem.getAttribute('data-useractivity');
 
         if (hasUserId) {
             minDate.setTime(minDate.getTime() - 24 * 60 * 60 * 1000); // one day back
@@ -70,7 +84,7 @@ define(['events', 'globalize', 'dom', 'date-fns', 'dfnshelper', 'userSettings',
             elem.setAttribute('data-activitystartindex', startIndex);
             elem.setAttribute('data-activitylimit', limit);
             if (!startIndex) {
-                var activityContainer = dom.parentWithClass(elem, 'activityContainer');
+                const activityContainer = dom.parentWithClass(elem, 'activityContainer');
 
                 if (activityContainer) {
                     if (result.Items.length) {
@@ -87,7 +101,7 @@ define(['events', 'globalize', 'dom', 'date-fns', 'dfnshelper', 'userSettings',
     }
 
     function onActivityLogUpdate(e, apiClient, data) {
-        var options = this.options;
+        const options = this.options;
 
         if (options && options.serverId === apiClient.serverId()) {
             reloadData(this, options.element, apiClient);
@@ -95,14 +109,14 @@ define(['events', 'globalize', 'dom', 'date-fns', 'dfnshelper', 'userSettings',
     }
 
     function onListClick(e) {
-        var btnEntryInfo = dom.parentWithClass(e.target, 'btnEntryInfo');
+        const btnEntryInfo = dom.parentWithClass(e.target, 'btnEntryInfo');
 
         if (btnEntryInfo) {
-            var id = btnEntryInfo.getAttribute('data-id');
-            var items = this.items;
+            const id = btnEntryInfo.getAttribute('data-id');
+            const items = this.items;
 
             if (items) {
-                var item = items.filter(function (i) {
+                const item = items.filter(function (i) {
                     return i.Id.toString() === id;
                 })[0];
 
@@ -114,35 +128,35 @@ define(['events', 'globalize', 'dom', 'date-fns', 'dfnshelper', 'userSettings',
     }
 
     function showItemOverview(item) {
-        require(['alert'], function (alert) {
+        import('alert').then(({default: alert}) => {
             alert({
                 text: item.Overview
             });
         });
     }
 
-    function ActivityLog(options) {
+class ActivityLog {
+    constructor(options) {
         this.options = options;
-        var element = options.element;
+        const element = options.element;
         element.classList.add('activityLogListWidget');
         element.addEventListener('click', onListClick.bind(this));
-        var apiClient = connectionManager.getApiClient(options.serverId);
+        const apiClient = connectionManager.getApiClient(options.serverId);
         reloadData(this, element, apiClient);
-        var onUpdate = onActivityLogUpdate.bind(this);
+        const onUpdate = onActivityLogUpdate.bind(this);
         this.updateFn = onUpdate;
         events.on(serverNotifications, 'ActivityLogEntry', onUpdate);
         apiClient.sendMessage('ActivityLogEntryStart', '0,1500');
     }
-
-    ActivityLog.prototype.destroy = function () {
-        var options = this.options;
+    destroy() {
+        const options = this.options;
 
         if (options) {
             options.element.classList.remove('activityLogListWidget');
             connectionManager.getApiClient(options.serverId).sendMessage('ActivityLogEntryStop', '0,1500');
         }
 
-        var onUpdate = this.updateFn;
+        const onUpdate = this.updateFn;
 
         if (onUpdate) {
             events.off(serverNotifications, 'ActivityLogEntry', onUpdate);
@@ -150,7 +164,9 @@ define(['events', 'globalize', 'dom', 'date-fns', 'dfnshelper', 'userSettings',
 
         this.items = null;
         this.options = null;
-    };
+    }
+}
 
-    return ActivityLog;
-});
+export default ActivityLog;
+
+/* eslint-enable indent */
diff --git a/src/components/alert.js b/src/components/alert.js
index 8a37ac1845..5d396e3a62 100644
--- a/src/components/alert.js
+++ b/src/components/alert.js
@@ -1,14 +1,17 @@
-define(['browser', 'dialog', 'globalize'], function (browser, dialog, globalize) {
-    'use strict';
+import browser from 'browser';
+import dialog from 'dialog';
+import globalize from 'globalize';
+
+/* eslint-disable indent */
 
     function replaceAll(originalString, strReplace, strWith) {
-        var reg = new RegExp(strReplace, 'ig');
+        const reg = new RegExp(strReplace, 'ig');
         return originalString.replace(reg, strWith);
     }
 
-    return function (text, title) {
+    export default function (text, title) {
 
-        var options;
+        let options;
         if (typeof text === 'string') {
             options = {
                 title: title,
@@ -21,7 +24,7 @@ define(['browser', 'dialog', 'globalize'], function (browser, dialog, globalize)
         if (browser.tv && window.alert) {
             alert(replaceAll(options.text || '', '<br/>', '\n'));
         } else {
-            var items = [];
+            const items = [];
 
             items.push({
                 name: globalize.translate('ButtonGotIt'),
@@ -31,7 +34,7 @@ define(['browser', 'dialog', 'globalize'], function (browser, dialog, globalize)
 
             options.buttons = items;
 
-            return dialog(options).then(function (result) {
+            return dialog.show(options).then(function (result) {
                 if (result === 'ok') {
                     return Promise.resolve();
                 }
@@ -41,5 +44,6 @@ define(['browser', 'dialog', 'globalize'], function (browser, dialog, globalize)
         }
 
         return Promise.resolve();
-    };
-});
+    }
+
+/* eslint-enable indent */
diff --git a/src/components/alphaPicker/alphaPicker.js b/src/components/alphaPicker/alphaPicker.js
index 79f74879e5..4bc8af56f0 100644
--- a/src/components/alphaPicker/alphaPicker.js
+++ b/src/components/alphaPicker/alphaPicker.js
@@ -1,11 +1,22 @@
-define(['focusManager', 'layoutManager', 'dom', 'css!./style.css', 'paper-icon-button-light', 'material-icons'], function (focusManager, layoutManager, dom) {
-    'use strict';
+/* eslint-disable indent */
 
-    var selectedButtonClass = 'alphaPickerButton-selected';
+/**
+ * Module alphaPicker.
+ * @module components/alphaPicker/alphaPicker
+ */
+
+import focusManager from 'focusManager';
+import layoutManager from 'layoutManager';
+import dom from 'dom';
+import 'css!./style.css';
+import 'paper-icon-button-light';
+import 'material-icons';
+
+    const selectedButtonClass = 'alphaPickerButton-selected';
 
     function focus() {
-        var scope = this;
-        var selected = scope.querySelector('.' + selectedButtonClass);
+        const scope = this;
+        const selected = scope.querySelector(`.${selectedButtonClass}`);
 
         if (selected) {
             focusManager.focus(selected);
@@ -16,7 +27,7 @@ define(['focusManager', 'layoutManager', 'dom', 'css!./style.css', 'paper-icon-b
 
     function getAlphaPickerButtonClassName(vertical) {
 
-        var alphaPickerButtonClassName = 'alphaPickerButton';
+        let alphaPickerButtonClassName = 'alphaPickerButton';
 
         if (layoutManager.tv) {
             alphaPickerButtonClassName += ' alphaPickerButton-tv';
@@ -30,12 +41,12 @@ define(['focusManager', 'layoutManager', 'dom', 'css!./style.css', 'paper-icon-b
     }
 
     function getLetterButton(l, vertical) {
-        return '<button data-value="' + l + '" class="' + getAlphaPickerButtonClassName(vertical) + '">' + l + '</button>';
+        return `<button data-value="${l}" class="${getAlphaPickerButtonClassName(vertical)}">${l}</button>`;
     }
 
     function mapLetters(letters, vertical) {
 
-        return letters.map(function (l) {
+        return letters.map(l => {
             return getLetterButton(l, vertical);
         });
     }
@@ -48,26 +59,26 @@ define(['focusManager', 'layoutManager', 'dom', 'css!./style.css', 'paper-icon-b
             element.classList.add('alphaPicker-tv');
         }
 
-        var vertical = element.classList.contains('alphaPicker-vertical');
+        const vertical = element.classList.contains('alphaPicker-vertical');
 
         if (!vertical) {
             element.classList.add('focuscontainer-x');
         }
 
-        var html = '';
-        var letters;
+        let html = '';
+        let letters;
 
-        var alphaPickerButtonClassName = getAlphaPickerButtonClassName(vertical);
+        const alphaPickerButtonClassName = getAlphaPickerButtonClassName(vertical);
 
-        var rowClassName = 'alphaPickerRow';
+        let rowClassName = 'alphaPickerRow';
 
         if (vertical) {
             rowClassName += ' alphaPickerRow-vertical';
         }
 
-        html += '<div class="' + rowClassName + '">';
+        html += `<div class="${rowClassName}">`;
         if (options.mode === 'keyboard') {
-            html += '<button data-value=" " is="paper-icon-button-light" class="' + alphaPickerButtonClassName + '"><span class="material-icons alphaPickerButtonIcon space_bar"></span></button>';
+            html += `<button data-value=" " is="paper-icon-button-light" class="${alphaPickerButtonClassName}"><span class="material-icons alphaPickerButtonIcon space_bar"></span></button>`;
         } else {
             letters = ['#'];
             html += mapLetters(letters, vertical).join('');
@@ -77,11 +88,11 @@ define(['focusManager', 'layoutManager', 'dom', 'css!./style.css', 'paper-icon-b
         html += mapLetters(letters, vertical).join('');
 
         if (options.mode === 'keyboard') {
-            html += '<button data-value="backspace" is="paper-icon-button-light" class="' + alphaPickerButtonClassName + '"><span class="material-icons alphaPickerButtonIcon backspace"></span></button>';
+            html += `<button data-value="backspace" is="paper-icon-button-light" class="${alphaPickerButtonClassName}"><span class="material-icons alphaPickerButtonIcon backspace"></span></button>`;
             html += '</div>';
 
             letters = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9'];
-            html += '<div class="' + rowClassName + '">';
+            html += `<div class="${rowClassName}">`;
             html += '<br/>';
             html += mapLetters(letters, vertical).join('');
             html += '</div>';
@@ -95,227 +106,228 @@ define(['focusManager', 'layoutManager', 'dom', 'css!./style.css', 'paper-icon-b
         element.focus = focus;
     }
 
-    function AlphaPicker(options) {
+    export class AlphaPicker {
+        constructor(options) {
+            const self = this;
 
-        var self = this;
-        this.options = options;
+            this.options = options;
 
-        var element = options.element;
-        var itemsContainer = options.itemsContainer;
-        var itemClass = options.itemClass;
+            const element = options.element;
+            const itemsContainer = options.itemsContainer;
+            const itemClass = options.itemClass;
 
-        var itemFocusValue;
-        var itemFocusTimeout;
+            let itemFocusValue;
+            let itemFocusTimeout;
 
-        function onItemFocusTimeout() {
-            itemFocusTimeout = null;
-            self.value(itemFocusValue);
-        }
-
-        var alphaFocusedElement;
-        var alphaFocusTimeout;
-
-        function onAlphaFocusTimeout() {
-
-            alphaFocusTimeout = null;
-
-            if (document.activeElement === alphaFocusedElement) {
-                var value = alphaFocusedElement.getAttribute('data-value');
-                self.value(value, true);
+            function onItemFocusTimeout() {
+                itemFocusTimeout = null;
+                self.value(itemFocusValue);
             }
-        }
 
-        function onAlphaPickerInKeyboardModeClick(e) {
+            let alphaFocusedElement;
+            let alphaFocusTimeout;
 
-            var alphaPickerButton = dom.parentWithClass(e.target, 'alphaPickerButton');
+            function onAlphaFocusTimeout() {
+                alphaFocusTimeout = null;
 
-            if (alphaPickerButton) {
-                var value = alphaPickerButton.getAttribute('data-value');
-
-                element.dispatchEvent(new CustomEvent('alphavalueclicked', {
-                    cancelable: false,
-                    detail: {
-                        value: value
-                    }
-                }));
-            }
-        }
-
-        function onAlphaPickerClick(e) {
-
-            var alphaPickerButton = dom.parentWithClass(e.target, 'alphaPickerButton');
-
-            if (alphaPickerButton) {
-                var value = alphaPickerButton.getAttribute('data-value');
-                if ((this._currentValue || '').toUpperCase() === value.toUpperCase()) {
-                    self.value(null, true);
-                } else {
+                if (document.activeElement === alphaFocusedElement) {
+                    const value = alphaFocusedElement.getAttribute('data-value');
                     self.value(value, true);
                 }
             }
-        }
 
-        function onAlphaPickerFocusIn(e) {
+            function onAlphaPickerInKeyboardModeClick(e) {
 
-            if (alphaFocusTimeout) {
-                clearTimeout(alphaFocusTimeout);
-                alphaFocusTimeout = null;
+                const alphaPickerButton = dom.parentWithClass(e.target, 'alphaPickerButton');
+
+                if (alphaPickerButton) {
+                    const value = alphaPickerButton.getAttribute('data-value');
+
+                    element.dispatchEvent(new CustomEvent('alphavalueclicked', {
+                        cancelable: false,
+                        detail: {
+                            value
+                        }
+                    }));
+                }
             }
 
-            var alphaPickerButton = dom.parentWithClass(e.target, 'alphaPickerButton');
+            function onAlphaPickerClick(e) {
 
-            if (alphaPickerButton) {
-                alphaFocusedElement = alphaPickerButton;
-                alphaFocusTimeout = setTimeout(onAlphaFocusTimeout, 600);
-            }
-        }
+                const alphaPickerButton = dom.parentWithClass(e.target, 'alphaPickerButton');
 
-        function onItemsFocusIn(e) {
-
-            var item = dom.parentWithClass(e.target, itemClass);
-
-            if (item) {
-                var prefix = item.getAttribute('data-prefix');
-                if (prefix && prefix.length) {
-
-                    itemFocusValue = prefix[0];
-                    if (itemFocusTimeout) {
-                        clearTimeout(itemFocusTimeout);
+                if (alphaPickerButton) {
+                    const value = alphaPickerButton.getAttribute('data-value');
+                    if ((this._currentValue || '').toUpperCase() === value.toUpperCase()) {
+                        this.value(null, true);
+                    } else {
+                        this.value(value, true);
                     }
-                    itemFocusTimeout = setTimeout(onItemFocusTimeout, 100);
                 }
             }
-        }
 
-        self.enabled = function (enabled) {
+            function onAlphaPickerFocusIn(e) {
 
-            if (enabled) {
-
-                if (itemsContainer) {
-                    itemsContainer.addEventListener('focus', onItemsFocusIn, true);
+                if (alphaFocusTimeout) {
+                    clearTimeout(alphaFocusTimeout);
+                    alphaFocusTimeout = null;
                 }
 
-                if (options.mode === 'keyboard') {
-                    element.addEventListener('click', onAlphaPickerInKeyboardModeClick);
-                }
+                const alphaPickerButton = dom.parentWithClass(e.target, 'alphaPickerButton');
+
+                if (alphaPickerButton) {
+                    alphaFocusedElement = alphaPickerButton;
+                    alphaFocusTimeout = setTimeout(onAlphaFocusTimeout, 600);
+                }
+            }
+
+            function onItemsFocusIn(e) {
+
+                const item = dom.parentWithClass(e.target, itemClass);
+
+                if (item) {
+                    const prefix = item.getAttribute('data-prefix');
+                    if (prefix && prefix.length) {
+
+                        itemFocusValue = prefix[0];
+                        if (itemFocusTimeout) {
+                            clearTimeout(itemFocusTimeout);
+                        }
+                        itemFocusTimeout = setTimeout(onItemFocusTimeout, 100);
+                    }
+                }
+            }
+
+            this.enabled = function (enabled) {
+
+                if (enabled) {
+
+                    if (itemsContainer) {
+                        itemsContainer.addEventListener('focus', onItemsFocusIn, true);
+                    }
+
+                    if (options.mode === 'keyboard') {
+                        element.addEventListener('click', onAlphaPickerInKeyboardModeClick);
+                    }
+
+                    if (options.valueChangeEvent !== 'click') {
+                        element.addEventListener('focus', onAlphaPickerFocusIn, true);
+                    } else {
+                        element.addEventListener('click', onAlphaPickerClick.bind(this));
+                    }
 
-                if (options.valueChangeEvent !== 'click') {
-                    element.addEventListener('focus', onAlphaPickerFocusIn, true);
                 } else {
-                    element.addEventListener('click', onAlphaPickerClick.bind(this));
-                }
 
-            } else {
-
-                if (itemsContainer) {
-                    itemsContainer.removeEventListener('focus', onItemsFocusIn, true);
-                }
-
-                element.removeEventListener('click', onAlphaPickerInKeyboardModeClick);
-                element.removeEventListener('focus', onAlphaPickerFocusIn, true);
-                element.removeEventListener('click', onAlphaPickerClick.bind(this));
-            }
-        };
-
-        render(element, options);
-
-        this.enabled(true);
-        this.visible(true);
-    }
-
-    AlphaPicker.prototype.value = function (value, applyValue) {
-
-        var element = this.options.element;
-        var btn;
-        var selected;
-
-        if (value !== undefined) {
-            if (value != null) {
-
-                value = value.toUpperCase();
-                this._currentValue = value;
-
-                if (this.options.mode !== 'keyboard') {
-                    selected = element.querySelector('.' + selectedButtonClass);
-
-                    try {
-                        btn = element.querySelector('.alphaPickerButton[data-value=\'' + value + '\']');
-                    } catch (err) {
-                        console.error('error in querySelector: ' + err);
+                    if (itemsContainer) {
+                        itemsContainer.removeEventListener('focus', onItemsFocusIn, true);
                     }
 
-                    if (btn && btn !== selected) {
-                        btn.classList.add(selectedButtonClass);
+                    element.removeEventListener('click', onAlphaPickerInKeyboardModeClick);
+                    element.removeEventListener('focus', onAlphaPickerFocusIn, true);
+                    element.removeEventListener('click', onAlphaPickerClick.bind(this));
+                }
+            };
+
+            render(element, options);
+
+            this.enabled(true);
+            this.visible(true);
+        }
+
+        value(value, applyValue) {
+
+            const element = this.options.element;
+            let btn;
+            let selected;
+
+            if (value !== undefined) {
+                if (value != null) {
+
+                    value = value.toUpperCase();
+                    this._currentValue = value;
+
+                    if (this.options.mode !== 'keyboard') {
+                        selected = element.querySelector(`.${selectedButtonClass}`);
+
+                        try {
+                            btn = element.querySelector(`.alphaPickerButton[data-value='${value}']`);
+                        } catch (err) {
+                            console.error('error in querySelector:', err);
+                        }
+
+                        if (btn && btn !== selected) {
+                            btn.classList.add(selectedButtonClass);
+                        }
+                        if (selected && selected !== btn) {
+                            selected.classList.remove(selectedButtonClass);
+                        }
                     }
-                    if (selected && selected !== btn) {
+                } else {
+                    this._currentValue = value;
+
+                    selected = element.querySelector(`.${selectedButtonClass}`);
+                    if (selected) {
                         selected.classList.remove(selectedButtonClass);
                     }
                 }
-            } else {
-                this._currentValue = value;
-
-                selected = element.querySelector('.' + selectedButtonClass);
-                if (selected) {
-                    selected.classList.remove(selectedButtonClass);
-                }
             }
+
+            if (applyValue) {
+                element.dispatchEvent(new CustomEvent('alphavaluechanged', {
+                    cancelable: false,
+                    detail: {
+                        value
+                    }
+                }));
+            }
+
+            return this._currentValue;
         }
 
-        if (applyValue) {
-            element.dispatchEvent(new CustomEvent('alphavaluechanged', {
-                cancelable: false,
-                detail: {
-                    value: value
-                }
-            }));
+        on(name, fn) {
+            const element = this.options.element;
+            element.addEventListener(name, fn);
         }
 
-        return this._currentValue;
-    };
-
-    AlphaPicker.prototype.on = function (name, fn) {
-        var element = this.options.element;
-        element.addEventListener(name, fn);
-    };
-
-    AlphaPicker.prototype.off = function (name, fn) {
-        var element = this.options.element;
-        element.removeEventListener(name, fn);
-    };
-
-    AlphaPicker.prototype.visible = function (visible) {
-
-        var element = this.options.element;
-        element.style.visibility = visible ? 'visible' : 'hidden';
-    };
-
-    AlphaPicker.prototype.values = function () {
-
-        var element = this.options.element;
-        var elems = element.querySelectorAll('.alphaPickerButton');
-        var values = [];
-        for (var i = 0, length = elems.length; i < length; i++) {
-
-            values.push(elems[i].getAttribute('data-value'));
-
+        off(name, fn) {
+            const element = this.options.element;
+            element.removeEventListener(name, fn);
         }
 
-        return values;
-    };
+        visible(visible) {
 
-    AlphaPicker.prototype.focus = function () {
+            const element = this.options.element;
+            element.style.visibility = visible ? 'visible' : 'hidden';
+        }
 
-        var element = this.options.element;
-        focusManager.autoFocus(element, true);
-    };
+        values() {
 
-    AlphaPicker.prototype.destroy = function () {
+            const element = this.options.element;
+            const elems = element.querySelectorAll('.alphaPickerButton');
+            const values = [];
+            for (let i = 0, length = elems.length; i < length; i++) {
 
-        var element = this.options.element;
-        this.enabled(false);
-        element.classList.remove('focuscontainer-x');
-        this.options = null;
-    };
+                values.push(elems[i].getAttribute('data-value'));
 
-    return AlphaPicker;
-});
+            }
+
+            return values;
+        }
+
+        focus() {
+
+            const element = this.options.element;
+            focusManager.autoFocus(element, true);
+        }
+
+        destroy() {
+
+            const element = this.options.element;
+            this.enabled(false);
+            element.classList.remove('focuscontainer-x');
+            this.options = null;
+        }
+    }
+
+/* eslint-enable indent */
+export default AlphaPicker;
diff --git a/src/components/appFooter/appFooter.js b/src/components/appFooter/appFooter.js
index 033a0b008d..af50ef7bf9 100644
--- a/src/components/appFooter/appFooter.js
+++ b/src/components/appFooter/appFooter.js
@@ -1,17 +1,18 @@
-define(['browser', 'css!./appFooter'], function (browser) {
-    'use strict';
+import browser from 'browser';
+import 'css!./appFooter';
 
-    function render(options) {
-        var elem = document.createElement('div');
-        elem.classList.add('appfooter');
+function render(options) {
+    const elem = document.createElement('div');
+    elem.classList.add('appfooter');
 
-        document.body.appendChild(elem);
+    document.body.appendChild(elem);
 
-        return elem;
-    }
+    return elem;
+}
 
-    function appFooter(options) {
-        var self = this;
+class appFooter {
+    constructor(options) {
+        const self = this;
 
         self.element = render(options);
         self.add = function (elem) {
@@ -26,12 +27,11 @@ define(['browser', 'css!./appFooter'], function (browser) {
             }
         };
     }
-
-    appFooter.prototype.destroy = function () {
+    destroy() {
         var self = this;
 
         self.element = null;
-    };
+    }
+}
 
-    return appFooter;
-});
+export default appFooter;
diff --git a/src/components/appRouter.js b/src/components/appRouter.js
index a7496b2759..7af7ed4a95 100644
--- a/src/components/appRouter.js
+++ b/src/components/appRouter.js
@@ -16,21 +16,21 @@ define(['loading', 'globalize', 'events', 'viewManager', 'skinManager', 'backdro
             show('/settings/settings.html');
         },
         showNowPlaying: function () {
-            show('/nowplaying.html');
+            show('queue');
         }
     };
 
     function beginConnectionWizard() {
-        backdrop.clear();
+        backdrop.clearBackdrop();
         loading.show();
         connectionManager.connect({
             enableAutoLogin: appSettings.enableAutoLogin()
         }).then(function (result) {
-            handleConnectionResult(result, loading);
+            handleConnectionResult(result);
         });
     }
 
-    function handleConnectionResult(result, loading) {
+    function handleConnectionResult(result) {
         switch (result.State) {
             case 'SignedIn':
                 loading.hide();
@@ -53,7 +53,7 @@ define(['loading', 'globalize', 'events', 'viewManager', 'skinManager', 'backdro
                 break;
             case 'ServerUpdateNeeded':
                 require(['alert'], function (alert) {
-                    alert({
+                    alert.default({
                         text: globalize.translate('ServerUpdateNeeded', 'https://github.com/jellyfin/jellyfin'),
                         html: globalize.translate('ServerUpdateNeeded', '<a href="https://github.com/jellyfin/jellyfin">https://github.com/jellyfin/jellyfin</a>')
                     }).then(function () {
@@ -222,48 +222,13 @@ define(['loading', 'globalize', 'events', 'viewManager', 'skinManager', 'backdro
     }
 
     function normalizeImageOptions(options) {
-        var scaleFactor = browser.tv ? 0.8 : 1;
-
         var setQuality;
-        if (options.maxWidth) {
-            options.maxWidth = Math.round(options.maxWidth * scaleFactor);
+        if (options.maxWidth || options.width || options.maxHeight || options.height) {
             setQuality = true;
         }
 
-        if (options.width) {
-            options.width = Math.round(options.width * scaleFactor);
-            setQuality = true;
-        }
-
-        if (options.maxHeight) {
-            options.maxHeight = Math.round(options.maxHeight * scaleFactor);
-            setQuality = true;
-        }
-
-        if (options.height) {
-            options.height = Math.round(options.height * scaleFactor);
-            setQuality = true;
-        }
-
-        if (setQuality) {
-
-            var quality = 100;
-
-            var type = options.type || 'Primary';
-
-            if (browser.tv || browser.slow) {
-
-                if (browser.chrome) {
-                    // webp support
-                    quality = type === 'Primary' ? 40 : 50;
-                } else {
-                    quality = type === 'Backdrop' ? 60 : 50;
-                }
-            } else {
-                quality = type === 'Backdrop' ? 70 : 90;
-            }
-
-            options.quality = quality;
+        if (setQuality && !options.quality) {
+            options.quality = 90;
         }
     }
 
@@ -384,7 +349,7 @@ define(['loading', 'globalize', 'events', 'viewManager', 'skinManager', 'backdro
 
             if (firstResult.State !== 'SignedIn' && !route.anonymous) {
 
-                handleConnectionResult(firstResult, loading);
+                handleConnectionResult(firstResult);
                 return;
             }
         }
@@ -463,12 +428,11 @@ define(['loading', 'globalize', 'events', 'viewManager', 'skinManager', 'backdro
         return Promise.resolve();
     }
 
-    var isHandlingBackToDefault;
     var isDummyBackToHome;
 
     function loadContent(ctx, route, html, request) {
 
-        html = globalize.translateDocument(html, route.dictionary);
+        html = globalize.translateHtml(html, route.dictionary);
         request.view = html;
 
         viewManager.loadView(request);
@@ -589,8 +553,7 @@ define(['loading', 'globalize', 'events', 'viewManager', 'skinManager', 'backdro
             path = '/' + path;
         }
 
-        var baseRoute = baseUrl();
-        path = path.replace(baseRoute, '');
+        path = path.replace(baseUrl(), '');
 
         if (currentRouteInfo && currentRouteInfo.path === path) {
             // can't use this with home right now due to the back menu
@@ -621,10 +584,11 @@ define(['loading', 'globalize', 'events', 'viewManager', 'skinManager', 'backdro
     }
 
     function showItem(item, serverId, options) {
+        // TODO: Refactor this so it only gets items, not strings.
         if (typeof (item) === 'string') {
             var apiClient = serverId ? connectionManager.getApiClient(serverId) : connectionManager.currentApiClient();
-            apiClient.getItem(apiClient.getCurrentUserId(), item).then(function (item) {
-                appRouter.showItem(item, options);
+            apiClient.getItem(apiClient.getCurrentUserId(), item).then(function (itemObject) {
+                appRouter.showItem(itemObject, options);
             });
         } else {
             if (arguments.length === 2) {
@@ -660,7 +624,7 @@ define(['loading', 'globalize', 'events', 'viewManager', 'skinManager', 'backdro
         }
 
         if (level === 'full' || level === 2) {
-            backdrop.clear(true);
+            backdrop.clearBackdrop(true);
             document.documentElement.classList.add('transparentDocument');
             backgroundContainer.classList.add('backgroundContainer-transparent');
             backdropContainer.classList.add('hide');
diff --git a/src/components/apphost.js b/src/components/apphost.js
index 7b044d5d35..f200b9a642 100644
--- a/src/components/apphost.js
+++ b/src/components/apphost.js
@@ -5,7 +5,7 @@ define(['appSettings', 'browser', 'events', 'htmlMediaHelper', 'webSettings', 'g
         var disableHlsVideoAudioCodecs = [];
 
         if (item && htmlMediaHelper.enableHlsJsPlayer(item.RunTimeTicks, item.MediaType)) {
-            if (browser.edge || browser.msie) {
+            if (browser.edge) {
                 disableHlsVideoAudioCodecs.push('mp3');
             }
 
@@ -93,18 +93,36 @@ define(['appSettings', 'browser', 'events', 'htmlMediaHelper', 'webSettings', 'g
 
     function getDeviceName() {
         var deviceName;
-        deviceName = browser.tizen ? 'Samsung Smart TV' : browser.web0s ? 'LG Smart TV' : browser.operaTv ? 'Opera TV' : browser.xboxOne ? 'Xbox One' : browser.ps4 ? 'Sony PS4' : browser.chrome ? 'Chrome' : browser.edge ? 'Edge' : browser.firefox ? 'Firefox' : browser.msie ? 'Internet Explorer' : browser.opera ? 'Opera' : browser.safari ? 'Safari' : 'Web Browser';
+        if (browser.tizen) {
+            deviceName = 'Samsung Smart TV';
+        } else if (browser.web0s) {
+            deviceName = 'LG Smart TV';
+        } else if (browser.operaTv) {
+            deviceName = 'Opera TV';
+        } else if (browser.xboxOne) {
+            deviceName = 'Xbox One';
+        } else if (browser.ps4) {
+            deviceName = 'Sony PS4';
+        } else if (browser.chrome) {
+            deviceName = 'Chrome';
+        } else if (browser.edge) {
+            deviceName = 'Edge';
+        } else if (browser.firefox) {
+            deviceName = 'Firefox';
+        } else if (browser.opera) {
+            deviceName = 'Opera';
+        } else if (browser.safari) {
+            deviceName = 'Safari';
+        } else {
+            deviceName = 'Web Browser';
+        }
 
         if (browser.ipad) {
             deviceName += ' iPad';
-        } else {
-            if (browser.iphone) {
-                deviceName += ' iPhone';
-            } else {
-                if (browser.android) {
-                    deviceName += ' Android';
-                }
-            }
+        } else if (browser.iphone) {
+            deviceName += ' iPhone';
+        } else if (browser.android) {
+            deviceName += ' Android';
         }
 
         return deviceName;
@@ -267,7 +285,7 @@ define(['appSettings', 'browser', 'events', 'htmlMediaHelper', 'webSettings', 'g
             if (enabled) features.push('multiserver');
         });
 
-        if (!browser.orsay && !browser.msie && (browser.firefox || browser.ps4 || browser.edge || supportsCue())) {
+        if (!browser.orsay && (browser.firefox || browser.ps4 || browser.edge || supportsCue())) {
             features.push('subtitleappearancesettings');
         }
 
diff --git a/src/components/backdrop/backdrop.js b/src/components/backdrop/backdrop.js
index c15e35524c..d3c9e58b59 100644
--- a/src/components/backdrop/backdrop.js
+++ b/src/components/backdrop/backdrop.js
@@ -1,5 +1,11 @@
-define(['browser', 'connectionManager', 'playbackManager', 'dom', 'userSettings', 'css!./backdrop'], function (browser, connectionManager, playbackManager, dom, userSettings) {
-    'use strict';
+import browser from 'browser';
+import connectionManager from 'connectionManager';
+import playbackManager from 'playbackManager';
+import dom from 'dom';
+import * as userSettings from 'userSettings';
+import 'css!./backdrop';
+
+/* eslint-disable indent */
 
     function enableAnimation(elem) {
         if (browser.slow) {
@@ -22,71 +28,70 @@ define(['browser', 'connectionManager', 'playbackManager', 'dom', 'userSettings'
         return true;
     }
 
-    function Backdrop() {
-    }
+    class Backdrop {
+        load(url, parent, existingBackdropImage) {
+            const img = new Image();
+            const self = this;
 
-    Backdrop.prototype.load = function (url, parent, existingBackdropImage) {
-        var img = new Image();
-        var self = this;
-
-        img.onload = function () {
-            if (self.isDestroyed) {
-                return;
-            }
-
-            var backdropImage = document.createElement('div');
-            backdropImage.classList.add('backdropImage');
-            backdropImage.classList.add('displayingBackdropImage');
-            backdropImage.style.backgroundImage = "url('" + url + "')";
-            backdropImage.setAttribute('data-url', url);
-
-            backdropImage.classList.add('backdropImageFadeIn');
-            parent.appendChild(backdropImage);
-
-            if (!enableAnimation(backdropImage)) {
-                if (existingBackdropImage && existingBackdropImage.parentNode) {
-                    existingBackdropImage.parentNode.removeChild(existingBackdropImage);
+            img.onload = () => {
+                if (self.isDestroyed) {
+                    return;
                 }
-                internalBackdrop(true);
-                return;
-            }
 
-            var onAnimationComplete = function () {
-                dom.removeEventListener(backdropImage, dom.whichAnimationEvent(), onAnimationComplete, {
+                const backdropImage = document.createElement('div');
+                backdropImage.classList.add('backdropImage');
+                backdropImage.classList.add('displayingBackdropImage');
+                backdropImage.style.backgroundImage = `url('${url}')`;
+                backdropImage.setAttribute('data-url', url);
+
+                backdropImage.classList.add('backdropImageFadeIn');
+                parent.appendChild(backdropImage);
+
+                if (!enableAnimation(backdropImage)) {
+                    if (existingBackdropImage && existingBackdropImage.parentNode) {
+                        existingBackdropImage.parentNode.removeChild(existingBackdropImage);
+                    }
+                    internalBackdrop(true);
+                    return;
+                }
+
+                const onAnimationComplete = () => {
+                    dom.removeEventListener(backdropImage, dom.whichAnimationEvent(), onAnimationComplete, {
+                        once: true
+                    });
+                    if (backdropImage === self.currentAnimatingElement) {
+                        self.currentAnimatingElement = null;
+                    }
+                    if (existingBackdropImage && existingBackdropImage.parentNode) {
+                        existingBackdropImage.parentNode.removeChild(existingBackdropImage);
+                    }
+                };
+
+                dom.addEventListener(backdropImage, dom.whichAnimationEvent(), onAnimationComplete, {
                     once: true
                 });
-                if (backdropImage === self.currentAnimatingElement) {
-                    self.currentAnimatingElement = null;
-                }
-                if (existingBackdropImage && existingBackdropImage.parentNode) {
-                    existingBackdropImage.parentNode.removeChild(existingBackdropImage);
-                }
+
+                internalBackdrop(true);
             };
 
-            dom.addEventListener(backdropImage, dom.whichAnimationEvent(), onAnimationComplete, {
-                once: true
-            });
-
-            internalBackdrop(true);
-        };
-
-        img.src = url;
-    };
-
-    Backdrop.prototype.cancelAnimation = function () {
-        var elem = this.currentAnimatingElement;
-        if (elem) {
-            elem.classList.remove('backdropImageFadeIn');
-            this.currentAnimatingElement = null;
+            img.src = url;
         }
-    };
 
-    Backdrop.prototype.destroy = function () {
-        this.isDestroyed = true;
-        this.cancelAnimation();
-    };
+        cancelAnimation() {
+            const elem = this.currentAnimatingElement;
+            if (elem) {
+                elem.classList.remove('backdropImageFadeIn');
+                this.currentAnimatingElement = null;
+            }
+        }
 
-    var backdropContainer;
+        destroy() {
+            this.isDestroyed = true;
+            this.cancelAnimation();
+        }
+    }
+
+    let backdropContainer;
     function getBackdropContainer() {
         if (!backdropContainer) {
             backdropContainer = document.querySelector('.backdropContainer');
@@ -101,7 +106,7 @@ define(['browser', 'connectionManager', 'playbackManager', 'dom', 'userSettings'
         return backdropContainer;
     }
 
-    function clearBackdrop(clearAll) {
+    export function clearBackdrop(clearAll) {
         clearRotation();
 
         if (currentLoadingBackdrop) {
@@ -109,7 +114,7 @@ define(['browser', 'connectionManager', 'playbackManager', 'dom', 'userSettings'
             currentLoadingBackdrop = null;
         }
 
-        var elem = getBackdropContainer();
+        const elem = getBackdropContainer();
         elem.innerHTML = '';
 
         if (clearAll) {
@@ -119,7 +124,7 @@ define(['browser', 'connectionManager', 'playbackManager', 'dom', 'userSettings'
         internalBackdrop(false);
     }
 
-    var backgroundContainer;
+    let backgroundContainer;
     function getBackgroundContainer() {
         if (!backgroundContainer) {
             backgroundContainer = document.querySelector('.backgroundContainer');
@@ -135,31 +140,27 @@ define(['browser', 'connectionManager', 'playbackManager', 'dom', 'userSettings'
         }
     }
 
-    var hasInternalBackdrop;
+    let hasInternalBackdrop;
     function internalBackdrop(enabled) {
         hasInternalBackdrop = enabled;
         setBackgroundContainerBackgroundEnabled();
     }
 
-    var hasExternalBackdrop;
-    function externalBackdrop(enabled) {
+    let hasExternalBackdrop;
+    export function externalBackdrop(enabled) {
         hasExternalBackdrop = enabled;
         setBackgroundContainerBackgroundEnabled();
     }
 
-    function getRandom(min, max) {
-        return Math.floor(Math.random() * (max - min) + min);
-    }
-
-    var currentLoadingBackdrop;
+    let currentLoadingBackdrop;
     function setBackdropImage(url) {
         if (currentLoadingBackdrop) {
             currentLoadingBackdrop.destroy();
             currentLoadingBackdrop = null;
         }
 
-        var elem = getBackdropContainer();
-        var existingBackdropImage = elem.querySelector('.displayingBackdropImage');
+        const elem = getBackdropContainer();
+        const existingBackdropImage = elem.querySelector('.displayingBackdropImage');
 
         if (existingBackdropImage && existingBackdropImage.getAttribute('data-url') === url) {
             if (existingBackdropImage.getAttribute('data-url') === url) {
@@ -168,7 +169,7 @@ define(['browser', 'connectionManager', 'playbackManager', 'dom', 'userSettings'
             existingBackdropImage.classList.remove('displayingBackdropImage');
         }
 
-        var instance = new Backdrop();
+        const instance = new Backdrop();
         instance.load(url, elem, existingBackdropImage);
         currentLoadingBackdrop = instance;
     }
@@ -176,9 +177,9 @@ define(['browser', 'connectionManager', 'playbackManager', 'dom', 'userSettings'
     function getItemImageUrls(item, imageOptions) {
         imageOptions = imageOptions || {};
 
-        var apiClient = connectionManager.getApiClient(item.ServerId);
+        const apiClient = connectionManager.getApiClient(item.ServerId);
         if (item.BackdropImageTags && item.BackdropImageTags.length > 0) {
-            return item.BackdropImageTags.map(function (imgTag, index) {
+            return item.BackdropImageTags.map((imgTag, index) => {
                 return apiClient.getScaledImageUrl(item.BackdropItemId || item.Id, Object.assign(imageOptions, {
                     type: 'Backdrop',
                     tag: imgTag,
@@ -189,7 +190,7 @@ define(['browser', 'connectionManager', 'playbackManager', 'dom', 'userSettings'
         }
 
         if (item.ParentBackdropItemId && item.ParentBackdropImageTags && item.ParentBackdropImageTags.length) {
-            return item.ParentBackdropImageTags.map(function (imgTag, index) {
+            return item.ParentBackdropImageTags.map((imgTag, index) => {
                 return apiClient.getScaledImageUrl(item.ParentBackdropItemId, Object.assign(imageOptions, {
                     type: 'Backdrop',
                     tag: imgTag,
@@ -203,13 +204,13 @@ define(['browser', 'connectionManager', 'playbackManager', 'dom', 'userSettings'
     }
 
     function getImageUrls(items, imageOptions) {
-        var list = [];
-        var onImg = function (img) {
+        const list = [];
+        const onImg = img => {
             list.push(img);
         };
 
-        for (var i = 0, length = items.length; i < length; i++) {
-            var itemImages = getItemImageUrls(items[i], imageOptions);
+        for (let i = 0, length = items.length; i < length; i++) {
+            const itemImages = getItemImageUrls(items[i], imageOptions);
             itemImages.forEach(onImg);
         }
 
@@ -229,7 +230,7 @@ define(['browser', 'connectionManager', 'playbackManager', 'dom', 'userSettings'
 
         // If you don't care about the order of the elements inside
         // the array, you should sort both arrays here.
-        for (var i = 0; i < a.length; ++i) {
+        for (let i = 0; i < a.length; ++i) {
             if (a[i] !== b[i]) {
                 return false;
             }
@@ -242,12 +243,12 @@ define(['browser', 'connectionManager', 'playbackManager', 'dom', 'userSettings'
         return userSettings.enableBackdrops();
     }
 
-    var rotationInterval;
-    var currentRotatingImages = [];
-    var currentRotationIndex = -1;
-    function setBackdrops(items, imageOptions, enableImageRotation) {
+    let rotationInterval;
+    let currentRotatingImages = [];
+    let currentRotationIndex = -1;
+    export function setBackdrops(items, imageOptions, enableImageRotation) {
         if (enabled()) {
-            var images = getImageUrls(items, imageOptions);
+            const images = getImageUrls(items, imageOptions);
 
             if (images.length) {
                 startRotation(images, enableImageRotation);
@@ -279,7 +280,7 @@ define(['browser', 'connectionManager', 'playbackManager', 'dom', 'userSettings'
             return;
         }
 
-        var newIndex = currentRotationIndex + 1;
+        let newIndex = currentRotationIndex + 1;
         if (newIndex >= currentRotatingImages.length) {
             newIndex = 0;
         }
@@ -289,7 +290,7 @@ define(['browser', 'connectionManager', 'playbackManager', 'dom', 'userSettings'
     }
 
     function clearRotation() {
-        var interval = rotationInterval;
+        const interval = rotationInterval;
         if (interval) {
             clearInterval(interval);
         }
@@ -299,7 +300,7 @@ define(['browser', 'connectionManager', 'playbackManager', 'dom', 'userSettings'
         currentRotationIndex = -1;
     }
 
-    function setBackdrop(url, imageOptions) {
+    export function setBackdrop(url, imageOptions) {
         if (url && typeof url !== 'string') {
             url = getImageUrls([url], imageOptions)[0];
         }
@@ -312,10 +313,11 @@ define(['browser', 'connectionManager', 'playbackManager', 'dom', 'userSettings'
         }
     }
 
-    return {
-        setBackdrops: setBackdrops,
-        setBackdrop: setBackdrop,
-        clear: clearBackdrop,
-        externalBackdrop: externalBackdrop
-    };
-});
+/* eslint-enable indent */
+
+export default {
+    setBackdrops: setBackdrops,
+    setBackdrop: setBackdrop,
+    clearBackdrop: clearBackdrop,
+    externalBackdrop: externalBackdrop
+};
diff --git a/src/components/backdropScreensaver/plugin.js b/src/components/backdropScreensaver/plugin.js
deleted file mode 100644
index dc0a906ddb..0000000000
--- a/src/components/backdropScreensaver/plugin.js
+++ /dev/null
@@ -1,56 +0,0 @@
-define(['connectionManager'], function (connectionManager) {
-
-    return function () {
-
-        var self = this;
-
-        self.name = 'Backdrop ScreenSaver';
-        self.type = 'screensaver';
-        self.id = 'backdropscreensaver';
-        self.supportsAnonymous = false;
-
-        var currentSlideshow;
-
-        self.show = function () {
-
-            var query = {
-                ImageTypes: 'Backdrop',
-                EnableImageTypes: 'Backdrop',
-                IncludeItemTypes: 'Movie,Series,MusicArtist',
-                SortBy: 'Random',
-                Recursive: true,
-                Fields: 'Taglines',
-                ImageTypeLimit: 1,
-                StartIndex: 0,
-                Limit: 200
-            };
-
-            var apiClient = connectionManager.currentApiClient();
-            apiClient.getItems(apiClient.getCurrentUserId(), query).then(function (result) {
-
-                if (result.Items.length) {
-
-                    require(['slideshow'], function (slideshow) {
-
-                        var newSlideShow = new slideshow({
-                            showTitle: true,
-                            cover: true,
-                            items: result.Items
-                        });
-
-                        newSlideShow.show();
-                        currentSlideshow = newSlideShow;
-                    });
-                }
-            });
-        };
-
-        self.hide = function () {
-
-            if (currentSlideshow) {
-                currentSlideshow.hide();
-                currentSlideshow = null;
-            }
-        };
-    };
-});
diff --git a/src/components/cardbuilder/card.css b/src/components/cardbuilder/card.css
index c24fcf6ba6..ef5ea6604c 100644
--- a/src/components/cardbuilder/card.css
+++ b/src/components/cardbuilder/card.css
@@ -167,8 +167,9 @@ button::-moz-focus-inner {
     position: relative;
     background-clip: content-box !important;
     color: inherit;
+}
 
-    /* This is only needed for scalable cards */
+.cardScalable .cardImageContainer {
     height: 100%;
     contain: strict;
 }
@@ -192,9 +193,14 @@ button::-moz-focus-inner {
 
     /* Needed in case this is a button */
     display: block;
-
-    /* Needed in case this is a button */
     margin: 0 !important;
+    border: 0 !important;
+    padding: 0 !important;
+    cursor: pointer;
+    color: inherit;
+    width: 100%;
+    font-family: inherit;
+    font-size: inherit;
 
     /* Needed in safari */
     height: 100%;
@@ -203,19 +209,12 @@ button::-moz-focus-inner {
     contain: strict;
 }
 
-.cardContent-button {
-    border: 0 !important;
-    padding: 0 !important;
-    cursor: pointer;
-    color: inherit;
-    width: 100%;
-    vertical-align: middle;
-    font-family: inherit;
-    font-size: inherit;
+.cardContent:not(.defaultCardBackground) {
+    background-color: transparent;
 }
 
-.cardContent-button:not(.defaultCardBackground) {
-    background-color: transparent;
+.cardBox:not(.visualCardBox) .cardPadder {
+    background-color: #242424;
 }
 
 .visualCardBox .cardContent {
@@ -223,7 +222,8 @@ button::-moz-focus-inner {
     border-bottom-right-radius: 0;
 }
 
-.cardContent-shadow {
+.cardContent-shadow,
+.cardBox:not(.visualCardBox) .cardPadder {
     box-shadow: 0 0.0725em 0.29em 0 rgba(0, 0, 0, 0.37);
 }
 
diff --git a/src/components/cardbuilder/cardBuilder.js b/src/components/cardbuilder/cardBuilder.js
index d4d4d7f73b..a6d0b10662 100644
--- a/src/components/cardbuilder/cardBuilder.js
+++ b/src/components/cardbuilder/cardBuilder.js
@@ -368,9 +368,7 @@ import 'programStyles';
             let apiClient;
             let lastServerId;
 
-            for (let i = 0; i < items.length; i++) {
-
-                let item = items[i];
+            for (const [i, item] of items.entries()) {
                 let serverId = item.ServerId || options.serverId;
 
                 if (serverId !== lastServerId) {
@@ -503,94 +501,49 @@ import 'programStyles';
             const primaryImageAspectRatio = item.PrimaryImageAspectRatio;
             let forceName = false;
             let imgUrl = null;
+            let imgTag = null;
             let coverImage = false;
             let uiAspect = null;
+            let imgType = null;
+            let itemId = null;
 
             if (options.preferThumb && item.ImageTags && item.ImageTags.Thumb) {
-
-                imgUrl = apiClient.getScaledImageUrl(item.Id, {
-                    type: 'Thumb',
-                    maxWidth: width,
-                    tag: item.ImageTags.Thumb
-                });
-
+                imgType = 'Thumb';
+                imgTag = item.ImageTags.Thumb;
             } else if ((options.preferBanner || shape === 'banner') && item.ImageTags && item.ImageTags.Banner) {
-
-                imgUrl = apiClient.getScaledImageUrl(item.Id, {
-                    type: 'Banner',
-                    maxWidth: width,
-                    tag: item.ImageTags.Banner
-                });
-
+                imgType = 'Banner';
+                imgTag = item.ImageTags.Banner;
             } else if (options.preferDisc && item.ImageTags && item.ImageTags.Disc) {
-
-                imgUrl = apiClient.getScaledImageUrl(item.Id, {
-                    type: 'Disc',
-                    maxWidth: width,
-                    tag: item.ImageTags.Disc
-                });
-
+                imgType = 'Disc';
+                imgTag = item.ImageTags.Disc;
             } else if (options.preferLogo && item.ImageTags && item.ImageTags.Logo) {
-
-                imgUrl = apiClient.getScaledImageUrl(item.Id, {
-                    type: 'Logo',
-                    maxWidth: width,
-                    tag: item.ImageTags.Logo
-                });
-
+                imgType = 'Logo';
+                imgTag = item.ImageTags.Logo;
             } else if (options.preferLogo && item.ParentLogoImageTag && item.ParentLogoItemId) {
-
-                imgUrl = apiClient.getScaledImageUrl(item.ParentLogoItemId, {
-                    type: 'Logo',
-                    maxWidth: width,
-                    tag: item.ParentLogoImageTag
-                });
-
+                imgType = 'Logo';
+                imgTag = item.ParentLogoImageTag;
+                itemId = item.ParentLogoItemId;
             } else if (options.preferThumb && item.SeriesThumbImageTag && options.inheritThumb !== false) {
-
-                imgUrl = apiClient.getScaledImageUrl(item.SeriesId, {
-                    type: 'Thumb',
-                    maxWidth: width,
-                    tag: item.SeriesThumbImageTag
-                });
-
+                imgType = 'Thumb';
+                imgTag = item.SeriesThumbImageTag;
+                itemId = item.SeriesId;
             } else if (options.preferThumb && item.ParentThumbItemId && options.inheritThumb !== false && item.MediaType !== 'Photo') {
-
-                imgUrl = apiClient.getScaledImageUrl(item.ParentThumbItemId, {
-                    type: 'Thumb',
-                    maxWidth: width,
-                    tag: item.ParentThumbImageTag
-                });
-
+                imgType = 'Thumb';
+                imgTag = item.ParentThumbImageTag;
+                itemId = item.ParentThumbItemId;
             } else if (options.preferThumb && item.BackdropImageTags && item.BackdropImageTags.length) {
-
-                imgUrl = apiClient.getScaledImageUrl(item.Id, {
-                    type: 'Backdrop',
-                    maxWidth: width,
-                    tag: item.BackdropImageTags[0]
-                });
-
+                imgType = 'Backdrop';
+                imgTag = item.BackdropImageTags[0];
                 forceName = true;
-
             } else if (options.preferThumb && item.ParentBackdropImageTags && item.ParentBackdropImageTags.length && options.inheritThumb !== false && item.Type === 'Episode') {
-
-                imgUrl = apiClient.getScaledImageUrl(item.ParentBackdropItemId, {
-                    type: 'Backdrop',
-                    maxWidth: width,
-                    tag: item.ParentBackdropImageTags[0]
-                });
-
-            } else if (item.ImageTags && item.ImageTags.Primary) {
-
+                imgType = 'Backdrop';
+                imgTag = item.ParentBackdropImageTags[0];
+                itemId = item.ParentBackdropItemId;
+            } else if (item.ImageTags && item.ImageTags.Primary && (item.Type !== 'Episode' || item.ChildCount !== 0)) {
+                imgType = 'Primary';
+                imgTag = item.ImageTags.Primary;
                 height = width && primaryImageAspectRatio ? Math.round(width / primaryImageAspectRatio) : null;
 
-                imgUrl = apiClient.getScaledImageUrl(item.Id, {
-                    type: 'Primary',
-                    maxHeight: height,
-                    maxWidth: width,
-                    tag: item.ImageTags.Primary
-                });
-
                 if (options.preferThumb && options.showTitle !== false) {
                     forceName = true;
                 }
@@ -601,18 +554,16 @@ import 'programStyles';
                         coverImage = (Math.abs(primaryImageAspectRatio - uiAspect) / uiAspect) <= 0.2;
                     }
                 }
-
+            } else if (item.SeriesPrimaryImageTag) {
+                imgType = 'Primary';
+                imgTag = item.SeriesPrimaryImageTag;
+                itemId = item.SeriesId;
             } else if (item.PrimaryImageTag) {
-
+                imgType = 'Primary';
+                imgTag = item.PrimaryImageTag;
+                itemId = item.PrimaryImageItemId;
                 height = width && primaryImageAspectRatio ? Math.round(width / primaryImageAspectRatio) : null;
 
-                imgUrl = apiClient.getScaledImageUrl(item.PrimaryImageItemId || item.Id || item.ItemId, {
-                    type: 'Primary',
-                    maxHeight: height,
-                    maxWidth: width,
-                    tag: item.PrimaryImageTag
-                });
-
                 if (options.preferThumb && options.showTitle !== false) {
                     forceName = true;
                 }
@@ -624,30 +575,15 @@ import 'programStyles';
                     }
                 }
             } else if (item.ParentPrimaryImageTag) {
-
-                imgUrl = apiClient.getScaledImageUrl(item.ParentPrimaryImageItemId, {
-                    type: 'Primary',
-                    maxWidth: width,
-                    tag: item.ParentPrimaryImageTag
-                });
-            } else if (item.SeriesPrimaryImageTag) {
-
-                imgUrl = apiClient.getScaledImageUrl(item.SeriesId, {
-                    type: 'Primary',
-                    maxWidth: width,
-                    tag: item.SeriesPrimaryImageTag
-                });
+                imgType = 'Primary';
+                imgTag = item.ParentPrimaryImageTag;
+                itemId = item.ParentPrimaryImageItemId;
             } else if (item.AlbumId && item.AlbumPrimaryImageTag) {
-
+                imgType = 'Primary';
+                imgTag = item.AlbumPrimaryImageTag;
+                itemId = item.AlbumId;
                 height = width && primaryImageAspectRatio ? Math.round(width / primaryImageAspectRatio) : null;
 
-                imgUrl = apiClient.getScaledImageUrl(item.AlbumId, {
-                    type: 'Primary',
-                    maxHeight: height,
-                    maxWidth: width,
-                    tag: item.AlbumPrimaryImageTag
-                });
-
                 if (primaryImageAspectRatio) {
                     uiAspect = getDesiredAspect(shape);
                     if (uiAspect) {
@@ -655,57 +591,46 @@ import 'programStyles';
                     }
                 }
             } else if (item.Type === 'Season' && item.ImageTags && item.ImageTags.Thumb) {
-
-                imgUrl = apiClient.getScaledImageUrl(item.Id, {
-                    type: 'Thumb',
-                    maxWidth: width,
-                    tag: item.ImageTags.Thumb
-                });
-
+                imgType = 'Thumb';
+                imgTag = item.ImageTags.Thumb;
             } else if (item.BackdropImageTags && item.BackdropImageTags.length) {
-
-                imgUrl = apiClient.getScaledImageUrl(item.Id, {
-                    type: 'Backdrop',
-                    maxWidth: width,
-                    tag: item.BackdropImageTags[0]
-                });
-
+                imgType = 'Backdrop';
+                imgTag = item.BackdropImageTags[0];
             } else if (item.ImageTags && item.ImageTags.Thumb) {
-
-                imgUrl = apiClient.getScaledImageUrl(item.Id, {
-                    type: 'Thumb',
-                    maxWidth: width,
-                    tag: item.ImageTags.Thumb
-                });
-
+                imgType = 'Thumb';
+                imgTag = item.ImageTags.Thumb;
             } else if (item.SeriesThumbImageTag && options.inheritThumb !== false) {
-
-                imgUrl = apiClient.getScaledImageUrl(item.SeriesId, {
-                    type: 'Thumb',
-                    maxWidth: width,
-                    tag: item.SeriesThumbImageTag
-                });
-
+                imgType = 'Thumb';
+                imgTag = item.SeriesThumbImageTag;
+                itemId = item.SeriesId;
             } else if (item.ParentThumbItemId && options.inheritThumb !== false) {
-
-                imgUrl = apiClient.getScaledImageUrl(item.ParentThumbItemId, {
-                    type: 'Thumb',
-                    maxWidth: width,
-                    tag: item.ParentThumbImageTag
-                });
-
+                imgType = 'Thumb';
+                imgTag = item.ParentThumbImageTag;
+                itemId = item.ParentThumbItemId;
             } else if (item.ParentBackdropImageTags && item.ParentBackdropImageTags.length && options.inheritThumb !== false) {
-
-                imgUrl = apiClient.getScaledImageUrl(item.ParentBackdropItemId, {
-                    type: 'Backdrop',
-                    maxWidth: width,
-                    tag: item.ParentBackdropImageTags[0]
-                });
-
+                imgType = 'Backdrop';
+                imgTag = item.ParentBackdropImageTags[0];
+                itemId = item.ParentBackdropItemId;
             }
 
+            if (!itemId) {
+                itemId = item.Id;
+            }
+
+            if (imgTag && imgType) {
+                imgUrl = apiClient.getScaledImageUrl(itemId, {
+                    type: imgType,
+                    maxHeight: height,
+                    maxWidth: width,
+                    tag: imgTag
+                });
+            }
+
+            let blurHashes = options.imageBlurhashes || item.ImageBlurHashes || {};
+
             return {
                 imgUrl: imgUrl,
+                blurhash: (blurHashes[imgType] || {})[imgTag],
                 forceName: forceName,
                 coverImage: coverImage
             };
@@ -1235,10 +1160,10 @@ import 'programStyles';
         /**
          * Imports the refresh indicator element.
          */
-        function requireRefreshIndicator() {
+        function importRefreshIndicator() {
             if (!refreshIndicatorLoaded) {
                 refreshIndicatorLoaded = true;
-                require(['emby-itemrefreshindicator']);
+                import('emby-itemrefreshindicator');
             }
         }
 
@@ -1321,6 +1246,7 @@ import 'programStyles';
 
             const imgInfo = getCardImageUrl(item, apiClient, options, shape);
             const imgUrl = imgInfo.imgUrl;
+            const blurhash = imgInfo.blurhash;
 
             const forceName = imgInfo.forceName;
 
@@ -1384,7 +1310,7 @@ import 'programStyles';
             }
 
             const mediaSourceCount = item.MediaSourceCount || 1;
-            if (mediaSourceCount > 1) {
+            if (mediaSourceCount > 1 && options.disableIndicators !== true) {
                 innerCardFooter += '<div class="mediaSourceIndicator">' + mediaSourceCount + '</div>';
             }
 
@@ -1441,57 +1367,60 @@ import 'programStyles';
             let cardScalableClose = '';
 
             let cardContentClass = 'cardContent';
-            if (!options.cardLayout) {
-                cardContentClass += ' cardContent-shadow';
+
+            let blurhashAttrib = '';
+            if (blurhash && blurhash.length > 0) {
+                blurhashAttrib = 'data-blurhash="' + blurhash + '"';
             }
 
             if (layoutManager.tv) {
-
                 // Don't use the IMG tag with safari because it puts a white border around it
-                cardImageContainerOpen = imgUrl ? ('<div class="' + cardImageContainerClass + ' ' + cardContentClass + ' lazy" data-src="' + imgUrl + '">') : ('<div class="' + cardImageContainerClass + ' ' + cardContentClass + '">');
+                cardImageContainerOpen = imgUrl ? ('<div class="' + cardImageContainerClass + ' ' + cardContentClass + ' lazy" data-src="' + imgUrl + '" ' + blurhashAttrib + '>') : ('<div class="' + cardImageContainerClass + ' ' + cardContentClass + '">');
 
                 cardImageContainerClose = '</div>';
             } else {
                 // Don't use the IMG tag with safari because it puts a white border around it
-                cardImageContainerOpen = imgUrl ? ('<button data-action="' + action + '" class="cardContent-button ' + cardImageContainerClass + ' ' + cardContentClass + ' itemAction lazy" data-src="' + imgUrl + '">') : ('<button data-action="' + action + '" class="cardContent-button ' + cardImageContainerClass + ' ' + cardContentClass + ' itemAction">');
+                cardImageContainerOpen = imgUrl ? ('<button data-action="' + action + '" class="' + cardImageContainerClass + ' ' + cardContentClass + ' itemAction lazy" data-src="' + imgUrl + '" ' + blurhashAttrib + '>') : ('<button data-action="' + action + '" class="' + cardImageContainerClass + ' ' + cardContentClass + ' itemAction">');
 
                 cardImageContainerClose = '</button>';
             }
 
             let cardScalableClass = 'cardScalable';
 
-            cardImageContainerOpen = '<div class="' + cardBoxClass + '"><div class="' + cardScalableClass + '"><div class="cardPadder-' + shape + '"></div>' + cardImageContainerOpen;
+            cardImageContainerOpen = '<div class="' + cardBoxClass + '"><div class="' + cardScalableClass + '"><div class="cardPadder cardPadder-' + shape + '"></div>' + cardImageContainerOpen;
             cardBoxClose = '</div>';
             cardScalableClose = '</div>';
 
-            let indicatorsHtml = '';
+            if (options.disableIndicators !== true) {
+                let indicatorsHtml = '';
 
-            if (options.missingIndicator !== false) {
-                indicatorsHtml += indicators.getMissingIndicator(item);
-            }
+                if (options.missingIndicator !== false) {
+                    indicatorsHtml += indicators.getMissingIndicator(item);
+                }
 
-            indicatorsHtml += indicators.getSyncIndicator(item);
-            indicatorsHtml += indicators.getTimerIndicator(item);
+                indicatorsHtml += indicators.getSyncIndicator(item);
+                indicatorsHtml += indicators.getTimerIndicator(item);
 
-            indicatorsHtml += indicators.getTypeIndicator(item);
+                indicatorsHtml += indicators.getTypeIndicator(item);
 
-            if (options.showGroupCount) {
+                if (options.showGroupCount) {
 
-                indicatorsHtml += indicators.getChildCountIndicatorHtml(item, {
-                    minCount: 1
-                });
-            } else {
-                indicatorsHtml += indicators.getPlayedIndicatorHtml(item);
-            }
+                    indicatorsHtml += indicators.getChildCountIndicatorHtml(item, {
+                        minCount: 1
+                    });
+                } else {
+                    indicatorsHtml += indicators.getPlayedIndicatorHtml(item);
+                }
 
-            if (item.Type === 'CollectionFolder' || item.CollectionType) {
-                const refreshClass = item.RefreshProgress ? '' : ' class="hide"';
-                indicatorsHtml += '<div is="emby-itemrefreshindicator"' + refreshClass + ' data-progress="' + (item.RefreshProgress || 0) + '" data-status="' + item.RefreshStatus + '"></div>';
-                requireRefreshIndicator();
-            }
+                if (item.Type === 'CollectionFolder' || item.CollectionType) {
+                    const refreshClass = item.RefreshProgress ? '' : ' class="hide"';
+                    indicatorsHtml += '<div is="emby-itemrefreshindicator"' + refreshClass + ' data-progress="' + (item.RefreshProgress || 0) + '" data-status="' + item.RefreshStatus + '"></div>';
+                    importRefreshIndicator();
+                }
 
-            if (indicatorsHtml) {
-                cardImageContainerOpen += '<div class="cardIndicators">' + indicatorsHtml + '</div>';
+                if (indicatorsHtml) {
+                    cardImageContainerOpen += '<div class="cardIndicators">' + indicatorsHtml + '</div>';
+                }
             }
 
             if (!imgUrl) {
@@ -1539,8 +1468,8 @@ import 'programStyles';
 
             let additionalCardContent = '';
 
-            if (layoutManager.desktop) {
-                additionalCardContent += getHoverMenuHtml(item, action);
+            if (layoutManager.desktop && !options.disableHoverMenu) {
+                additionalCardContent += getHoverMenuHtml(item, action, options);
             }
 
             return '<' + tagName + ' data-index="' + index + '"' + timerAttributes + actionAttribute + ' data-isfolder="' + (item.IsFolder || false) + '" data-serverid="' + (item.ServerId || options.serverId) + '" data-id="' + (item.Id || item.ItemId) + '" data-type="' + item.Type + '"' + mediaTypeData + collectionTypeData + channelIdData + positionTicksData + collectionIdData + playlistIdData + contextData + parentIdData + ' data-prefix="' + prefix + '" class="' + className + '">' + cardImageContainerOpen + innerCardFooter + cardImageContainerClose + overlayButtons + additionalCardContent + cardScalableClose + outerCardFooter + cardBoxClose + '</' + tagName + '>';
@@ -1550,9 +1479,10 @@ import 'programStyles';
          * Generates HTML markup for the card overlay.
          * @param {object} item - Item used to generate the card overlay.
          * @param {string} action - Action assigned to the overlay.
+         * @param {Array} options - Card builder options.
          * @returns {string} HTML markup of the card overlay.
          */
-        function getHoverMenuHtml(item, action) {
+        function getHoverMenuHtml(item, action, options) {
             let html = '';
 
             html += '<div class="cardOverlayContainer itemAction" data-action="' + action + '">';
@@ -1568,7 +1498,7 @@ import 'programStyles';
             const userData = item.UserData || {};
 
             if (itemHelper.canMarkPlayed(item)) {
-                require(['emby-playstatebutton']);
+                import('emby-playstatebutton');
                 html += '<button is="emby-playstatebutton" type="button" data-action="none" class="' + btnCssClass + '" data-id="' + item.Id + '" data-serverid="' + item.ServerId + '" data-itemtype="' + item.Type + '" data-played="' + (userData.Played) + '"><span class="material-icons cardOverlayButtonIcon cardOverlayButtonIcon-hover check"></span></button>';
             }
 
@@ -1576,12 +1506,11 @@ import 'programStyles';
 
                 const likes = userData.Likes == null ? '' : userData.Likes;
 
-                require(['emby-ratingbutton']);
+                import('emby-ratingbutton');
                 html += '<button is="emby-ratingbutton" type="button" data-action="none" class="' + btnCssClass + '" data-id="' + item.Id + '" data-serverid="' + item.ServerId + '" data-itemtype="' + item.Type + '" data-likes="' + likes + '" data-isfavorite="' + (userData.IsFavorite) + '"><span class="material-icons cardOverlayButtonIcon cardOverlayButtonIcon-hover favorite"></span></button>';
             }
 
             html += '<button is="paper-icon-button-light" class="' + btnCssClass + '" data-action="menu"><span class="material-icons cardOverlayButtonIcon cardOverlayButtonIcon-hover more_vert"></span></button>';
-
             html += '</div>';
             html += '</div>';
 
@@ -1605,6 +1534,8 @@ import 'programStyles';
                 case 'MusicArtist':
                 case 'Person':
                     return '<span class="cardImageIcon material-icons person"></span>';
+                case 'Audio':
+                    return '<span class="cardImageIcon material-icons audiotrack"></span>';
                 case 'Movie':
                     return '<span class="cardImageIcon material-icons movie"></span>';
                 case 'Series':
@@ -1613,6 +1544,12 @@ import 'programStyles';
                     return '<span class="cardImageIcon material-icons book"></span>';
                 case 'Folder':
                     return '<span class="cardImageIcon material-icons folder"></span>';
+                case 'BoxSet':
+                    return '<span class="cardImageIcon material-icons collections"></span>';
+                case 'Playlist':
+                    return '<span class="cardImageIcon material-icons view_list"></span>';
+                case 'PhotoAlbum':
+                    return '<span class="cardImageIcon material-icons photo_album"></span>';
             }
 
             if (options && options.defaultCardImageIcon) {
diff --git a/src/components/cardbuilder/chaptercardbuilder.js b/src/components/cardbuilder/chaptercardbuilder.js
index eae60574b3..c6ee9ba3c5 100644
--- a/src/components/cardbuilder/chaptercardbuilder.js
+++ b/src/components/cardbuilder/chaptercardbuilder.js
@@ -1,13 +1,23 @@
-define(['datetime', 'imageLoader', 'connectionManager', 'layoutManager', 'browser'], function (datetime, imageLoader, connectionManager, layoutManager, browser) {
-    'use strict';
+/* eslint-disable indent */
 
-    var enableFocusTransform = !browser.slow && !browser.edge;
+/**
+ * Module for building cards from item data.
+ * @module components/cardBuilder/chaptercardbuilder
+ */
 
-    function buildChapterCardsHtml(item, chapters, options) {
+import datetime from 'datetime';
+import imageLoader from 'imageLoader';
+import connectionManager from 'connectionManager';
+import layoutManager from 'layoutManager';
+import browser from 'browser';
+
+    const enableFocusTransform = !browser.slow && !browser.edge;
+
+     function buildChapterCardsHtml(item, chapters, options) {
 
         // TODO move card creation code to Card component
 
-        var className = 'card itemAction chapterCard';
+        let className = 'card itemAction chapterCard';
 
         if (layoutManager.tv) {
             className += ' show-focus';
@@ -17,12 +27,12 @@ define(['datetime', 'imageLoader', 'connectionManager', 'layoutManager', 'browse
             }
         }
 
-        var mediaStreams = ((item.MediaSources || [])[0] || {}).MediaStreams || [];
-        var videoStream = mediaStreams.filter(function (i) {
-            return i.Type === 'Video';
+        const mediaStreams = ((item.MediaSources || [])[0] || {}).MediaStreams || [];
+        const videoStream = mediaStreams.filter(({Type}) => {
+            return Type === 'Video';
         })[0] || {};
 
-        var shape = (options.backdropShape || 'backdrop');
+        let shape = (options.backdropShape || 'backdrop');
 
         if (videoStream.Width && videoStream.Height) {
 
@@ -31,24 +41,24 @@ define(['datetime', 'imageLoader', 'connectionManager', 'layoutManager', 'browse
             }
         }
 
-        className += ' ' + shape + 'Card';
+        className += ` ${shape}Card`;
 
         if (options.block || options.rows) {
             className += ' block';
         }
 
-        var html = '';
-        var itemsInRow = 0;
+        let html = '';
+        let itemsInRow = 0;
 
-        var apiClient = connectionManager.getApiClient(item.ServerId);
+        const apiClient = connectionManager.getApiClient(item.ServerId);
 
-        for (var i = 0, length = chapters.length; i < length; i++) {
+        for (let i = 0, length = chapters.length; i < length; i++) {
 
             if (options.rows && itemsInRow === 0) {
                 html += '<div class="cardColumn">';
             }
 
-            var chapter = chapters[i];
+            const chapter = chapters[i];
 
             html += buildChapterCard(item, apiClient, chapter, i, options, className, shape);
             itemsInRow++;
@@ -62,50 +72,50 @@ define(['datetime', 'imageLoader', 'connectionManager', 'layoutManager', 'browse
         return html;
     }
 
-    function getImgUrl(item, chapter, index, maxWidth, apiClient) {
+    function getImgUrl({Id}, {ImageTag}, index, maxWidth, apiClient) {
 
-        if (chapter.ImageTag) {
+        if (ImageTag) {
 
-            return apiClient.getScaledImageUrl(item.Id, {
+            return apiClient.getScaledImageUrl(Id, {
 
                 maxWidth: maxWidth * 2,
-                tag: chapter.ImageTag,
+                tag: ImageTag,
                 type: 'Chapter',
-                index: index
+                index
             });
         }
 
         return null;
     }
 
-    function buildChapterCard(item, apiClient, chapter, index, options, className, shape) {
+    function buildChapterCard(item, apiClient, chapter, index, {width, coverImage}, className, shape) {
 
-        var imgUrl = getImgUrl(item, chapter, index, options.width || 400, apiClient);
+        const imgUrl = getImgUrl(item, chapter, index, width || 400, apiClient);
 
-        var cardImageContainerClass = 'cardContent cardContent-shadow cardImageContainer chapterCardImageContainer';
-        if (options.coverImage) {
+        let cardImageContainerClass = 'cardContent cardContent-shadow cardImageContainer chapterCardImageContainer';
+        if (coverImage) {
             cardImageContainerClass += ' coveredImage';
         }
-        var dataAttributes = ' data-action="play" data-isfolder="' + item.IsFolder + '" data-id="' + item.Id + '" data-serverid="' + item.ServerId + '" data-type="' + item.Type + '" data-mediatype="' + item.MediaType + '" data-positionticks="' + chapter.StartPositionTicks + '"';
-        var cardImageContainer = imgUrl ? ('<div class="' + cardImageContainerClass + ' lazy" data-src="' + imgUrl + '">') : ('<div class="' + cardImageContainerClass + '">');
+        const dataAttributes = ` data-action="play" data-isfolder="${item.IsFolder}" data-id="${item.Id}" data-serverid="${item.ServerId}" data-type="${item.Type}" data-mediatype="${item.MediaType}" data-positionticks="${chapter.StartPositionTicks}"`;
+        let cardImageContainer = imgUrl ? (`<div class="${cardImageContainerClass} lazy" data-src="${imgUrl}">`) : (`<div class="${cardImageContainerClass}">`);
 
         if (!imgUrl) {
             cardImageContainer += '<span class="material-icons cardImageIcon local_movies"></span>';
         }
 
-        var nameHtml = '';
-        nameHtml += '<div class="cardText">' + chapter.Name + '</div>';
-        nameHtml += '<div class="cardText">' + datetime.getDisplayRunningTime(chapter.StartPositionTicks) + '</div>';
+        let nameHtml = '';
+        nameHtml += `<div class="cardText">${chapter.Name}</div>`;
+        nameHtml += `<div class="cardText">${datetime.getDisplayRunningTime(chapter.StartPositionTicks)}</div>`;
 
-        var cardBoxCssClass = 'cardBox';
-        var cardScalableClass = 'cardScalable';
+        const cardBoxCssClass = 'cardBox';
+        const cardScalableClass = 'cardScalable';
 
-        var html = '<button type="button" class="' + className + '"' + dataAttributes + '><div class="' + cardBoxCssClass + '"><div class="' + cardScalableClass + '"><div class="cardPadder-' + shape + '"></div>' + cardImageContainer + '</div><div class="innerCardFooter">' + nameHtml + '</div></div></div></button>';
+        const html = `<button type="button" class="${className}"${dataAttributes}><div class="${cardBoxCssClass}"><div class="${cardScalableClass}"><div class="cardPadder-${shape}"></div>${cardImageContainer}</div><div class="innerCardFooter">${nameHtml}</div></div></div></button>`;
 
         return html;
     }
 
-    function buildChapterCards(item, chapters, options) {
+    export function buildChapterCards(item, chapters, options) {
 
         if (options.parentContainer) {
             // Abort if the container has been disposed
@@ -121,15 +131,16 @@ define(['datetime', 'imageLoader', 'connectionManager', 'layoutManager', 'browse
             }
         }
 
-        var html = buildChapterCardsHtml(item, chapters, options);
+        const html = buildChapterCardsHtml(item, chapters, options);
 
         options.itemsContainer.innerHTML = html;
 
         imageLoader.lazyChildren(options.itemsContainer);
     }
 
-    return {
-        buildChapterCards: buildChapterCards
-    };
+/* eslint-enable indent */
+
+export default {
+    buildChapterCards: buildChapterCards
+};
 
-});
diff --git a/src/components/cardbuilder/peoplecardbuilder.js b/src/components/cardbuilder/peoplecardbuilder.js
index 5d34d29e6e..3b9a26a704 100644
--- a/src/components/cardbuilder/peoplecardbuilder.js
+++ b/src/components/cardbuilder/peoplecardbuilder.js
@@ -1,7 +1,13 @@
-define(['cardBuilder'], function (cardBuilder) {
-    'use strict';
+/* eslint-disable indent */
 
-    function buildPeopleCards(items, options) {
+/**
+ * Module for building cards from item data.
+ * @module components/cardBuilder/peoplecardbuilder
+ */
+
+import cardBuilder from 'cardBuilder';
+
+    export function buildPeopleCards(items, options) {
 
         options = Object.assign(options || {}, {
             cardLayout: false,
@@ -15,8 +21,8 @@ define(['cardBuilder'], function (cardBuilder) {
         cardBuilder.buildCards(items, options);
     }
 
-    return {
-        buildPeopleCards: buildPeopleCards
-    };
+ /* eslint-enable indent */
 
-});
+export default {
+    buildPeopleCards: buildPeopleCards
+};
diff --git a/src/components/channelMapper/channelMapper.js b/src/components/channelMapper/channelMapper.js
index f2ad88e713..89d085c185 100644
--- a/src/components/channelMapper/channelMapper.js
+++ b/src/components/channelMapper/channelMapper.js
@@ -1,10 +1,21 @@
-define(['dom', 'dialogHelper', 'loading', 'connectionManager', 'globalize', 'actionsheet', 'emby-input', 'paper-icon-button-light', 'emby-button', 'listViewStyle', 'material-icons', 'formDialogStyle'], function (dom, dialogHelper, loading, connectionManager, globalize, actionsheet) {
-    'use strict';
+import dom from 'dom';
+import dialogHelper from 'dialogHelper';
+import loading from 'loading';
+import connectionManager from 'connectionManager';
+import globalize from 'globalize';
+import actionsheet from 'actionsheet';
+import 'emby-input';
+import 'paper-icon-button-light';
+import 'emby-button';
+import 'listViewStyle';
+import 'material-icons';
+import 'formDialogStyle';
 
-    return function (options) {
+export default class channelMapper {
+    constructor(options) {
         function mapChannel(button, channelId, providerChannelId) {
             loading.show();
-            var providerId = options.providerId;
+            const providerId = options.providerId;
             connectionManager.getApiClient(options.serverId).ajax({
                 type: 'POST',
                 url: ApiClient.getUrl('LiveTv/ChannelMappings'),
@@ -14,8 +25,8 @@ define(['dom', 'dialogHelper', 'loading', 'connectionManager', 'globalize', 'act
                     providerChannelId: providerChannelId
                 },
                 dataType: 'json'
-            }).then(function (mapping) {
-                var listItem = dom.parentWithClass(button, 'listItem');
+            }).then(mapping => {
+                const listItem = dom.parentWithClass(button, 'listItem');
                 button.setAttribute('data-providerid', mapping.ProviderChannelId);
                 listItem.querySelector('.secondary').innerHTML = getMappingSecondaryName(mapping, currentMappingOptions.ProviderName);
                 loading.hide();
@@ -23,42 +34,42 @@ define(['dom', 'dialogHelper', 'loading', 'connectionManager', 'globalize', 'act
         }
 
         function onChannelsElementClick(e) {
-            var btnMap = dom.parentWithClass(e.target, 'btnMap');
+            const btnMap = dom.parentWithClass(e.target, 'btnMap');
 
             if (btnMap) {
-                var channelId = btnMap.getAttribute('data-id');
-                var providerChannelId = btnMap.getAttribute('data-providerid');
-                var menuItems = currentMappingOptions.ProviderChannels.map(function (m) {
+                const channelId = btnMap.getAttribute('data-id');
+                const providerChannelId = btnMap.getAttribute('data-providerid');
+                const menuItems = currentMappingOptions.ProviderChannels.map(m => {
                     return {
                         name: m.Name,
                         id: m.Id,
                         selected: m.Id.toLowerCase() === providerChannelId.toLowerCase()
                     };
-                }).sort(function (a, b) {
+                }).sort((a, b) => {
                     return a.name.localeCompare(b.name);
                 });
                 actionsheet.show({
                     positionTo: btnMap,
                     items: menuItems
-                }).then(function (newChannelId) {
+                }).then(newChannelId => {
                     mapChannel(btnMap, channelId, newChannelId);
                 });
             }
         }
 
         function getChannelMappingOptions(serverId, providerId) {
-            var apiClient = connectionManager.getApiClient(serverId);
+            const apiClient = connectionManager.getApiClient(serverId);
             return apiClient.getJSON(apiClient.getUrl('LiveTv/ChannelMappingOptions', {
                 providerId: providerId
             }));
         }
 
         function getMappingSecondaryName(mapping, providerName) {
-            return (mapping.ProviderChannelName || '') + ' - ' + providerName;
+            return `${mapping.ProviderChannelName || ''} - ${providerName}`;
         }
 
         function getTunerChannelHtml(channel, providerName) {
-            var html = '';
+            let html = '';
             html += '<div class="listItem">';
             html += '<span class="material-icons listItemIcon dvr"></span>';
             html += '<div class="listItemBody two-line">';
@@ -73,16 +84,16 @@ define(['dom', 'dialogHelper', 'loading', 'connectionManager', 'globalize', 'act
 
             html += '</div>';
             html += '</div>';
-            html += '<button class="btnMap autoSize" is="paper-icon-button-light" type="button" data-id="' + channel.Id + '" data-providerid="' + channel.ProviderChannelId + '"><span class="material-icons mode_edit"></span></button>';
+            html += `<button class="btnMap autoSize" is="paper-icon-button-light" type="button" data-id="${channel.Id}" data-providerid="${channel.ProviderChannelId}"><span class="material-icons mode_edit"></span></button>`;
             return html += '</div>';
         }
 
         function getEditorHtml() {
-            var html = '';
+            let html = '';
             html += '<div class="formDialogContent smoothScrollY">';
             html += '<div class="dialogContentInner dialog-content-centered">';
             html += '<form style="margin:auto;">';
-            html += '<h1>' + globalize.translate('HeaderChannels') + '</h1>';
+            html += `<h1>${globalize.translate('HeaderChannels')}</h1>`;
             html += '<div class="channels paperList">';
             html += '</div>';
             html += '</form>';
@@ -91,30 +102,29 @@ define(['dom', 'dialogHelper', 'loading', 'connectionManager', 'globalize', 'act
         }
 
         function initEditor(dlg, options) {
-            getChannelMappingOptions(options.serverId, options.providerId).then(function (result) {
+            getChannelMappingOptions(options.serverId, options.providerId).then(result => {
                 currentMappingOptions = result;
-                var channelsElement = dlg.querySelector('.channels');
-                channelsElement.innerHTML = result.TunerChannels.map(function (channel) {
+                const channelsElement = dlg.querySelector('.channels');
+                channelsElement.innerHTML = result.TunerChannels.map(channel => {
                     return getTunerChannelHtml(channel, result.ProviderName);
                 }).join('');
                 channelsElement.addEventListener('click', onChannelsElementClick);
             });
         }
 
-        var currentMappingOptions;
-        var self = this;
+        let currentMappingOptions;
 
-        self.show = function () {
-            var dialogOptions = {
+        this.show = () => {
+            const dialogOptions = {
                 removeOnClose: true
             };
             dialogOptions.size = 'small';
-            var dlg = dialogHelper.createDialog(dialogOptions);
+            const dlg = dialogHelper.createDialog(dialogOptions);
             dlg.classList.add('formDialog');
             dlg.classList.add('ui-body-a');
             dlg.classList.add('background-theme-a');
-            var html = '';
-            var title = globalize.translate('MapChannels');
+            let html = '';
+            const title = globalize.translate('MapChannels');
             html += '<div class="formDialogHeader">';
             html += '<button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><span class="material-icons arrow_back"></span></button>';
             html += '<h3 class="formDialogHeaderTitle">';
@@ -124,13 +134,13 @@ define(['dom', 'dialogHelper', 'loading', 'connectionManager', 'globalize', 'act
             html += getEditorHtml();
             dlg.innerHTML = html;
             initEditor(dlg, options);
-            dlg.querySelector('.btnCancel').addEventListener('click', function () {
+            dlg.querySelector('.btnCancel').addEventListener('click', () => {
                 dialogHelper.close(dlg);
             });
-            return new Promise(function (resolve, reject) {
+            return new Promise(resolve => {
                 dlg.addEventListener('close', resolve);
                 dialogHelper.open(dlg);
             });
         };
-    };
-});
+    }
+}
diff --git a/src/components/collectionEditor/collectionEditor.js b/src/components/collectionEditor/collectionEditor.js
index 46b0640305..18cc0d311f 100644
--- a/src/components/collectionEditor/collectionEditor.js
+++ b/src/components/collectionEditor/collectionEditor.js
@@ -1,16 +1,32 @@
-define(['dom', 'dialogHelper', 'loading', 'apphost', 'layoutManager', 'connectionManager', 'appRouter', 'globalize', 'emby-checkbox', 'emby-input', 'paper-icon-button-light', 'emby-select', 'material-icons', 'css!./../formdialog', 'emby-button', 'flexStyles'], function (dom, dialogHelper, loading, appHost, layoutManager, connectionManager, appRouter, globalize) {
-    'use strict';
+import dom from 'dom';
+import dialogHelper from 'dialogHelper';
+import loading from 'loading';
+import appHost from 'apphost';
+import layoutManager from 'layoutManager';
+import connectionManager from 'connectionManager';
+import appRouter from 'appRouter';
+import globalize from 'globalize';
+import 'emby-checkbox';
+import 'emby-input';
+import 'paper-icon-button-light';
+import 'emby-select';
+import 'material-icons';
+import 'css!./../formdialog';
+import 'emby-button';
+import 'flexStyles';
 
-    var currentServerId;
+/* eslint-disable indent */
+
+    let currentServerId;
 
     function onSubmit(e) {
         loading.show();
 
-        var panel = dom.parentWithClass(this, 'dialog');
+        const panel = dom.parentWithClass(this, 'dialog');
 
-        var collectionId = panel.querySelector('#selectCollectionToAddTo').value;
+        const collectionId = panel.querySelector('#selectCollectionToAddTo').value;
 
-        var apiClient = connectionManager.getApiClient(currentServerId);
+        const apiClient = connectionManager.getApiClient(currentServerId);
 
         if (collectionId) {
             addToCollection(apiClient, panel, collectionId);
@@ -24,7 +40,7 @@ define(['dom', 'dialogHelper', 'loading', 'apphost', 'layoutManager', 'connectio
 
     function createCollection(apiClient, dlg) {
 
-        var url = apiClient.getUrl('Collections', {
+        const url = apiClient.getUrl('Collections', {
 
             Name: dlg.querySelector('#txtNewCollectionName').value,
             IsLocked: !dlg.querySelector('#chkEnableInternetMetadata').checked,
@@ -36,11 +52,11 @@ define(['dom', 'dialogHelper', 'loading', 'apphost', 'layoutManager', 'connectio
             url: url,
             dataType: 'json'
 
-        }).then(function (result) {
+        }).then(result => {
 
             loading.hide();
 
-            var id = result.Id;
+            const id = result.Id;
 
             dlg.submitted = true;
             dialogHelper.close(dlg);
@@ -56,7 +72,7 @@ define(['dom', 'dialogHelper', 'loading', 'apphost', 'layoutManager', 'connectio
 
     function addToCollection(apiClient, dlg, id) {
 
-        var url = apiClient.getUrl('Collections/' + id + '/Items', {
+        const url = apiClient.getUrl(`Collections/${id}/Items`, {
 
             Ids: dlg.querySelector('.fldSelectedItemIds').value || ''
         });
@@ -65,14 +81,14 @@ define(['dom', 'dialogHelper', 'loading', 'apphost', 'layoutManager', 'connectio
             type: 'POST',
             url: url
 
-        }).then(function () {
+        }).then(() => {
 
             loading.hide();
 
             dlg.submitted = true;
             dialogHelper.close(dlg);
 
-            require(['toast'], function (toast) {
+            import('toast').then(({default: toast}) => {
                 toast(globalize.translate('MessageItemsAdded'));
             });
         });
@@ -86,11 +102,11 @@ define(['dom', 'dialogHelper', 'loading', 'apphost', 'layoutManager', 'connectio
 
         loading.show();
 
-        var select = panel.querySelector('#selectCollectionToAddTo');
+        const select = panel.querySelector('#selectCollectionToAddTo');
 
         panel.querySelector('.newCollectionInfo').classList.add('hide');
 
-        var options = {
+        const options = {
 
             Recursive: true,
             IncludeItemTypes: 'BoxSet',
@@ -98,16 +114,16 @@ define(['dom', 'dialogHelper', 'loading', 'apphost', 'layoutManager', 'connectio
             EnableTotalRecordCount: false
         };
 
-        var apiClient = connectionManager.getApiClient(currentServerId);
-        apiClient.getItems(apiClient.getCurrentUserId(), options).then(function (result) {
+        const apiClient = connectionManager.getApiClient(currentServerId);
+        apiClient.getItems(apiClient.getCurrentUserId(), options).then(result => {
 
-            var html = '';
+            let html = '';
 
-            html += '<option value="">' + globalize.translate('OptionNew') + '</option>';
+            html += `<option value="">${globalize.translate('OptionNew')}</option>`;
 
-            html += result.Items.map(function (i) {
+            html += result.Items.map(i => {
 
-                return '<option value="' + i.Id + '">' + i.Name + '</option>';
+                return `<option value="${i.Id}">${i.Name}</option>`;
             });
 
             select.innerHTML = html;
@@ -120,7 +136,7 @@ define(['dom', 'dialogHelper', 'loading', 'apphost', 'layoutManager', 'connectio
 
     function getEditorHtml() {
 
-        var html = '';
+        let html = '';
 
         html += '<div class="formDialogContent smoothScrollY" style="padding-top:2em;">';
         html += '<div class="dialogContentInner dialog-content-centered">';
@@ -134,27 +150,27 @@ define(['dom', 'dialogHelper', 'loading', 'apphost', 'layoutManager', 'connectio
         html += '<br/>';
         html += '<br/>';
         html += '<div class="selectContainer">';
-        html += '<select is="emby-select" label="' + globalize.translate('LabelCollection') + '" id="selectCollectionToAddTo" autofocus></select>';
+        html += `<select is="emby-select" label="${globalize.translate('LabelCollection')}" id="selectCollectionToAddTo" autofocus></select>`;
         html += '</div>';
         html += '</div>';
 
         html += '<div class="newCollectionInfo">';
 
         html += '<div class="inputContainer">';
-        html += '<input is="emby-input" type="text" id="txtNewCollectionName" required="required" label="' + globalize.translate('LabelName') + '" />';
-        html += '<div class="fieldDescription">' + globalize.translate('NewCollectionNameExample') + '</div>';
+        html += `<input is="emby-input" type="text" id="txtNewCollectionName" required="required" label="${globalize.translate('LabelName')}" />`;
+        html += `<div class="fieldDescription">${globalize.translate('NewCollectionNameExample')}</div>`;
         html += '</div>';
 
         html += '<label class="checkboxContainer">';
         html += '<input is="emby-checkbox" type="checkbox" id="chkEnableInternetMetadata" />';
-        html += '<span>' + globalize.translate('SearchForCollectionInternetMetadata') + '</span>';
+        html += `<span>${globalize.translate('SearchForCollectionInternetMetadata')}</span>`;
         html += '</label>';
 
         // newCollectionInfo
         html += '</div>';
 
         html += '<div class="formDialogFooter">';
-        html += '<button is="emby-button" type="submit" class="raised btnSubmit block formDialogFooterItem button-submit">' + globalize.translate('ButtonOk') + '</button>';
+        html += `<button is="emby-button" type="submit" class="raised btnSubmit block formDialogFooterItem button-submit">${globalize.translate('ButtonOk')}</button>`;
         html += '</div>';
 
         html += '<input type="hidden" class="fldSelectedItemIds" />';
@@ -188,7 +204,7 @@ define(['dom', 'dialogHelper', 'loading', 'apphost', 'layoutManager', 'connectio
         } else {
             content.querySelector('.fldSelectCollection').classList.add('hide');
 
-            var selectCollectionToAddTo = content.querySelector('#selectCollectionToAddTo');
+            const selectCollectionToAddTo = content.querySelector('#selectCollectionToAddTo');
             selectCollectionToAddTo.innerHTML = '';
             selectCollectionToAddTo.value = '';
             triggerChange(selectCollectionToAddTo);
@@ -196,79 +212,77 @@ define(['dom', 'dialogHelper', 'loading', 'apphost', 'layoutManager', 'connectio
     }
 
     function centerFocus(elem, horiz, on) {
-        require(['scrollHelper'], function (scrollHelper) {
-            var fn = on ? 'on' : 'off';
+        import('scrollHelper').then(scrollHelper => {
+            const fn = on ? 'on' : 'off';
             scrollHelper.centerFocus[fn](elem, horiz);
         });
     }
 
-    function CollectionEditor() {
+    export class showEditor {
+        constructor(options) {
 
-    }
+            const items = options.items || {};
+            currentServerId = options.serverId;
 
-    CollectionEditor.prototype.show = function (options) {
-
-        var items = options.items || {};
-        currentServerId = options.serverId;
-
-        var dialogOptions = {
-            removeOnClose: true,
-            scrollY: false
-        };
-
-        if (layoutManager.tv) {
-            dialogOptions.size = 'fullscreen';
-        } else {
-            dialogOptions.size = 'small';
-        }
-
-        var dlg = dialogHelper.createDialog(dialogOptions);
-
-        dlg.classList.add('formDialog');
-
-        var html = '';
-        var title = items.length ? globalize.translate('HeaderAddToCollection') : globalize.translate('NewCollection');
-
-        html += '<div class="formDialogHeader">';
-        html += '<button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><span class="material-icons arrow_back"></span></button>';
-        html += '<h3 class="formDialogHeaderTitle">';
-        html += title;
-        html += '</h3>';
-
-        if (appHost.supports('externallinks')) {
-            html += '<a is="emby-linkbutton" class="button-link btnHelp flex align-items-center" href="https://web.archive.org/web/20181216120305/https://github.com/MediaBrowser/Wiki/wiki/Collections" target="_blank" style="margin-left:auto;margin-right:.5em;padding:.25em;" title="' + globalize.translate('Help') + '"><span class="material-icons info"></span><span style="margin-left:.25em;">' + globalize.translate('Help') + '</span></a>';
-        }
-
-        html += '</div>';
-
-        html += getEditorHtml();
-
-        dlg.innerHTML = html;
-
-        initEditor(dlg, items);
-
-        dlg.querySelector('.btnCancel').addEventListener('click', function () {
-
-            dialogHelper.close(dlg);
-        });
-
-        if (layoutManager.tv) {
-            centerFocus(dlg.querySelector('.formDialogContent'), false, true);
-        }
-
-        return dialogHelper.open(dlg).then(function () {
+            const dialogOptions = {
+                removeOnClose: true,
+                scrollY: false
+            };
 
             if (layoutManager.tv) {
-                centerFocus(dlg.querySelector('.formDialogContent'), false, false);
+                dialogOptions.size = 'fullscreen';
+            } else {
+                dialogOptions.size = 'small';
             }
 
-            if (dlg.submitted) {
-                return Promise.resolve();
+            const dlg = dialogHelper.createDialog(dialogOptions);
+
+            dlg.classList.add('formDialog');
+
+            let html = '';
+            const title = items.length ? globalize.translate('HeaderAddToCollection') : globalize.translate('NewCollection');
+
+            html += '<div class="formDialogHeader">';
+            html += '<button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><span class="material-icons arrow_back"></span></button>';
+            html += '<h3 class="formDialogHeaderTitle">';
+            html += title;
+            html += '</h3>';
+
+            if (appHost.supports('externallinks')) {
+                html += `<a is="emby-linkbutton" class="button-link btnHelp flex align-items-center" href="https://web.archive.org/web/20181216120305/https://github.com/MediaBrowser/Wiki/wiki/Collections" target="_blank" style="margin-left:auto;margin-right:.5em;padding:.25em;" title="${globalize.translate('Help')}"><span class="material-icons info"></span><span style="margin-left:.25em;">${globalize.translate('Help')}</span></a>`;
             }
 
-            return Promise.reject();
-        });
-    };
+            html += '</div>';
 
-    return CollectionEditor;
-});
+            html += getEditorHtml();
+
+            dlg.innerHTML = html;
+
+            initEditor(dlg, items);
+
+            dlg.querySelector('.btnCancel').addEventListener('click', () => {
+
+                dialogHelper.close(dlg);
+            });
+
+            if (layoutManager.tv) {
+                centerFocus(dlg.querySelector('.formDialogContent'), false, true);
+            }
+
+            return dialogHelper.open(dlg).then(() => {
+
+                if (layoutManager.tv) {
+                    centerFocus(dlg.querySelector('.formDialogContent'), false, false);
+                }
+
+                if (dlg.submitted) {
+                    return Promise.resolve();
+                }
+
+                return Promise.reject();
+            });
+        }
+    }
+
+/* eslint-enable indent */
+export default showEditor;
diff --git a/src/components/confirm/confirm.js b/src/components/confirm/confirm.js
index 517d6fa9be..2d5cfdb55c 100644
--- a/src/components/confirm/confirm.js
+++ b/src/components/confirm/confirm.js
@@ -1,5 +1,9 @@
-define(['browser', 'dialog', 'globalize'], function(browser, dialog, globalize) {
-    'use strict';
+import browser from 'browser';
+import dialog from 'dialog';
+import globalize from 'globalize';
+
+/* eslint-disable indent */
+export default (() => {
 
     function replaceAll(str, find, replace) {
         return str.split(find).join(replace);
@@ -7,7 +11,7 @@ define(['browser', 'dialog', 'globalize'], function(browser, dialog, globalize)
 
     if (browser.tv && window.confirm) {
         // Use the native confirm dialog
-        return function (options) {
+        return options => {
             if (typeof options === 'string') {
                 options = {
                     title: '',
@@ -15,8 +19,8 @@ define(['browser', 'dialog', 'globalize'], function(browser, dialog, globalize)
                 };
             }
 
-            var text = replaceAll(options.text || '', '<br/>', '\n');
-            var result = confirm(text);
+            const text = replaceAll(options.text || '', '<br/>', '\n');
+            const result = confirm(text);
 
             if (result) {
                 return Promise.resolve();
@@ -26,8 +30,8 @@ define(['browser', 'dialog', 'globalize'], function(browser, dialog, globalize)
         };
     } else {
         // Use our own dialog
-        return function (text, title) {
-            var options;
+        return (text, title) => {
+            let options;
             if (typeof text === 'string') {
                 options = {
                     title: title,
@@ -37,7 +41,7 @@ define(['browser', 'dialog', 'globalize'], function(browser, dialog, globalize)
                 options = text;
             }
 
-            var items = [];
+            const items = [];
 
             items.push({
                 name: options.cancelText || globalize.translate('ButtonCancel'),
@@ -53,7 +57,7 @@ define(['browser', 'dialog', 'globalize'], function(browser, dialog, globalize)
 
             options.buttons = items;
 
-            return dialog(options).then(function (result) {
+            return dialog.show(options).then(result => {
                 if (result === 'ok') {
                     return Promise.resolve();
                 }
@@ -62,4 +66,5 @@ define(['browser', 'dialog', 'globalize'], function(browser, dialog, globalize)
             });
         };
     }
-});
+})();
+/* eslint-enable indent */
diff --git a/src/components/dialog/dialog.js b/src/components/dialog/dialog.js
index cfb5821b38..937e96d297 100644
--- a/src/components/dialog/dialog.js
+++ b/src/components/dialog/dialog.js
@@ -1,20 +1,31 @@
-define(['dialogHelper', 'dom', 'layoutManager', 'scrollHelper', 'globalize', 'require', 'material-icons', 'emby-button', 'paper-icon-button-light', 'emby-input', 'formDialogStyle', 'flexStyles'], function (dialogHelper, dom, layoutManager, scrollHelper, globalize, require) {
-    'use strict';
+import dialogHelper from 'dialogHelper';
+import dom from 'dom';
+import layoutManager from 'layoutManager';
+import scrollHelper from 'scrollHelper';
+import globalize from 'globalize';
+import 'material-icons';
+import 'emby-button';
+import 'paper-icon-button-light';
+import 'emby-input';
+import 'formDialogStyle';
+import 'flexStyles';
+
+/* eslint-disable indent */
 
     function showDialog(options, template) {
 
-        var dialogOptions = {
+        const dialogOptions = {
             removeOnClose: true,
             scrollY: false
         };
 
-        var enableTvLayout = layoutManager.tv;
+        const enableTvLayout = layoutManager.tv;
 
         if (enableTvLayout) {
             dialogOptions.size = 'fullscreen';
         }
 
-        var dlg = dialogHelper.createDialog(dialogOptions);
+        const dlg = dialogHelper.createDialog(dialogOptions);
 
         dlg.classList.add('formDialog');
 
@@ -22,7 +33,7 @@ define(['dialogHelper', 'dom', 'layoutManager', 'scrollHelper', 'globalize', 're
 
         dlg.classList.add('align-items-center');
         dlg.classList.add('justify-content-center');
-        var formDialogContent = dlg.querySelector('.formDialogContent');
+        const formDialogContent = dlg.querySelector('.formDialogContent');
         formDialogContent.classList.add('no-grow');
 
         if (enableTvLayout) {
@@ -30,7 +41,7 @@ define(['dialogHelper', 'dom', 'layoutManager', 'scrollHelper', 'globalize', 're
             formDialogContent.style['max-height'] = '60%';
             scrollHelper.centerFocus.on(formDialogContent, false);
         } else {
-            formDialogContent.style.maxWidth = (Math.min((options.buttons.length * 150) + 200, dom.getWindowSize().innerWidth - 50)) + 'px';
+            formDialogContent.style.maxWidth = `${Math.min((options.buttons.length * 150) + 200, dom.getWindowSize().innerWidth - 50)}px`;
             dlg.classList.add('dialog-fullscreen-lowres');
         }
 
@@ -44,27 +55,27 @@ define(['dialogHelper', 'dom', 'layoutManager', 'scrollHelper', 'globalize', 're
             dlg.querySelector('.formDialogHeaderTitle').classList.add('hide');
         }
 
-        var displayText = options.html || options.text || '';
+        const displayText = options.html || options.text || '';
         dlg.querySelector('.text').innerHTML = displayText;
 
         if (!displayText) {
             dlg.querySelector('.dialogContentInner').classList.add('hide');
         }
 
-        var i;
-        var length;
-        var html = '';
-        var hasDescriptions = false;
+        let i;
+        let length;
+        let html = '';
+        let hasDescriptions = false;
 
         for (i = 0, length = options.buttons.length; i < length; i++) {
 
-            var item = options.buttons[i];
-            var autoFocus = i === 0 ? ' autofocus' : '';
+            const item = options.buttons[i];
+            const autoFocus = i === 0 ? ' autofocus' : '';
 
-            var buttonClass = 'btnOption raised formDialogFooterItem formDialogFooterItem-autosize';
+            let buttonClass = 'btnOption raised formDialogFooterItem formDialogFooterItem-autosize';
 
             if (item.type) {
-                buttonClass += ' button-' + item.type;
+                buttonClass += ` button-${item.type}`;
             }
 
             if (item.description) {
@@ -75,10 +86,10 @@ define(['dialogHelper', 'dom', 'layoutManager', 'scrollHelper', 'globalize', 're
                 buttonClass += ' formDialogFooterItem-vertical formDialogFooterItem-nomarginbottom';
             }
 
-            html += '<button is="emby-button" type="button" class="' + buttonClass + '" data-id="' + item.id + '"' + autoFocus + '>' + item.name + '</button>';
+            html += `<button is="emby-button" type="button" class="${buttonClass}" data-id="${item.id}"${autoFocus}>${item.name}</button>`;
 
             if (item.description) {
-                html += '<div class="formDialogFooterItem formDialogFooterItem-autosize fieldDescription" style="margin-top:.25em!important;margin-bottom:1.25em!important;">' + item.description + '</div>';
+                html += `<div class="formDialogFooterItem formDialogFooterItem-autosize fieldDescription" style="margin-top:.25em!important;margin-bottom:1.25em!important;">${item.description}</div>`;
             }
         }
 
@@ -88,18 +99,18 @@ define(['dialogHelper', 'dom', 'layoutManager', 'scrollHelper', 'globalize', 're
             dlg.querySelector('.formDialogFooter').classList.add('formDialogFooter-vertical');
         }
 
-        var dialogResult;
+        let dialogResult;
         function onButtonClick() {
             dialogResult = this.getAttribute('data-id');
             dialogHelper.close(dlg);
         }
 
-        var buttons = dlg.querySelectorAll('.btnOption');
+        const buttons = dlg.querySelectorAll('.btnOption');
         for (i = 0, length = buttons.length; i < length; i++) {
             buttons[i].addEventListener('click', onButtonClick);
         }
 
-        return dialogHelper.open(dlg).then(function () {
+        return dialogHelper.open(dlg).then(() => {
 
             if (enableTvLayout) {
                 scrollHelper.centerFocus.off(dlg.querySelector('.formDialogContent'), false);
@@ -113,9 +124,9 @@ define(['dialogHelper', 'dom', 'layoutManager', 'scrollHelper', 'globalize', 're
         });
     }
 
-    return function (text, title) {
+    export async function show(text, title) {
 
-        var options;
+        let options;
         if (typeof text === 'string') {
             options = {
                 title: title,
@@ -125,10 +136,13 @@ define(['dialogHelper', 'dom', 'layoutManager', 'scrollHelper', 'globalize', 're
             options = text;
         }
 
-        return new Promise(function (resolve, reject) {
-            require(['text!./dialog.template.html'], function (template) {
-                showDialog(options, template).then(resolve, reject);
-            });
+        const { default: template } = await import('text!./dialog.template.html');
+        return new Promise((resolve, reject) => {
+            showDialog(options, template).then(resolve, reject);
         });
-    };
-});
+    }
+
+/* eslint-enable indent */
+export default {
+    show: show
+};
diff --git a/src/components/dialog/dialog.template.html b/src/components/dialog/dialog.template.html
index bee0ef7f73..6d4310c0f4 100644
--- a/src/components/dialog/dialog.template.html
+++ b/src/components/dialog/dialog.template.html
@@ -4,12 +4,8 @@
 
 <div class="formDialogContent smoothScrollY">
     <div class="dialogContentInner dialog-content-centered" style="padding-top:1em;padding-bottom: 1em; text-align: center;">
-
-        <div class="text">
-
-        </div>
+        <div class="text"></div>
     </div>
 </div>
 
-<div class="formDialogFooter formDialogFooter-clear formDialogFooter-flex" style="padding-bottom: 1.5em;">
-</div>
+<div class="formDialogFooter formDialogFooter-clear formDialogFooter-flex" style="margin:1em"></div>
diff --git a/src/components/dialogHelper/dialogHelper.js b/src/components/dialogHelper/dialogHelper.js
index 8b08cde678..ca7c94a416 100644
--- a/src/components/dialogHelper/dialogHelper.js
+++ b/src/components/dialogHelper/dialogHelper.js
@@ -1,7 +1,15 @@
-define(['appRouter', 'focusManager', 'browser', 'layoutManager', 'inputManager', 'dom', 'css!./dialoghelper.css', 'scrollStyles'], function (appRouter, focusManager, browser, layoutManager, inputManager, dom) {
-    'use strict';
+import appRouter from 'appRouter';
+import focusManager from 'focusManager';
+import browser from 'browser';
+import layoutManager from 'layoutManager';
+import inputManager from 'inputManager';
+import dom from 'dom';
+import 'css!./dialoghelper.css';
+import 'scrollStyles';
 
-    var globalOnOpenCallback;
+/* eslint-disable indent */
+
+    let globalOnOpenCallback;
 
     function enableAnimation() {
 
@@ -25,7 +33,7 @@ define(['appRouter', 'focusManager', 'browser', 'layoutManager', 'inputManager',
     }
 
     function tryRemoveElement(elem) {
-        var parentNode = elem.parentNode;
+        const parentNode = elem.parentNode;
         if (parentNode) {
 
             // Seeing crashes in edge webview
@@ -39,14 +47,14 @@ define(['appRouter', 'focusManager', 'browser', 'layoutManager', 'inputManager',
 
     function DialogHashHandler(dlg, hash, resolve) {
 
-        var self = this;
+        const self = this;
         self.originalUrl = window.location.href;
-        var activeElement = document.activeElement;
-        var removeScrollLockOnClose = false;
+        const activeElement = document.activeElement;
+        let removeScrollLockOnClose = false;
 
         function onHashChange(e) {
 
-            var isBack = self.originalUrl === window.location.href;
+            const isBack = self.originalUrl === window.location.href;
 
             if (isBack || !isOpened(dlg)) {
                 window.removeEventListener('popstate', onHashChange);
@@ -84,7 +92,7 @@ define(['appRouter', 'focusManager', 'browser', 'layoutManager', 'inputManager',
             }
 
             if (!self.closedByBack && isHistoryEnabled(dlg)) {
-                var state = history.state || {};
+                const state = history.state || {};
                 if (state.dialogId === hash) {
                     history.back();
                 }
@@ -97,7 +105,7 @@ define(['appRouter', 'focusManager', 'browser', 'layoutManager', 'inputManager',
             if (dlg.getAttribute('data-removeonclose') !== 'false') {
                 removeCenterFocus(dlg);
 
-                var dialogContainer = dlg.dialogContainer;
+                const dialogContainer = dlg.dialogContainer;
                 if (dialogContainer) {
                     tryRemoveElement(dialogContainer);
                     dlg.dialogContainer = null;
@@ -108,7 +116,7 @@ define(['appRouter', 'focusManager', 'browser', 'layoutManager', 'inputManager',
 
             //resolve();
             // if we just called history.back(), then use a timeout to allow the history events to fire first
-            setTimeout(function () {
+            setTimeout(() => {
                 resolve({
                     element: dlg,
                     closedByBack: self.closedByBack
@@ -118,7 +126,7 @@ define(['appRouter', 'focusManager', 'browser', 'layoutManager', 'inputManager',
 
         dlg.addEventListener('close', onDialogClosed);
 
-        var center = !dlg.classList.contains('dialog-fixedSize');
+        const center = !dlg.classList.contains('dialog-fixedSize');
         if (center) {
             dlg.classList.add('centeredDialog');
         }
@@ -141,7 +149,7 @@ define(['appRouter', 'focusManager', 'browser', 'layoutManager', 'inputManager',
         animateDialogOpen(dlg);
 
         if (isHistoryEnabled(dlg)) {
-            appRouter.pushState({ dialogId: hash }, 'Dialog', '#' + hash);
+            appRouter.pushState({ dialogId: hash }, 'Dialog', `#${hash}`);
 
             window.addEventListener('popstate', onHashChange);
         } else {
@@ -151,10 +159,10 @@ define(['appRouter', 'focusManager', 'browser', 'layoutManager', 'inputManager',
 
     function addBackdropOverlay(dlg) {
 
-        var backdrop = document.createElement('div');
+        const backdrop = document.createElement('div');
         backdrop.classList.add('dialogBackdrop');
 
-        var backdropParent = dlg.dialogContainer || dlg;
+        const backdropParent = dlg.dialogContainer || dlg;
         backdropParent.parentNode.insertBefore(backdrop, backdropParent);
         dlg.backdrop = backdrop;
 
@@ -162,7 +170,7 @@ define(['appRouter', 'focusManager', 'browser', 'layoutManager', 'inputManager',
         void backdrop.offsetWidth;
         backdrop.classList.add('dialogBackdropOpened');
 
-        dom.addEventListener((dlg.dialogContainer || backdrop), 'click', function (e) {
+        dom.addEventListener((dlg.dialogContainer || backdrop), 'click', e => {
             if (e.target === dlg.dialogContainer) {
                 close(dlg);
             }
@@ -170,7 +178,7 @@ define(['appRouter', 'focusManager', 'browser', 'layoutManager', 'inputManager',
             passive: true
         });
 
-        dom.addEventListener((dlg.dialogContainer || backdrop), 'contextmenu', function (e) {
+        dom.addEventListener((dlg.dialogContainer || backdrop), 'contextmenu', e => {
             if (e.target === dlg.dialogContainer) {
                 // Close the application dialog menu
                 close(dlg);
@@ -184,26 +192,26 @@ define(['appRouter', 'focusManager', 'browser', 'layoutManager', 'inputManager',
         return dlg.getAttribute('data-history') === 'true';
     }
 
-    function open(dlg) {
+    export function open(dlg) {
 
         if (globalOnOpenCallback) {
             globalOnOpenCallback(dlg);
         }
 
-        var parent = dlg.parentNode;
+        const parent = dlg.parentNode;
         if (parent) {
             parent.removeChild(dlg);
         }
 
-        var dialogContainer = document.createElement('div');
+        const dialogContainer = document.createElement('div');
         dialogContainer.classList.add('dialogContainer');
         dialogContainer.appendChild(dlg);
         dlg.dialogContainer = dialogContainer;
         document.body.appendChild(dialogContainer);
 
-        return new Promise(function (resolve, reject) {
+        return new Promise((resolve, reject) => {
 
-            new DialogHashHandler(dlg, 'dlg' + new Date().getTime(), resolve);
+            new DialogHashHandler(dlg, `dlg${new Date().getTime()}`, resolve);
         });
     }
 
@@ -213,7 +221,7 @@ define(['appRouter', 'focusManager', 'browser', 'layoutManager', 'inputManager',
         return !dlg.classList.contains('hide');
     }
 
-    function close(dlg) {
+    export function close(dlg) {
 
         if (isOpened(dlg)) {
             if (isHistoryEnabled(dlg)) {
@@ -233,7 +241,7 @@ define(['appRouter', 'focusManager', 'browser', 'layoutManager', 'inputManager',
                 cancelable: false
             }));
 
-            var onAnimationFinish = function () {
+            const onAnimationFinish = () => {
                 focusManager.popScope(dlg);
 
                 dlg.classList.add('hide');
@@ -249,7 +257,7 @@ define(['appRouter', 'focusManager', 'browser', 'layoutManager', 'inputManager',
 
     function animateDialogOpen(dlg) {
 
-        var onAnimationFinish = function () {
+        const onAnimationFinish = () => {
             focusManager.pushScope(dlg);
 
             if (dlg.getAttribute('data-autofocus') === 'true') {
@@ -264,7 +272,7 @@ define(['appRouter', 'focusManager', 'browser', 'layoutManager', 'inputManager',
 
         if (enableAnimation()) {
 
-            var onFinish = function () {
+            const onFinish = () => {
                 dom.removeEventListener(dlg, dom.whichAnimationEvent(), onFinish, {
                     once: true
                 });
@@ -283,24 +291,24 @@ define(['appRouter', 'focusManager', 'browser', 'layoutManager', 'inputManager',
 
         if (enableAnimation()) {
 
-            var animated = true;
+            let animated = true;
 
             switch (dlg.animationConfig.exit.name) {
 
                 case 'fadeout':
-                    dlg.style.animation = 'fadeout ' + dlg.animationConfig.exit.timing.duration + 'ms ease-out normal both';
+                    dlg.style.animation = `fadeout ${dlg.animationConfig.exit.timing.duration}ms ease-out normal both`;
                     break;
                 case 'scaledown':
-                    dlg.style.animation = 'scaledown ' + dlg.animationConfig.exit.timing.duration + 'ms ease-out normal both';
+                    dlg.style.animation = `scaledown ${dlg.animationConfig.exit.timing.duration}ms ease-out normal both`;
                     break;
                 case 'slidedown':
-                    dlg.style.animation = 'slidedown ' + dlg.animationConfig.exit.timing.duration + 'ms ease-out normal both';
+                    dlg.style.animation = `slidedown ${dlg.animationConfig.exit.timing.duration}ms ease-out normal both`;
                     break;
                 default:
                     animated = false;
                     break;
             }
-            var onFinish = function () {
+            const onFinish = () => {
                 dom.removeEventListener(dlg, dom.whichAnimationEvent(), onFinish, {
                     once: true
                 });
@@ -318,7 +326,7 @@ define(['appRouter', 'focusManager', 'browser', 'layoutManager', 'inputManager',
         onAnimationFinish();
     }
 
-    var supportsOverscrollBehavior = 'overscroll-behavior-y' in document.body.style;
+    const supportsOverscrollBehavior = 'overscroll-behavior-y' in document.body.style;
 
     function shouldLockDocumentScroll(options) {
 
@@ -343,7 +351,7 @@ define(['appRouter', 'focusManager', 'browser', 'layoutManager', 'inputManager',
 
     function removeBackdrop(dlg) {
 
-        var backdrop = dlg.backdrop;
+        const backdrop = dlg.backdrop;
 
         if (!backdrop) {
             return;
@@ -351,7 +359,7 @@ define(['appRouter', 'focusManager', 'browser', 'layoutManager', 'inputManager',
 
         dlg.backdrop = null;
 
-        var onAnimationFinish = function () {
+        const onAnimationFinish = () => {
             tryRemoveElement(backdrop);
         };
 
@@ -368,20 +376,20 @@ define(['appRouter', 'focusManager', 'browser', 'layoutManager', 'inputManager',
     }
 
     function centerFocus(elem, horiz, on) {
-        require(['scrollHelper'], function (scrollHelper) {
-            var fn = on ? 'on' : 'off';
+        import('scrollHelper').then(scrollHelper => {
+            const fn = on ? 'on' : 'off';
             scrollHelper.centerFocus[fn](elem, horiz);
         });
     }
 
-    function createDialog(options) {
+    export function createDialog(options) {
 
         options = options || {};
 
         // If there's no native dialog support, use a plain div
         // Also not working well in samsung tizen browser, content inside not clickable
         // Just go ahead and always use a plain div because we're seeing issues overlaying absoltutely positioned content over a modal dialog
-        var dlg = document.createElement('div');
+        const dlg = document.createElement('div');
 
         dlg.classList.add('focuscontainer');
         dlg.classList.add('hide');
@@ -406,17 +414,17 @@ define(['appRouter', 'focusManager', 'browser', 'layoutManager', 'inputManager',
             dlg.setAttribute('data-autofocus', 'true');
         }
 
-        var defaultEntryAnimation;
-        var defaultExitAnimation;
+        let defaultEntryAnimation;
+        let defaultExitAnimation;
 
         defaultEntryAnimation = 'scaleup';
         defaultExitAnimation = 'scaledown';
-        var entryAnimation = options.entryAnimation || defaultEntryAnimation;
-        var exitAnimation = options.exitAnimation || defaultExitAnimation;
+        const entryAnimation = options.entryAnimation || defaultEntryAnimation;
+        const exitAnimation = options.exitAnimation || defaultExitAnimation;
 
         // If it's not fullscreen then lower the default animation speed to make it open really fast
-        var entryAnimationDuration = options.entryAnimationDuration || (options.size !== 'fullscreen' ? 180 : 280);
-        var exitAnimationDuration = options.exitAnimationDuration || (options.size !== 'fullscreen' ? 120 : 220);
+        const entryAnimationDuration = options.entryAnimationDuration || (options.size !== 'fullscreen' ? 180 : 280);
+        const exitAnimationDuration = options.exitAnimationDuration || (options.size !== 'fullscreen' ? 120 : 220);
 
         dlg.animationConfig = {
             // scale up
@@ -461,7 +469,7 @@ define(['appRouter', 'focusManager', 'browser', 'layoutManager', 'inputManager',
 
         if (options.size) {
             dlg.classList.add('dialog-fixedSize');
-            dlg.classList.add('dialog-' + options.size);
+            dlg.classList.add(`dialog-${options.size}`);
         }
 
         if (enableAnimation()) {
@@ -469,16 +477,16 @@ define(['appRouter', 'focusManager', 'browser', 'layoutManager', 'inputManager',
             switch (dlg.animationConfig.entry.name) {
 
                 case 'fadein':
-                    dlg.style.animation = 'fadein ' + entryAnimationDuration + 'ms ease-out normal';
+                    dlg.style.animation = `fadein ${entryAnimationDuration}ms ease-out normal`;
                     break;
                 case 'scaleup':
-                    dlg.style.animation = 'scaleup ' + entryAnimationDuration + 'ms ease-out normal both';
+                    dlg.style.animation = `scaleup ${entryAnimationDuration}ms ease-out normal both`;
                     break;
                 case 'slideup':
-                    dlg.style.animation = 'slideup ' + entryAnimationDuration + 'ms ease-out normal';
+                    dlg.style.animation = `slideup ${entryAnimationDuration}ms ease-out normal`;
                     break;
                 case 'slidedown':
-                    dlg.style.animation = 'slidedown ' + entryAnimationDuration + 'ms ease-out normal';
+                    dlg.style.animation = `slidedown ${entryAnimationDuration}ms ease-out normal`;
                     break;
                 default:
                     break;
@@ -488,12 +496,15 @@ define(['appRouter', 'focusManager', 'browser', 'layoutManager', 'inputManager',
         return dlg;
     }
 
-    return {
-        open: open,
-        close: close,
-        createDialog: createDialog,
-        setOnOpen: function (val) {
-            globalOnOpenCallback = val;
-        }
-    };
-});
+    export function setOnOpen(val) {
+        globalOnOpenCallback = val;
+    }
+
+/* eslint-enable indent */
+
+export default {
+    open: open,
+    close: close,
+    createDialog: createDialog,
+    setOnOpen: setOnOpen
+};
diff --git a/src/components/directorybrowser/directorybrowser.js b/src/components/directorybrowser/directorybrowser.js
index e08fcc8336..41744bdcbb 100644
--- a/src/components/directorybrowser/directorybrowser.js
+++ b/src/components/directorybrowser/directorybrowser.js
@@ -1,9 +1,19 @@
-define(['loading', 'dialogHelper', 'dom', 'globalize', 'listViewStyle', 'emby-input', 'paper-icon-button-light', 'css!./directorybrowser', 'formDialogStyle', 'emby-button'], function(loading, dialogHelper, dom, globalize) {
-    'use strict';
+import loading from 'loading';
+import dialogHelper from 'dialogHelper';
+import dom from 'dom';
+import globalize from 'globalize';
+import 'listViewStyle';
+import 'emby-input';
+import 'paper-icon-button-light';
+import 'css!./directorybrowser';
+import 'formDialogStyle';
+import 'emby-button';
+
+/* eslint-disable indent */
 
     function getSystemInfo() {
         return systemInfo ? Promise.resolve(systemInfo) : ApiClient.getPublicSystemInfo().then(
-            function(info) {
+            info => {
                 systemInfo = info;
                 return info;
             }
@@ -21,9 +31,9 @@ define(['loading', 'dialogHelper', 'dom', 'globalize', 'listViewStyle', 'emby-in
 
         loading.show();
 
-        var promises = [];
+        const promises = [];
 
-        if ('Network' === path) {
+        if (path === 'Network') {
             promises.push(ApiClient.getNetworkDevices());
         } else {
             if (path) {
@@ -35,10 +45,10 @@ define(['loading', 'dialogHelper', 'dom', 'globalize', 'listViewStyle', 'emby-in
         }
 
         Promise.all(promises).then(
-            function(responses) {
-                var folders = responses[0];
-                var parentPath = responses[1] || '';
-                var html = '';
+            responses => {
+                const folders = responses[0];
+                const parentPath = responses[1] || '';
+                let html = '';
 
                 page.querySelector('.results').scrollTop = 0;
                 page.querySelector('#txtDirectoryPickerPath').value = path || '';
@@ -46,9 +56,9 @@ define(['loading', 'dialogHelper', 'dom', 'globalize', 'listViewStyle', 'emby-in
                 if (path) {
                     html += getItem('lnkPath lnkDirectory', '', parentPath, '...');
                 }
-                for (var i = 0, length = folders.length; i < length; i++) {
-                    var folder = folders[i];
-                    var cssClass = 'File' === folder.Type ? 'lnkPath lnkFile' : 'lnkPath lnkDirectory';
+                for (let i = 0, length = folders.length; i < length; i++) {
+                    const folder = folders[i];
+                    const cssClass = folder.Type === 'File' ? 'lnkPath lnkFile' : 'lnkPath lnkDirectory';
                     html += getItem(cssClass, folder.Type, folder.Path, folder.Name);
                 }
 
@@ -58,7 +68,7 @@ define(['loading', 'dialogHelper', 'dom', 'globalize', 'listViewStyle', 'emby-in
 
                 page.querySelector('.results').innerHTML = html;
                 loading.hide();
-            }, function() {
+            }, () => {
                 if (updatePathOnError) {
                     page.querySelector('#txtDirectoryPickerPath').value = '';
                     page.querySelector('.results').innerHTML = '';
@@ -69,8 +79,8 @@ define(['loading', 'dialogHelper', 'dom', 'globalize', 'listViewStyle', 'emby-in
     }
 
     function getItem(cssClass, type, path, name) {
-        var html = '';
-        html += '<div class="listItem listItem-border ' + cssClass + '" data-type="' + type + '" data-path="' + path + '">';
+        let html = '';
+        html += `<div class="listItem listItem-border ${cssClass}" data-type="${type}" data-path="${path}">`;
         html += '<div class="listItemBody" style="padding-left:0;padding-top:.5em;padding-bottom:.5em;">';
         html += '<div class="listItemBodyText">';
         html += name;
@@ -82,19 +92,19 @@ define(['loading', 'dialogHelper', 'dom', 'globalize', 'listViewStyle', 'emby-in
     }
 
     function getEditorHtml(options, systemInfo) {
-        var html = '';
+        let html = '';
         html += '<div class="formDialogContent scrollY">';
         html += '<div class="dialogContentInner dialog-content-centered" style="padding-top:2em;">';
         if (!options.pathReadOnly) {
-            var instruction = options.instruction ? options.instruction + '<br/><br/>' : '';
+            const instruction = options.instruction ? `${options.instruction}<br/><br/>` : '';
             html += '<div class="infoBanner" style="margin-bottom:1.5em;">';
             html += instruction;
-            if ('bsd' === systemInfo.OperatingSystem.toLowerCase()) {
+            if (systemInfo.OperatingSystem.toLowerCase() === 'bsd') {
                 html += '<br/>';
                 html += '<br/>';
                 html += globalize.translate('MessageDirectoryPickerBSDInstruction');
                 html += '<br/>';
-            } else if ('linux' === systemInfo.OperatingSystem.toLowerCase()) {
+            } else if (systemInfo.OperatingSystem.toLowerCase() === 'linux') {
                 html += '<br/>';
                 html += '<br/>';
                 html += globalize.translate('MessageDirectoryPickerLinuxInstruction');
@@ -105,17 +115,17 @@ define(['loading', 'dialogHelper', 'dom', 'globalize', 'listViewStyle', 'emby-in
         html += '<form style="margin:auto;">';
         html += '<div class="inputContainer" style="display: flex; align-items: center;">';
         html += '<div style="flex-grow:1;">';
-        var labelKey;
+        let labelKey;
         if (options.includeFiles !== true) {
             labelKey = 'LabelFolder';
         } else {
             labelKey = 'LabelPath';
         }
-        var readOnlyAttribute = options.pathReadOnly ? ' readonly' : '';
-        html += '<input is="emby-input" id="txtDirectoryPickerPath" type="text" required="required" ' + readOnlyAttribute + ' label="' + globalize.translate(labelKey) + '"/>';
+        const readOnlyAttribute = options.pathReadOnly ? ' readonly' : '';
+        html += `<input is="emby-input" id="txtDirectoryPickerPath" type="text" required="required" ${readOnlyAttribute} label="${globalize.translate(labelKey)}"/>`;
         html += '</div>';
         if (!readOnlyAttribute) {
-            html += '<button type="button" is="paper-icon-button-light" class="btnRefreshDirectories emby-input-iconbutton" title="' + globalize.translate('ButtonRefresh') + '"><span class="material-icons search"></span></button>';
+            html += `<button type="button" is="paper-icon-button-light" class="btnRefreshDirectories emby-input-iconbutton" title="${globalize.translate('ButtonRefresh')}"><span class="material-icons search"></span></button>`;
         }
         html += '</div>';
         if (!readOnlyAttribute) {
@@ -123,14 +133,14 @@ define(['loading', 'dialogHelper', 'dom', 'globalize', 'listViewStyle', 'emby-in
         }
         if (options.enableNetworkSharePath) {
             html += '<div class="inputContainer" style="margin-top:2em;">';
-            html += '<input is="emby-input" id="txtNetworkPath" type="text" label="' + globalize.translate('LabelOptionalNetworkPath') + '"/>';
+            html += `<input is="emby-input" id="txtNetworkPath" type="text" label="${globalize.translate('LabelOptionalNetworkPath')}"/>`;
             html += '<div class="fieldDescription">';
             html += globalize.translate('LabelOptionalNetworkPathHelp', '<b>\\\\server</b>', '<b>\\\\192.168.1.101</b>');
             html += '</div>';
             html += '</div>';
         }
         html += '<div class="formDialogFooter">';
-        html += '<button is="emby-button" type="submit" class="raised button-submit block formDialogFooterItem">' + globalize.translate('ButtonOk') + '</button>';
+        html += `<button is="emby-button" type="submit" class="raised button-submit block formDialogFooterItem">${globalize.translate('ButtonOk')}</button>`;
         html += '</div>';
         html += '</form>';
         html += '</div>';
@@ -147,7 +157,7 @@ define(['loading', 'dialogHelper', 'dom', 'globalize', 'listViewStyle', 'emby-in
     }
 
     function alertTextWithOptions(options) {
-        require(['alert'], function(alert) {
+        import('alert').then(({default: alert}) => {
             alert(options);
         });
     }
@@ -160,7 +170,7 @@ define(['loading', 'dialogHelper', 'dom', 'globalize', 'listViewStyle', 'emby-in
                 ValidateWriteable: validateWriteable,
                 Path: path
             }
-        }).catch(function(response) {
+        }).catch(response => {
             if (response) {
                 if (response.status === 404) {
                     alertText(globalize.translate('PathNotFound'));
@@ -180,10 +190,10 @@ define(['loading', 'dialogHelper', 'dom', 'globalize', 'listViewStyle', 'emby-in
     }
 
     function initEditor(content, options, fileOptions) {
-        content.addEventListener('click', function(e) {
-            var lnkPath = dom.parentWithClass(e.target, 'lnkPath');
+        content.addEventListener('click', e => {
+            const lnkPath = dom.parentWithClass(e.target, 'lnkPath');
             if (lnkPath) {
-                var path = lnkPath.getAttribute('data-path');
+                const path = lnkPath.getAttribute('data-path');
                 if (lnkPath.classList.contains('lnkFile')) {
                     content.querySelector('#txtDirectoryPickerPath').value = path;
                 } else {
@@ -192,25 +202,25 @@ define(['loading', 'dialogHelper', 'dom', 'globalize', 'listViewStyle', 'emby-in
             }
         });
 
-        content.addEventListener('click', function(e) {
+        content.addEventListener('click', e => {
             if (dom.parentWithClass(e.target, 'btnRefreshDirectories')) {
-                var path = content.querySelector('#txtDirectoryPickerPath').value;
+                const path = content.querySelector('#txtDirectoryPickerPath').value;
                 refreshDirectoryBrowser(content, path, fileOptions);
             }
         });
 
-        content.addEventListener('change', function(e) {
-            var txtDirectoryPickerPath = dom.parentWithTag(e.target, 'INPUT');
-            if (txtDirectoryPickerPath && 'txtDirectoryPickerPath' === txtDirectoryPickerPath.id) {
+        content.addEventListener('change', e => {
+            const txtDirectoryPickerPath = dom.parentWithTag(e.target, 'INPUT');
+            if (txtDirectoryPickerPath && txtDirectoryPickerPath.id === 'txtDirectoryPickerPath') {
                 refreshDirectoryBrowser(content, txtDirectoryPickerPath.value, fileOptions);
             }
         });
 
         content.querySelector('form').addEventListener('submit', function(e) {
             if (options.callback) {
-                var networkSharePath = this.querySelector('#txtNetworkPath');
+                let networkSharePath = this.querySelector('#txtNetworkPath');
                 networkSharePath = networkSharePath ? networkSharePath.value : null;
-                var path = this.querySelector('#txtDirectoryPickerPath').value;
+                const path = this.querySelector('#txtDirectoryPickerPath').value;
                 validatePath(path, options.validateWriteable, ApiClient).then(options.callback(path, networkSharePath));
             }
             e.preventDefault();
@@ -224,77 +234,79 @@ define(['loading', 'dialogHelper', 'dom', 'globalize', 'listViewStyle', 'emby-in
             return Promise.resolve(options.path);
         } else {
             return ApiClient.getJSON(ApiClient.getUrl('Environment/DefaultDirectoryBrowser')).then(
-                function(result) {
+                result => {
                     return result.Path || '';
-                }, function() {
+                }, () => {
                     return '';
                 }
             );
         }
     }
 
-    function directoryBrowser() {
-        var currentDialog;
-        var self = this;
-        self.show = function(options) {
-            options = options || {};
-            var fileOptions = {
-                includeDirectories: true
-            };
-            if (options.includeDirectories != null) {
-                fileOptions.includeDirectories = options.includeDirectories;
-            }
-            if (options.includeFiles != null) {
-                fileOptions.includeFiles = options.includeFiles;
-            }
-            Promise.all([getSystemInfo(), getDefaultPath(options)]).then(
-                function(responses) {
-                    var systemInfo = responses[0];
-                    var initialPath = responses[1];
-                    var dlg = dialogHelper.createDialog({
-                        size: 'small',
-                        removeOnClose: true,
-                        scrollY: false
-                    });
-                    dlg.classList.add('ui-body-a');
-                    dlg.classList.add('background-theme-a');
-                    dlg.classList.add('directoryPicker');
-                    dlg.classList.add('formDialog');
-
-                    var html = '';
-                    html += '<div class="formDialogHeader">';
-                    html += '<button is="paper-icon-button-light" class="btnCloseDialog autoSize" tabindex="-1"><span class="material-icons arrow_back"></span></button>';
-                    html += '<h3 class="formDialogHeaderTitle">';
-                    html += options.header || globalize.translate('HeaderSelectPath');
-                    html += '</h3>';
-                    html += '</div>';
-                    html += getEditorHtml(options, systemInfo);
-                    dlg.innerHTML = html;
-                    initEditor(dlg, options, fileOptions);
-                    dlg.addEventListener('close', onDialogClosed);
-                    dialogHelper.open(dlg);
-                    dlg.querySelector('.btnCloseDialog').addEventListener('click', function() {
-                        dialogHelper.close(dlg);
-                    });
-                    currentDialog = dlg;
-                    dlg.querySelector('#txtDirectoryPickerPath').value = initialPath;
-                    var txtNetworkPath = dlg.querySelector('#txtNetworkPath');
-                    if (txtNetworkPath) {
-                        txtNetworkPath.value = options.networkSharePath || '';
-                    }
-                    if (!options.pathReadOnly) {
-                        refreshDirectoryBrowser(dlg, initialPath, fileOptions, true);
-                    }
+    class directoryBrowser {
+        constructor() {
+            let currentDialog;
+            this.show = options => {
+                options = options || {};
+                const fileOptions = {
+                    includeDirectories: true
+                };
+                if (options.includeDirectories != null) {
+                    fileOptions.includeDirectories = options.includeDirectories;
                 }
-            );
-        };
-        self.close = function() {
-            if (currentDialog) {
-                dialogHelper.close(currentDialog);
-            }
-        };
+                if (options.includeFiles != null) {
+                    fileOptions.includeFiles = options.includeFiles;
+                }
+                Promise.all([getSystemInfo(), getDefaultPath(options)]).then(
+                    responses => {
+                        const systemInfo = responses[0];
+                        const initialPath = responses[1];
+                        const dlg = dialogHelper.createDialog({
+                            size: 'small',
+                            removeOnClose: true,
+                            scrollY: false
+                        });
+                        dlg.classList.add('ui-body-a');
+                        dlg.classList.add('background-theme-a');
+                        dlg.classList.add('directoryPicker');
+                        dlg.classList.add('formDialog');
+
+                        let html = '';
+                        html += '<div class="formDialogHeader">';
+                        html += '<button is="paper-icon-button-light" class="btnCloseDialog autoSize" tabindex="-1"><span class="material-icons arrow_back"></span></button>';
+                        html += '<h3 class="formDialogHeaderTitle">';
+                        html += options.header || globalize.translate('HeaderSelectPath');
+                        html += '</h3>';
+                        html += '</div>';
+                        html += getEditorHtml(options, systemInfo);
+                        dlg.innerHTML = html;
+                        initEditor(dlg, options, fileOptions);
+                        dlg.addEventListener('close', onDialogClosed);
+                        dialogHelper.open(dlg);
+                        dlg.querySelector('.btnCloseDialog').addEventListener('click', () => {
+                            dialogHelper.close(dlg);
+                        });
+                        currentDialog = dlg;
+                        dlg.querySelector('#txtDirectoryPickerPath').value = initialPath;
+                        const txtNetworkPath = dlg.querySelector('#txtNetworkPath');
+                        if (txtNetworkPath) {
+                            txtNetworkPath.value = options.networkSharePath || '';
+                        }
+                        if (!options.pathReadOnly) {
+                            refreshDirectoryBrowser(dlg, initialPath, fileOptions, true);
+                        }
+                    }
+                );
+            };
+            this.close = () => {
+                if (currentDialog) {
+                    dialogHelper.close(currentDialog);
+                }
+            };
+        }
     }
 
-    var systemInfo;
-    return directoryBrowser;
-});
+    let systemInfo;
+
+/* eslint-enable indent */
+export default directoryBrowser;
diff --git a/src/components/displaySettings/displaySettings.js b/src/components/displaySettings/displaySettings.js
index 4e068960a3..4e24a3b730 100644
--- a/src/components/displaySettings/displaySettings.js
+++ b/src/components/displaySettings/displaySettings.js
@@ -1,22 +1,37 @@
-define(['require', 'browser', 'layoutManager', 'appSettings', 'pluginManager', 'apphost', 'focusManager', 'datetime', 'globalize', 'loading', 'connectionManager', 'skinManager', 'dom', 'events', 'emby-select', 'emby-checkbox', 'emby-button'], function (require, browser, layoutManager, appSettings, pluginManager, appHost, focusManager, datetime, globalize, loading, connectionManager, skinManager, dom, events) {
-    'use strict';
+import browser from 'browser';
+import layoutManager from 'layoutManager';
+import appSettings from 'appSettings';
+import pluginManager from 'pluginManager';
+import appHost from 'apphost';
+import focusManager from 'focusManager';
+import datetime from 'datetime';
+import globalize from 'globalize';
+import loading from 'loading';
+import connectionManager from 'connectionManager';
+import skinManager from 'skinManager';
+import events from 'events';
+import 'emby-select';
+import 'emby-checkbox';
+import 'emby-button';
+
+/* eslint-disable indent */
 
     function fillThemes(select, isDashboard) {
-        select.innerHTML = skinManager.getThemes().map(function (t) {
-            var value = t.id;
+        select.innerHTML = skinManager.getThemes().map(t => {
+            let value = t.id;
             if (t.isDefault && !isDashboard) {
                 value = '';
             } else if (t.isDefaultServerDashboard && isDashboard) {
                 value = '';
             }
 
-            return '<option value="' + value + '">' + t.name + '</option>';
+            return `<option value="${value}">${t.name}</option>`;
         }).join('');
     }
 
     function loadScreensavers(context, userSettings) {
-        var selectScreensaver = context.querySelector('.selectScreensaver');
-        var options = pluginManager.ofType('screensaver').map(function (plugin) {
+        const selectScreensaver = context.querySelector('.selectScreensaver');
+        const options = pluginManager.ofType('screensaver').map(plugin => {
             return {
                 name: plugin.name,
                 value: plugin.id
@@ -28,8 +43,8 @@ define(['require', 'browser', 'layoutManager', 'appSettings', 'pluginManager', '
             value: 'none'
         });
 
-        selectScreensaver.innerHTML = options.map(function (o) {
-            return '<option value="' + o.value + '">' + o.name + '</option>';
+        selectScreensaver.innerHTML = options.map(o => {
+            return `<option value="${o.value}">${o.name}</option>`;
         }).join('');
         selectScreensaver.value = userSettings.screensaver();
 
@@ -41,8 +56,8 @@ define(['require', 'browser', 'layoutManager', 'appSettings', 'pluginManager', '
 
     function loadSoundEffects(context, userSettings) {
 
-        var selectSoundEffects = context.querySelector('.selectSoundEffects');
-        var options = pluginManager.ofType('soundeffects').map(function (plugin) {
+        const selectSoundEffects = context.querySelector('.selectSoundEffects');
+        const options = pluginManager.ofType('soundeffects').map(plugin => {
             return {
                 name: plugin.name,
                 value: plugin.id
@@ -54,8 +69,8 @@ define(['require', 'browser', 'layoutManager', 'appSettings', 'pluginManager', '
             value: 'none'
         });
 
-        selectSoundEffects.innerHTML = options.map(function (o) {
-            return '<option value="' + o.value + '">' + o.name + '</option>';
+        selectSoundEffects.innerHTML = options.map(o => {
+            return `<option value="${o.value}">${o.name}</option>`;
         }).join('');
         selectSoundEffects.value = userSettings.soundEffects();
 
@@ -67,17 +82,17 @@ define(['require', 'browser', 'layoutManager', 'appSettings', 'pluginManager', '
 
     function loadSkins(context, userSettings) {
 
-        var selectSkin = context.querySelector('.selectSkin');
+        const selectSkin = context.querySelector('.selectSkin');
 
-        var options = pluginManager.ofType('skin').map(function (plugin) {
+        const options = pluginManager.ofType('skin').map(plugin => {
             return {
                 name: plugin.name,
                 value: plugin.id
             };
         });
 
-        selectSkin.innerHTML = options.map(function (o) {
-            return '<option value="' + o.value + '">' + o.name + '</option>';
+        selectSkin.innerHTML = options.map(o => {
+            return `<option value="${o.value}">${o.name}</option>`;
         }).join('');
         selectSkin.value = userSettings.skin();
 
@@ -92,7 +107,7 @@ define(['require', 'browser', 'layoutManager', 'appSettings', 'pluginManager', '
         }
     }
 
-    function showOrHideMissingEpisodesField(context, user, apiClient) {
+    function showOrHideMissingEpisodesField(context) {
 
         if (browser.tizen || browser.web0s) {
             context.querySelector('.fldDisplayMissingEpisodes').classList.add('hide');
@@ -102,10 +117,7 @@ define(['require', 'browser', 'layoutManager', 'appSettings', 'pluginManager', '
         context.querySelector('.fldDisplayMissingEpisodes').classList.remove('hide');
     }
 
-    function loadForm(context, user, userSettings, apiClient) {
-
-        var loggedInUserId = apiClient.getCurrentUserId();
-        var userId = user.Id;
+    function loadForm(context, user, userSettings) {
 
         if (user.Policy.IsAdministrator) {
             context.querySelector('.selectDashboardThemeContainer').classList.remove('hide');
@@ -167,8 +179,8 @@ define(['require', 'browser', 'layoutManager', 'appSettings', 'pluginManager', '
 
         context.querySelector('.chkRunAtStartup').checked = appSettings.runAtStartup();
 
-        var selectTheme = context.querySelector('#selectTheme');
-        var selectDashboardTheme = context.querySelector('#selectDashboardTheme');
+        const selectTheme = context.querySelector('#selectTheme');
+        const selectDashboardTheme = context.querySelector('#selectDashboardTheme');
 
         fillThemes(selectTheme);
         fillThemes(selectDashboardTheme, true);
@@ -181,6 +193,7 @@ define(['require', 'browser', 'layoutManager', 'appSettings', 'pluginManager', '
         context.querySelector('#chkThemeSong').checked = userSettings.enableThemeSongs();
         context.querySelector('#chkThemeVideo').checked = userSettings.enableThemeVideos();
         context.querySelector('#chkFadein').checked = userSettings.enableFastFadein();
+        context.querySelector('#chkBlurhash').checked = userSettings.enableBlurhash();
         context.querySelector('#chkBackdrops').checked = userSettings.enableBackdrops();
         context.querySelector('#chkDetailsBanner').checked = userSettings.detailsBanner();
 
@@ -194,7 +207,7 @@ define(['require', 'browser', 'layoutManager', 'appSettings', 'pluginManager', '
 
         context.querySelector('.selectLayout').value = layoutManager.getSavedLayout() || '';
 
-        showOrHideMissingEpisodesField(context, user, apiClient);
+        showOrHideMissingEpisodesField(context);
 
         loading.hide();
     }
@@ -223,6 +236,7 @@ define(['require', 'browser', 'layoutManager', 'appSettings', 'pluginManager', '
         userSettingsInstance.skin(context.querySelector('.selectSkin').value);
 
         userSettingsInstance.enableFastFadein(context.querySelector('#chkFadein').checked);
+        userSettingsInstance.enableBlurhash(context.querySelector('#chkBlurhash').checked);
         userSettingsInstance.enableBackdrops(context.querySelector('#chkBackdrops').checked);
         userSettingsInstance.detailsBanner(context.querySelector('#chkDetailsBanner').checked);
 
@@ -237,29 +251,29 @@ define(['require', 'browser', 'layoutManager', 'appSettings', 'pluginManager', '
     function save(instance, context, userId, userSettings, apiClient, enableSaveConfirmation) {
         loading.show();
 
-        apiClient.getUser(userId).then(function (user) {
-            saveUser(context, user, userSettings, apiClient).then(function () {
+        apiClient.getUser(userId).then(user => {
+            saveUser(context, user, userSettings, apiClient).then(() => {
                 loading.hide();
                 if (enableSaveConfirmation) {
-                    require(['toast'], function (toast) {
+                    import('toast').then(({default: toast}) => {
                         toast(globalize.translate('SettingsSaved'));
                     });
                 }
                 events.trigger(instance, 'saved');
-            }, function () {
+            }, () => {
                 loading.hide();
             });
         });
     }
 
     function onSubmit(e) {
-        var self = this;
-        var apiClient = connectionManager.getApiClient(self.options.serverId);
-        var userId = self.options.userId;
-        var userSettings = self.options.userSettings;
+        const self = this;
+        const apiClient = connectionManager.getApiClient(self.options.serverId);
+        const userId = self.options.userId;
+        const userSettings = self.options.userSettings;
 
-        userSettings.setUserInfo(userId, apiClient).then(function () {
-            var enableSaveConfirmation = self.options.enableSaveConfirmation;
+        userSettings.setUserInfo(userId, apiClient).then(() => {
+            const enableSaveConfirmation = self.options.enableSaveConfirmation;
             save(self, self.options.element, userId, userSettings, apiClient, enableSaveConfirmation);
         });
 
@@ -270,50 +284,51 @@ define(['require', 'browser', 'layoutManager', 'appSettings', 'pluginManager', '
         return false;
     }
 
-    function embed(options, self) {
-        require(['text!./displaySettings.template.html'], function (template) {
-            options.element.innerHTML = globalize.translateDocument(template, 'core');
-            options.element.querySelector('form').addEventListener('submit', onSubmit.bind(self));
-            if (options.enableSaveButton) {
-                options.element.querySelector('.btnSave').classList.remove('hide');
-            }
-            self.loadData(options.autoFocus);
-        });
+    async function embed(options, self) {
+        const { default: template } = await import('text!./displaySettings.template.html');
+        options.element.innerHTML = globalize.translateHtml(template, 'core');
+        options.element.querySelector('form').addEventListener('submit', onSubmit.bind(self));
+        if (options.enableSaveButton) {
+            options.element.querySelector('.btnSave').classList.remove('hide');
+        }
+        self.loadData(options.autoFocus);
     }
 
-    function DisplaySettings(options) {
-        this.options = options;
-        embed(options, this);
-    }
+    class DisplaySettings {
+        constructor(options) {
+            this.options = options;
+            embed(options, this);
+        }
 
-    DisplaySettings.prototype.loadData = function (autoFocus) {
-        var self = this;
-        var context = self.options.element;
+        loadData(autoFocus) {
+            const self = this;
+            const context = self.options.element;
 
-        loading.show();
+            loading.show();
 
-        var userId = self.options.userId;
-        var apiClient = connectionManager.getApiClient(self.options.serverId);
-        var userSettings = self.options.userSettings;
+            const userId = self.options.userId;
+            const apiClient = connectionManager.getApiClient(self.options.serverId);
+            const userSettings = self.options.userSettings;
 
-        return apiClient.getUser(userId).then(function (user) {
-            return userSettings.setUserInfo(userId, apiClient).then(function () {
-                self.dataLoaded = true;
-                loadForm(context, user, userSettings, apiClient);
-                if (autoFocus) {
-                    focusManager.autoFocus(context);
-                }
+            return apiClient.getUser(userId).then(user => {
+                return userSettings.setUserInfo(userId, apiClient).then(() => {
+                    self.dataLoaded = true;
+                    loadForm(context, user, userSettings);
+                    if (autoFocus) {
+                        focusManager.autoFocus(context);
+                    }
+                });
             });
-        });
-    };
+        }
 
-    DisplaySettings.prototype.submit = function () {
-        onSubmit.call(this);
-    };
+        submit() {
+            onSubmit.call(this);
+        }
 
-    DisplaySettings.prototype.destroy = function () {
-        this.options = null;
-    };
+        destroy() {
+            this.options = null;
+        }
+    }
 
-    return DisplaySettings;
-});
+/* eslint-enable indent */
+export default DisplaySettings;
diff --git a/src/components/displaySettings/displaySettings.template.html b/src/components/displaySettings/displaySettings.template.html
index d37c24b49d..ab01b4b6ae 100644
--- a/src/components/displaySettings/displaySettings.template.html
+++ b/src/components/displaySettings/displaySettings.template.html
@@ -143,20 +143,28 @@
         <select is="emby-select" class="selectSoundEffects" label="${LabelSoundEffects}"></select>
     </div>
 
-    <div class="inputContainer inputContainer-withDescription fldFadein">
+    <div class="inputContainer inputContainer-withDescription">
         <input is="emby-input" type="number" id="txtLibraryPageSize" pattern="[0-9]*" required="required" min="0" max="1000" step="1" label="${LabelLibraryPageSize}" />
         <div class="fieldDescription">${LabelLibraryPageSizeHelp}</div>
     </div>
 
-    <div class="checkboxContainer checkboxContainer-withDescription fldFadein">
+    <div class="checkboxContainer checkboxContainer-withDescription">
         <label>
             <input type="checkbox" is="emby-checkbox" id="chkFadein" />
-            <span>${EnableFastImageFadeIn}</span>
+            <span>${EnableFasterAnimations}</span>
         </label>
-        <div class="fieldDescription checkboxFieldDescription">${EnableFastImageFadeInHelp}</div>
+        <div class="fieldDescription checkboxFieldDescription">${EnableFasterAnimationsHelp}</div>
     </div>
 
-    <div class="checkboxContainer checkboxContainer-withDescription fldDetailsBanner">
+    <div class="checkboxContainer checkboxContainer-withDescription">
+        <label>
+            <input type="checkbox" is="emby-checkbox" id="chkBlurhash" />
+            <span>${EnableBlurhash}</span>
+        </label>
+        <div class="fieldDescription checkboxFieldDescription">${EnableBlurhashHelp}</div>
+    </div>
+
+    <div class="checkboxContainer checkboxContainer-withDescription">
         <label>
             <input type="checkbox" is="emby-checkbox" id="chkDetailsBanner" />
             <span>${EnableDetailsBanner}</span>
diff --git a/src/components/fetchhelper.js b/src/components/fetchhelper.js
index 08fe803ecf..f626abefee 100644
--- a/src/components/fetchhelper.js
+++ b/src/components/fetchhelper.js
@@ -1,21 +1,19 @@
-define([], function () {
-    'use strict';
+/* eslint-disable indent */
+    export function getFetchPromise(request) {
 
-    function getFetchPromise(request) {
-
-        var headers = request.headers || {};
+        const headers = request.headers || {};
 
         if (request.dataType === 'json') {
             headers.accept = 'application/json';
         }
 
-        var fetchRequest = {
+        const fetchRequest = {
             headers: headers,
             method: request.type,
             credentials: 'same-origin'
         };
 
-        var contentType = request.contentType;
+        let contentType = request.contentType;
 
         if (request.data) {
 
@@ -33,12 +31,12 @@ define([], function () {
             headers['Content-Type'] = contentType;
         }
 
-        var url = request.url;
+        let url = request.url;
 
         if (request.query) {
-            var paramString = paramsToString(request.query);
+            const paramString = paramsToString(request.query);
             if (paramString) {
-                url += '?' + paramString;
+                url += `?${paramString}`;
             }
         }
 
@@ -51,11 +49,11 @@ define([], function () {
 
     function fetchWithTimeout(url, options, timeoutMs) {
 
-        console.debug('fetchWithTimeout: timeoutMs: ' + timeoutMs + ', url: ' + url);
+        console.debug(`fetchWithTimeout: timeoutMs: ${timeoutMs}, url: ${url}`);
 
         return new Promise(function (resolve, reject) {
 
-            var timeout = setTimeout(reject, timeoutMs);
+            const timeout = setTimeout(reject, timeoutMs);
 
             options = options || {};
             options.credentials = 'same-origin';
@@ -63,50 +61,47 @@ define([], function () {
             fetch(url, options).then(function (response) {
                 clearTimeout(timeout);
 
-                console.debug('fetchWithTimeout: succeeded connecting to url: ' + url);
+                console.debug(`fetchWithTimeout: succeeded connecting to url: ${url}`);
 
                 resolve(response);
             }, function (error) {
 
                 clearTimeout(timeout);
 
-                console.debug('fetchWithTimeout: timed out connecting to url: ' + url);
+                console.debug(`fetchWithTimeout: timed out connecting to url: ${url}`);
 
-                reject();
+                reject(error);
             });
         });
     }
 
+    /**
+     * @param params {Record<string, string | number | boolean>}
+     * @returns {string} Query string
+     */
     function paramsToString(params) {
-
-        var values = [];
-
-        for (var key in params) {
-
-            var value = params[key];
-
-            if (value !== null && value !== undefined && value !== '') {
-                values.push(encodeURIComponent(key) + '=' + encodeURIComponent(value));
-            }
-        }
-        return values.join('&');
+        return Object.entries(params)
+            // eslint-disable-next-line no-unused-vars
+            .filter(([_, v]) => v !== null && v !== undefined && v !== '')
+            .map(([k, v]) => `${encodeURIComponent(k)}=${encodeURIComponent(v)}`)
+            .join('&');
     }
 
-    function ajax(request) {
+    export function ajax(request) {
         if (!request) {
             throw new Error('Request cannot be null');
         }
 
         request.headers = request.headers || {};
 
-        console.debug('requesting url: ' + request.url);
+        console.debug(`requesting url: ${request.url}`);
 
         return getFetchPromise(request).then(function (response) {
-            console.debug('response status: ' + response.status + ', url: ' + request.url);
+            console.debug(`response status: ${response.status}, url: ${request.url}`);
             if (response.status < 400) {
                 if (request.dataType === 'json' || request.headers.accept === 'application/json') {
                     return response.json();
-                } else if (request.dataType === 'text' || (response.headers.get('Content-Type') || '').toLowerCase().indexOf('text/') === 0) {
+                } else if (request.dataType === 'text' || (response.headers.get('Content-Type') || '').toLowerCase().startsWith('text/')) {
                     return response.text();
                 } else {
                     return response;
@@ -115,12 +110,8 @@ define([], function () {
                 return Promise.reject(response);
             }
         }, function (err) {
-            console.error('request failed to url: ' + request.url);
+            console.error(`request failed to url: ${request.url}`);
             throw err;
         });
     }
-    return {
-        getFetchPromise: getFetchPromise,
-        ajax: ajax
-    };
-});
+/* eslint-enable indent */
diff --git a/src/components/filterdialog/filterdialog.js b/src/components/filterdialog/filterdialog.js
index 1dfd04c679..df17c19dec 100644
--- a/src/components/filterdialog/filterdialog.js
+++ b/src/components/filterdialog/filterdialog.js
@@ -1,21 +1,28 @@
-define(['dom', 'dialogHelper', 'globalize', 'connectionManager', 'events', 'browser', 'require', 'emby-checkbox', 'emby-collapse', 'css!./style'], function (dom, dialogHelper, globalize, connectionManager, events, browser, require) {
-    'use strict';
+import dom from 'dom';
+import dialogHelper from 'dialogHelper';
+import globalize from 'globalize';
+import connectionManager from 'connectionManager';
+import events from 'events';
+import 'emby-checkbox';
+import 'emby-collapse';
+import 'css!./style.css';
 
+/* eslint-disable indent */
     function renderOptions(context, selector, cssClass, items, isCheckedFn) {
-        var elem = context.querySelector(selector);
+        const elem = context.querySelector(selector);
         if (items.length) {
             elem.classList.remove('hide');
         } else {
             elem.classList.add('hide');
         }
-        var html = '';
+        let html = '';
         html += '<div class="checkboxList">';
         html += items.map(function (filter) {
-            var itemHtml = '';
-            var checkedHtml = isCheckedFn(filter) ? ' checked' : '';
+            let itemHtml = '';
+            const checkedHtml = isCheckedFn(filter) ? 'checked' : '';
             itemHtml += '<label>';
-            itemHtml += '<input is="emby-checkbox" type="checkbox"' + checkedHtml + ' data-filter="' + filter + '" class="' + cssClass + '"/>';
-            itemHtml += '<span>' + filter + '</span>';
+            itemHtml += `<input is="emby-checkbox" type="checkbox" ${checkedHtml} data-filter="${filter}" class="${cssClass}"/>`;
+            itemHtml += `<span>${filter}</span>`;
             itemHtml += '</label>';
             return itemHtml;
         }).join('');
@@ -24,21 +31,24 @@ define(['dom', 'dialogHelper', 'globalize', 'connectionManager', 'events', 'brow
     }
 
     function renderFilters(context, result, query) {
+        if (result.Tags) {
+            result.Tags.length = Math.min(result.Tags.length, 50);
+        }
         renderOptions(context, '.genreFilters', 'chkGenreFilter', result.Genres, function (i) {
-            var delimeter = '|';
-            return (delimeter + (query.Genres || '') + delimeter).indexOf(delimeter + i + delimeter) != -1;
+            const delimeter = '|';
+            return (delimeter + (query.Genres || '') + delimeter).includes(delimeter + i + delimeter);
         });
         renderOptions(context, '.officialRatingFilters', 'chkOfficialRatingFilter', result.OfficialRatings, function (i) {
-            var delimeter = '|';
-            return (delimeter + (query.OfficialRatings || '') + delimeter).indexOf(delimeter + i + delimeter) != -1;
+            const delimeter = '|';
+            return (delimeter + (query.OfficialRatings || '') + delimeter).includes(delimeter + i + delimeter);
         });
         renderOptions(context, '.tagFilters', 'chkTagFilter', result.Tags, function (i) {
-            var delimeter = '|';
-            return (delimeter + (query.Tags || '') + delimeter).indexOf(delimeter + i + delimeter) != -1;
+            const delimeter = '|';
+            return (delimeter + (query.Tags || '') + delimeter).includes(delimeter + i + delimeter);
         });
         renderOptions(context, '.yearFilters', 'chkYearFilter', result.Years, function (i) {
-            var delimeter = ',';
-            return (delimeter + (query.Years || '') + delimeter).indexOf(delimeter + i + delimeter) != -1;
+            const delimeter = ',';
+            return (delimeter + (query.Years || '') + delimeter).includes(delimeter + i + delimeter);
         });
     }
 
@@ -52,59 +62,58 @@ define(['dom', 'dialogHelper', 'globalize', 'connectionManager', 'events', 'brow
         });
     }
 
+    /**
+     * @param context {HTMLDivElement} Dialog
+     * @param options {any} Options
+     */
     function updateFilterControls(context, options) {
-        var elems;
-        var i;
-        var length;
-        var query = options.query;
+        const query = options.query;
 
-        if (options.mode == 'livetvchannels') {
-            context.querySelector('.chkFavorite').checked = query.IsFavorite == true;
-            context.querySelector('.chkLikes').checked = query.IsLiked == true;
-            context.querySelector('.chkDislikes').checked = query.IsDisliked == true;
+        if (options.mode === 'livetvchannels') {
+            context.querySelector('.chkFavorite').checked = query.IsFavorite === true;
+            context.querySelector('.chkLikes').checked = query.IsLiked === true;
+            context.querySelector('.chkDislikes').checked = query.IsDisliked === true;
         } else {
-            elems = context.querySelectorAll('.chkStandardFilter');
-            for (i = 0, length = elems.length; i < length; i++) {
-                var chkStandardFilter = elems[i];
-                var filters = ',' + (query.Filters || '');
-                var filterName = chkStandardFilter.getAttribute('data-filter');
-                chkStandardFilter.checked = filters.indexOf(',' + filterName) != -1;
+            for (const elem of context.querySelectorAll('.chkStandardFilter')) {
+                const filters = `,${query.Filters || ''}`;
+                const filterName = elem.getAttribute('data-filter');
+                elem.checked = filters.includes(`,${filterName}`);
             }
         }
 
-        elems = context.querySelectorAll('.chkVideoTypeFilter');
-        for (i = 0, length = elems.length; i < length; i++) {
-            var chkVideoTypeFilter = elems[i];
-            var filters = ',' + (query.VideoTypes || '');
-            var filterName = chkVideoTypeFilter.getAttribute('data-filter');
-            chkVideoTypeFilter.checked = filters.indexOf(',' + filterName) != -1;
+        for (const elem of context.querySelectorAll('.chkVideoTypeFilter')) {
+            const filters = `,${query.VideoTypes || ''}`;
+            const filterName = elem.getAttribute('data-filter');
+            elem.checked = filters.includes(`,${filterName}`);
         }
-        context.querySelector('.chk3DFilter').checked = query.Is3D == true;
-        context.querySelector('.chkHDFilter').checked = query.IsHD == true;
-        context.querySelector('.chk4KFilter').checked = query.Is4K == true;
-        context.querySelector('.chkSDFilter').checked = query.IsHD == true;
-        context.querySelector('#chkSubtitle').checked = query.HasSubtitles == true;
-        context.querySelector('#chkTrailer').checked = query.HasTrailer == true;
-        context.querySelector('#chkThemeSong').checked = query.HasThemeSong == true;
-        context.querySelector('#chkThemeVideo').checked = query.HasThemeVideo == true;
-        context.querySelector('#chkSpecialFeature').checked = query.HasSpecialFeature == true;
-        context.querySelector('#chkSpecialEpisode').checked = query.ParentIndexNumber == 0;
-        context.querySelector('#chkMissingEpisode').checked = query.IsMissing == true;
-        context.querySelector('#chkFutureEpisode').checked = query.IsUnaired == true;
-        for (i = 0, length = elems.length; i < length; i++) {
-            var chkStatus = elems[i];
-            var filters = ',' + (query.SeriesStatus || '');
-            var filterName = chkStatus.getAttribute('data-filter');
-            chkStatus.checked = filters.indexOf(',' + filterName) != -1;
+        context.querySelector('.chk3DFilter').checked = query.Is3D === true;
+        context.querySelector('.chkHDFilter').checked = query.IsHD === true;
+        context.querySelector('.chk4KFilter').checked = query.Is4K === true;
+        context.querySelector('.chkSDFilter').checked = query.IsHD === true;
+        context.querySelector('#chkSubtitle').checked = query.HasSubtitles === true;
+        context.querySelector('#chkTrailer').checked = query.HasTrailer === true;
+        context.querySelector('#chkThemeSong').checked = query.HasThemeSong === true;
+        context.querySelector('#chkThemeVideo').checked = query.HasThemeVideo === true;
+        context.querySelector('#chkSpecialFeature').checked = query.HasSpecialFeature === true;
+        context.querySelector('#chkSpecialEpisode').checked = query.ParentIndexNumber === 0;
+        context.querySelector('#chkMissingEpisode').checked = query.IsMissing === true;
+        context.querySelector('#chkFutureEpisode').checked = query.IsUnaired === true;
+        for (const elem of context.querySelectorAll('.chkStatus')) {
+            const filters = `,${query.SeriesStatus || ''}`;
+            const filterName = elem.getAttribute('data-filter');
+            elem.checked = filters.includes(`,${filterName}`);
         }
     }
 
+    /**
+     * @param instance {FilterDialog} An instance of FilterDialog
+     */
     function triggerChange(instance) {
         events.trigger(instance, 'filterchange');
     }
 
     function setVisibility(context, options) {
-        if (options.mode == 'livetvchannels' || options.mode == 'albums' || options.mode == 'artists' || options.mode == 'albumartists' || options.mode == 'songs') {
+        if (options.mode === 'livetvchannels' || options.mode === 'albums' || options.mode === 'artists' || options.mode === 'albumartists' || options.mode === 'songs') {
             hideByClass(context, 'videoStandard');
         }
 
@@ -115,263 +124,287 @@ define(['dom', 'dialogHelper', 'globalize', 'connectionManager', 'events', 'brow
             context.querySelector('.yearFilters').classList.remove('hide');
         }
 
-        if (options.mode == 'movies' || options.mode == 'episodes') {
+        if (options.mode === 'movies' || options.mode === 'episodes') {
             context.querySelector('.videoTypeFilters').classList.remove('hide');
         }
 
-        if (options.mode == 'movies' || options.mode == 'series' || options.mode == 'episodes') {
+        if (options.mode === 'movies' || options.mode === 'series' || options.mode === 'episodes') {
             context.querySelector('.features').classList.remove('hide');
         }
 
-        if (options.mode == 'series') {
+        if (options.mode === 'series') {
             context.querySelector('.seriesStatus').classList.remove('hide');
         }
 
-        if (options.mode == 'episodes') {
+        if (options.mode === 'episodes') {
             showByClass(context, 'episodeFilter');
         }
     }
 
     function showByClass(context, className) {
-        var elems = context.querySelectorAll('.' + className);
-
-        for (var i = 0, length = elems.length; i < length; i++) {
-            elems[i].classList.remove('hide');
+        for (const elem of context.querySelectorAll(`.${className}`)) {
+            elem.classList.remove('hide');
         }
     }
 
     function hideByClass(context, className) {
-        var elems = context.querySelectorAll('.' + className);
-
-        for (var i = 0, length = elems.length; i < length; i++) {
-            elems[i].classList.add('hide');
+        for (const elem of context.querySelectorAll(`.${className}`)) {
+            elem.classList.add('hide');
         }
     }
 
     function enableDynamicFilters(mode) {
-        return mode == 'movies' || mode == 'series' || mode == 'albums' || mode == 'albumartists' || mode == 'artists' || mode == 'songs' || mode == 'episodes';
+        return mode === 'movies' || mode === 'series' || mode === 'albums' || mode === 'albumartists' || mode === 'artists' || mode === 'songs' || mode === 'episodes';
     }
 
-    return function (options) {
-        function onFavoriteChange() {
-            var query = options.query;
-            query.StartIndex = 0;
-            query.IsFavorite = !!this.checked || null;
-            triggerChange(self);
+    class FilterDialog {
+        constructor(options) {
+            /**
+             * @private
+             */
+            this.options = options;
         }
 
-        function onStandardFilterChange() {
-            var query = options.query;
-            var filterName = this.getAttribute('data-filter');
-            var filters = query.Filters || '';
-            filters = (',' + filters).replace(',' + filterName, '').substring(1);
+        /**
+         * @private
+         */
+        onFavoriteChange(elem) {
+            const query = this.options.query;
+            query.StartIndex = 0;
+            query.IsFavorite = !!elem.checked || null;
+            triggerChange(this);
+        }
 
-            if (this.checked) {
-                filters = filters ? filters + ',' + filterName : filterName;
+        /**
+         * @private
+         */
+        onStandardFilterChange(elem) {
+            const query = this.options.query;
+            const filterName = elem.getAttribute('data-filter');
+            let filters = query.Filters || '';
+            filters = (`,${filters}`).replace(`,${filterName}`, '').substring(1);
+
+            if (elem.checked) {
+                filters = filters ? `${filters},${filterName}` : filterName;
             }
 
             query.StartIndex = 0;
             query.Filters = filters;
-            triggerChange(self);
+            triggerChange(this);
         }
 
-        function onVideoTypeFilterChange() {
-            var query = options.query;
-            var filterName = this.getAttribute('data-filter');
-            var filters = query.VideoTypes || '';
-            filters = (',' + filters).replace(',' + filterName, '').substring(1);
+        /**
+         * @private
+         */
+        onVideoTypeFilterChange(elem) {
+            const query = this.options.query;
+            const filterName = elem.getAttribute('data-filter');
+            let filters = query.VideoTypes || '';
+            filters = (`,${filters}`).replace(`,${filterName}`, '').substring(1);
 
-            if (this.checked) {
-                filters = filters ? filters + ',' + filterName : filterName;
+            if (elem.checked) {
+                filters = filters ? `${filters},${filterName}` : filterName;
             }
 
             query.StartIndex = 0;
             query.VideoTypes = filters;
-            triggerChange(self);
+            triggerChange(this);
         }
 
-        function onStatusChange() {
-            var query = options.query;
-            var filterName = this.getAttribute('data-filter');
-            var filters = query.SeriesStatus || '';
-            filters = (',' + filters).replace(',' + filterName, '').substring(1);
+        /**
+         * @private
+         */
+        onStatusChange(elem) {
+            const query = this.options.query;
+            const filterName = elem.getAttribute('data-filter');
+            let filters = query.SeriesStatus || '';
+            filters = (`,${filters}`).replace(`,${filterName}`, '').substring(1);
 
-            if (this.checked) {
-                filters = filters ? filters + ',' + filterName : filterName;
+            if (elem.checked) {
+                filters = filters ? `${filters},${filterName}` : filterName;
             }
 
             query.SeriesStatus = filters;
             query.StartIndex = 0;
-            triggerChange(self);
+            triggerChange(this);
         }
 
-        function bindEvents(context) {
-            var elems;
-            var i;
-            var length;
-            var query = options.query;
+        /**
+         * @param context {HTMLDivElement} The dialog
+         */
+        bindEvents(context) {
+            const query = this.options.query;
 
-            if (options.mode == 'livetvchannels') {
-                elems = context.querySelectorAll('.chkFavorite');
-                for (i = 0, length = elems.length; i < length; i++) {
-                    elems[i].addEventListener('change', onFavoriteChange);
+            if (this.options.mode === 'livetvchannels') {
+                for (const elem of context.querySelectorAll('.chkFavorite')) {
+                    elem.addEventListener('change', () => this.onFavoriteChange(elem));
                 }
-                context.querySelector('.chkLikes').addEventListener('change', function () {
+
+                const chkLikes = context.querySelector('.chkLikes');
+                chkLikes.addEventListener('change', () => {
                     query.StartIndex = 0;
-                    query.IsLiked = this.checked ? true : null;
-                    triggerChange(self);
+                    query.IsLiked = chkLikes.checked ? true : null;
+                    triggerChange(this);
                 });
-                context.querySelector('.chkDislikes').addEventListener('change', function () {
+                const chkDislikes = context.querySelector('.chkDislikes');
+                chkDislikes.addEventListener('change', () => {
                     query.StartIndex = 0;
-                    query.IsDisliked = this.checked ? true : null;
-                    triggerChange(self);
+                    query.IsDisliked = chkDislikes.checked ? true : null;
+                    triggerChange(this);
                 });
             } else {
-                elems = context.querySelectorAll('.chkStandardFilter');
-                for (i = 0, length = elems.length; i < length; i++) {
-                    elems[i].addEventListener('change', onStandardFilterChange);
+                for (const elem of context.querySelectorAll('.chkStandardFilter')) {
+                    elem.addEventListener('change', () => this.onStandardFilterChange(elem));
                 }
             }
-            elems = context.querySelectorAll('.chkVideoTypeFilter');
-            for (i = 0, length = elems.length; i < length; i++) {
-                elems[i].addEventListener('change', onVideoTypeFilterChange);
+
+            for (const elem of context.querySelectorAll('.chkVideoTypeFilter')) {
+                elem.addEventListener('change', () => this.onVideoTypeFilterChange(elem));
             }
-            context.querySelector('.chk3DFilter').addEventListener('change', function () {
+            const chk3DFilter = context.querySelector('.chk3DFilter');
+            chk3DFilter.addEventListener('change', () => {
                 query.StartIndex = 0;
-                query.Is3D = this.checked ? true : null;
-                triggerChange(self);
+                query.Is3D = chk3DFilter.checked ? true : null;
+                triggerChange(this);
             });
-            context.querySelector('.chk4KFilter').addEventListener('change', function () {
+            const chk4KFilter = context.querySelector('.chk4KFilter');
+            chk4KFilter.addEventListener('change', () => {
                 query.StartIndex = 0;
-                query.Is4K = this.checked ? true : null;
-                triggerChange(self);
+                query.Is4K = chk4KFilter.checked ? true : null;
+                triggerChange(this);
             });
-            context.querySelector('.chkHDFilter').addEventListener('change', function () {
+            const chkHDFilter = context.querySelector('.chkHDFilter');
+            chkHDFilter.addEventListener('change', () => {
                 query.StartIndex = 0;
-                query.IsHD = this.checked ? true : null;
-                triggerChange(self);
+                query.IsHD = chkHDFilter.checked ? true : null;
+                triggerChange(this);
             });
-            context.querySelector('.chkSDFilter').addEventListener('change', function () {
+            const chkSDFilter = context.querySelector('.chkSDFilter');
+            chkSDFilter.addEventListener('change', () => {
                 query.StartIndex = 0;
-                query.IsHD = this.checked ? false : null;
-                triggerChange(self);
+                query.IsHD = chkSDFilter.checked ? false : null;
+                triggerChange(this);
             });
-            elems = context.querySelectorAll('.chkStatus');
-            for (i = 0, length = elems.length; i < length; i++) {
-                elems[i].addEventListener('change', onStatusChange);
+            for (const elem of context.querySelectorAll('.chkStatus')) {
+                elem.addEventListener('change', () => this.onStatusChange(elem));
             }
-            context.querySelector('#chkTrailer').addEventListener('change', function () {
+            const chkTrailer = context.querySelector('#chkTrailer');
+            chkTrailer.addEventListener('change', () => {
                 query.StartIndex = 0;
-                query.HasTrailer = this.checked ? true : null;
-                triggerChange(self);
+                query.HasTrailer = chkTrailer.checked ? true : null;
+                triggerChange(this);
             });
-            context.querySelector('#chkThemeSong').addEventListener('change', function () {
+            const chkThemeSong = context.querySelector('#chkThemeSong');
+            chkThemeSong.addEventListener('change', () => {
                 query.StartIndex = 0;
-                query.HasThemeSong = this.checked ? true : null;
-                triggerChange(self);
+                query.HasThemeSong = chkThemeSong.checked ? true : null;
+                triggerChange(this);
             });
-            context.querySelector('#chkSpecialFeature').addEventListener('change', function () {
+            const chkSpecialFeature = context.querySelector('#chkSpecialFeature');
+            chkSpecialFeature.addEventListener('change', () => {
                 query.StartIndex = 0;
-                query.HasSpecialFeature = this.checked ? true : null;
-                triggerChange(self);
+                query.HasSpecialFeature = chkSpecialFeature.checked ? true : null;
+                triggerChange(this);
             });
-            context.querySelector('#chkThemeVideo').addEventListener('change', function () {
+            const chkThemeVideo = context.querySelector('#chkThemeVideo');
+            chkThemeVideo.addEventListener('change', () => {
                 query.StartIndex = 0;
-                query.HasThemeVideo = this.checked ? true : null;
-                triggerChange(self);
+                query.HasThemeVideo = chkThemeVideo.checked ? true : null;
+                triggerChange(this);
             });
-            context.querySelector('#chkMissingEpisode').addEventListener('change', function () {
+            const chkMissingEpisode = context.querySelector('#chkMissingEpisode');
+            chkMissingEpisode.addEventListener('change', () => {
                 query.StartIndex = 0;
-                query.IsMissing = this.checked ? true : false;
-                triggerChange(self);
+                query.IsMissing = !!chkMissingEpisode.checked;
+                triggerChange(this);
             });
-            context.querySelector('#chkSpecialEpisode').addEventListener('change', function () {
+            const chkSpecialEpisode = context.querySelector('#chkSpecialEpisode');
+            chkSpecialEpisode.addEventListener('change', () => {
                 query.StartIndex = 0;
-                query.ParentIndexNumber = this.checked ? 0 : null;
-                triggerChange(self);
+                query.ParentIndexNumber = chkSpecialEpisode.checked ? 0 : null;
+                triggerChange(this);
             });
-            context.querySelector('#chkFutureEpisode').addEventListener('change', function () {
+            const chkFutureEpisode = context.querySelector('#chkFutureEpisode');
+            chkFutureEpisode.addEventListener('change', () => {
                 query.StartIndex = 0;
-                if (this.checked) {
+                if (chkFutureEpisode.checked) {
                     query.IsUnaired = true;
                     query.IsVirtualUnaired = null;
                 } else {
                     query.IsUnaired = null;
                     query.IsVirtualUnaired = false;
                 }
-                triggerChange(self);
+                triggerChange(this);
             });
-            context.querySelector('#chkSubtitle').addEventListener('change', function () {
+            const chkSubtitle = context.querySelector('#chkSubtitle');
+            chkSubtitle.addEventListener('change', () => {
                 query.StartIndex = 0;
-                query.HasSubtitles = this.checked ? true : null;
-                triggerChange(self);
+                query.HasSubtitles = chkSubtitle.checked ? true : null;
+                triggerChange(this);
             });
-            context.addEventListener('change', function (e) {
-                var chkGenreFilter = dom.parentWithClass(e.target, 'chkGenreFilter');
+            context.addEventListener('change', (e) => {
+                const chkGenreFilter = dom.parentWithClass(e.target, 'chkGenreFilter');
                 if (chkGenreFilter) {
-                    var filterName = chkGenreFilter.getAttribute('data-filter');
-                    var filters = query.Genres || '';
-                    var delimiter = '|';
+                    const filterName = chkGenreFilter.getAttribute('data-filter');
+                    let filters = query.Genres || '';
+                    const delimiter = '|';
                     filters = (delimiter + filters).replace(delimiter + filterName, '').substring(1);
                     if (chkGenreFilter.checked) {
                         filters = filters ? (filters + delimiter + filterName) : filterName;
                     }
                     query.StartIndex = 0;
                     query.Genres = filters;
-                    triggerChange(self);
+                    triggerChange(this);
                     return;
                 }
-                var chkTagFilter = dom.parentWithClass(e.target, 'chkTagFilter');
+                const chkTagFilter = dom.parentWithClass(e.target, 'chkTagFilter');
                 if (chkTagFilter) {
-                    var filterName = chkTagFilter.getAttribute('data-filter');
-                    var filters = query.Tags || '';
-                    var delimiter = '|';
+                    const filterName = chkTagFilter.getAttribute('data-filter');
+                    let filters = query.Tags || '';
+                    const delimiter = '|';
                     filters = (delimiter + filters).replace(delimiter + filterName, '').substring(1);
                     if (chkTagFilter.checked) {
                         filters = filters ? (filters + delimiter + filterName) : filterName;
                     }
                     query.StartIndex = 0;
                     query.Tags = filters;
-                    triggerChange(self);
+                    triggerChange(this);
                     return;
                 }
-                var chkYearFilter = dom.parentWithClass(e.target, 'chkYearFilter');
+                const chkYearFilter = dom.parentWithClass(e.target, 'chkYearFilter');
                 if (chkYearFilter) {
-                    var filterName = chkYearFilter.getAttribute('data-filter');
-                    var filters = query.Years || '';
-                    var delimiter = ',';
+                    const filterName = chkYearFilter.getAttribute('data-filter');
+                    let filters = query.Years || '';
+                    const delimiter = ',';
                     filters = (delimiter + filters).replace(delimiter + filterName, '').substring(1);
                     if (chkYearFilter.checked) {
                         filters = filters ? (filters + delimiter + filterName) : filterName;
                     }
                     query.StartIndex = 0;
                     query.Years = filters;
-                    triggerChange(self);
+                    triggerChange(this);
                     return;
                 }
-                var chkOfficialRatingFilter = dom.parentWithClass(e.target, 'chkOfficialRatingFilter');
+                const chkOfficialRatingFilter = dom.parentWithClass(e.target, 'chkOfficialRatingFilter');
                 if (chkOfficialRatingFilter) {
-                    var filterName = chkOfficialRatingFilter.getAttribute('data-filter');
-                    var filters = query.OfficialRatings || '';
-                    var delimiter = '|';
+                    const filterName = chkOfficialRatingFilter.getAttribute('data-filter');
+                    let filters = query.OfficialRatings || '';
+                    const delimiter = '|';
                     filters = (delimiter + filters).replace(delimiter + filterName, '').substring(1);
                     if (chkOfficialRatingFilter.checked) {
                         filters = filters ? (filters + delimiter + filterName) : filterName;
                     }
                     query.StartIndex = 0;
                     query.OfficialRatings = filters;
-                    triggerChange(self);
-                    return;
+                    triggerChange(this);
                 }
             });
         }
 
-        var self = this;
-
-        self.show = function () {
-            return new Promise(function (resolve, reject) {
-                require(['text!./filterdialog.template.html'], function (template) {
-                    var dlg = dialogHelper.createDialog({
+        show() {
+            return import('text!./filterdialog.template.html').then(({default: template}) => {
+                return new Promise((resolve) => {
+                    const dlg = dialogHelper.createDialog({
                         removeOnClose: true,
                         modal: false
                     });
@@ -379,19 +412,22 @@ define(['dom', 'dialogHelper', 'globalize', 'connectionManager', 'events', 'brow
                     dlg.classList.add('background-theme-a');
                     dlg.classList.add('formDialog');
                     dlg.classList.add('filterDialog');
-                    dlg.innerHTML = globalize.translateDocument(template);
-                    setVisibility(dlg, options);
+                    dlg.innerHTML = globalize.translateHtml(template);
+                    setVisibility(dlg, this.options);
                     dialogHelper.open(dlg);
                     dlg.addEventListener('close', resolve);
-                    updateFilterControls(dlg, options);
-                    bindEvents(dlg);
-                    if (enableDynamicFilters(options.mode)) {
+                    updateFilterControls(dlg, this.options);
+                    this.bindEvents(dlg);
+                    if (enableDynamicFilters(this.options.mode)) {
                         dlg.classList.add('dynamicFilterDialog');
-                        var apiClient = connectionManager.getApiClient(options.serverId);
-                        loadDynamicFilters(dlg, apiClient, apiClient.getCurrentUserId(), options.query);
+                        const apiClient = connectionManager.getApiClient(this.options.serverId);
+                        loadDynamicFilters(dlg, apiClient, apiClient.getCurrentUserId(), this.options.query);
                     }
                 });
             });
-        };
-    };
-});
+        }
+    }
+
+/* eslint-enable indent */
+
+export default FilterDialog;
diff --git a/src/components/filtermenu/filtermenu.js b/src/components/filtermenu/filtermenu.js
index c189856e7b..936e2b0407 100644
--- a/src/components/filtermenu/filtermenu.js
+++ b/src/components/filtermenu/filtermenu.js
@@ -286,7 +286,7 @@ define(['require', 'dom', 'focusManager', 'dialogHelper', 'loading', 'apphost',
 
                 html += template;
 
-                dlg.innerHTML = globalize.translateDocument(html, 'core');
+                dlg.innerHTML = globalize.translateHtml(html, 'core');
 
                 var settingElements = dlg.querySelectorAll('.viewSetting');
                 for (var i = 0, length = settingElements.length; i < length; i++) {
diff --git a/src/components/formdialog.css b/src/components/formdialog.css
index 94695f4865..d7cb162e8c 100644
--- a/src/components/formdialog.css
+++ b/src/components/formdialog.css
@@ -55,7 +55,7 @@
     /* Without this emby-checkbox is able to appear on top */
     z-index: 1;
     align-items: flex-end;
-    justify-content: flex-end;
+    justify-content: center;
     flex-wrap: wrap;
 }
 
diff --git a/src/components/groupedcards.js b/src/components/groupedcards.js
index 602c4310f4..8ac3cc799c 100644
--- a/src/components/groupedcards.js
+++ b/src/components/groupedcards.js
@@ -1,5 +1,8 @@
-define(['dom', 'appRouter', 'connectionManager'], function (dom, appRouter, connectionManager) {
-    'use strict';
+/* eslint-disable indent */
+
+import dom from 'dom';
+import appRouter from 'appRouter';
+import connectionManager from 'connectionManager';
 
     function onGroupedCardClick(e, card) {
         var itemId = card.getAttribute('data-id');
@@ -22,7 +25,7 @@ define(['dom', 'appRouter', 'connectionManager'], function (dom, appRouter, conn
                     return void appRouter.showItem(items[0]);
                 }
 
-                var url = 'itemdetails.html?id=' + itemId + '&serverId=' + serverId;
+                var url = 'details?id=' + itemId + '&serverId=' + serverId;
                 Dashboard.navigate(url);
             });
             e.stopPropagation();
@@ -31,7 +34,7 @@ define(['dom', 'appRouter', 'connectionManager'], function (dom, appRouter, conn
         }
     }
 
-    function onItemsContainerClick(e) {
+    export default function onItemsContainerClick(e) {
         var groupedCard = dom.parentWithClass(e.target, 'groupedCard');
 
         if (groupedCard) {
@@ -39,7 +42,4 @@ define(['dom', 'appRouter', 'connectionManager'], function (dom, appRouter, conn
         }
     }
 
-    return {
-        onItemsContainerClick: onItemsContainerClick
-    };
-});
+/* eslint-enable indent */
diff --git a/src/components/guide/guide-settings.js b/src/components/guide/guide-settings.js
index 7409a7e943..77a3637251 100644
--- a/src/components/guide/guide-settings.js
+++ b/src/components/guide/guide-settings.js
@@ -114,7 +114,7 @@ define(['dialogHelper', 'globalize', 'userSettings', 'layoutManager', 'connectio
 
                 var html = '';
 
-                html += globalize.translateDocument(template, 'core');
+                html += globalize.translateHtml(template, 'core');
 
                 dlg.innerHTML = html;
 
diff --git a/src/components/guide/guide.js b/src/components/guide/guide.js
index 223d3a2063..bb4a36497c 100644
--- a/src/components/guide/guide.js
+++ b/src/components/guide/guide.js
@@ -1,4 +1,4 @@
-define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager', 'scrollHelper', 'serverNotifications', 'loading', 'datetime', 'focusManager', 'playbackManager', 'userSettings', 'imageLoader', 'events', 'layoutManager', 'itemShortcuts', 'dom', 'css!./guide.css', 'programStyles', 'material-icons', 'scrollStyles', 'emby-programcell', 'emby-button', 'paper-icon-button-light', 'emby-tabs', 'emby-scroller', 'flexStyles', 'registerElement'], function (require, inputManager, browser, globalize, connectionManager, scrollHelper, serverNotifications, loading, datetime, focusManager, playbackManager, userSettings, imageLoader, events, layoutManager, itemShortcuts, dom) {
+define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager', 'scrollHelper', 'serverNotifications', 'loading', 'datetime', 'focusManager', 'playbackManager', 'userSettings', 'imageLoader', 'events', 'layoutManager', 'itemShortcuts', 'dom', 'css!./guide.css', 'programStyles', 'material-icons', 'scrollStyles', 'emby-programcell', 'emby-button', 'paper-icon-button-light', 'emby-tabs', 'emby-scroller', 'flexStyles', 'webcomponents'], function (require, inputManager, browser, globalize, connectionManager, scrollHelper, serverNotifications, loading, datetime, focusManager, playbackManager, userSettings, imageLoader, events, layoutManager, itemShortcuts, dom) {
     'use strict';
 
     function showViewSettings(instance) {
@@ -1151,7 +1151,7 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
 
             context.classList.add('tvguide');
 
-            context.innerHTML = globalize.translateDocument(template, 'core');
+            context.innerHTML = globalize.translateHtml(template, 'core');
 
             programGrid = context.querySelector('.programGrid');
             var timeslotHeaders = context.querySelector('.timeslotHeaders');
diff --git a/src/components/homeScreenSettings/homeScreenSettings.js b/src/components/homeScreenSettings/homeScreenSettings.js
index 9eae944d26..6d6c26fce4 100644
--- a/src/components/homeScreenSettings/homeScreenSettings.js
+++ b/src/components/homeScreenSettings/homeScreenSettings.js
@@ -1,26 +1,37 @@
-define(['require', 'apphost', 'layoutManager', 'focusManager', 'globalize', 'loading', 'connectionManager', 'homeSections', 'dom', 'events', 'listViewStyle', 'emby-select', 'emby-checkbox'], function (require, appHost, layoutManager, focusManager, globalize, loading, connectionManager, homeSections, dom, events) {
-    'use strict';
+import layoutManager from 'layoutManager';
+import focusManager from 'focusManager';
+import globalize from 'globalize';
+import loading from 'loading';
+import connectionManager from 'connectionManager';
+import homeSections from 'homeSections';
+import dom from 'dom';
+import events from 'events';
+import 'listViewStyle';
+import 'emby-select';
+import 'emby-checkbox';
 
-    var numConfigurableSections = 7;
+/* eslint-disable indent */
+
+    const numConfigurableSections = 7;
 
     function renderViews(page, user, result) {
 
-        var folderHtml = '';
+        let folderHtml = '';
 
         folderHtml += '<div class="checkboxList">';
-        folderHtml += result.map(function (i) {
+        folderHtml += result.map(i => {
 
-            var currentHtml = '';
+            let currentHtml = '';
 
-            var id = 'chkGroupFolder' + i.Id;
+            const id = `chkGroupFolder${i.Id}`;
 
-            var isChecked = user.Configuration.GroupedFolders.indexOf(i.Id) !== -1;
+            const isChecked = user.Configuration.GroupedFolders.includes(i.Id);
 
-            var checkedHtml = isChecked ? ' checked="checked"' : '';
+            const checkedHtml = isChecked ? ' checked="checked"' : '';
 
             currentHtml += '<label>';
-            currentHtml += '<input type="checkbox" is="emby-checkbox" class="chkGroupFolder" data-folderid="' + i.Id + '" id="' + id + '"' + checkedHtml + '/>';
-            currentHtml += '<span>' + i.Name + '</span>';
+            currentHtml += `<input type="checkbox" is="emby-checkbox" class="chkGroupFolder" data-folderid="${i.Id}" id="${id}"${checkedHtml}/>`;
+            currentHtml += `<span>${i.Name}</span>`;
             currentHtml += '</label>';
 
             return currentHtml;
@@ -34,7 +45,7 @@ define(['require', 'apphost', 'layoutManager', 'focusManager', 'globalize', 'loa
 
     function getLandingScreenOptions(type) {
 
-        var list = [];
+        const list = [];
 
         if (type === 'movies') {
             list.push({
@@ -123,27 +134,27 @@ define(['require', 'apphost', 'layoutManager', 'focusManager', 'globalize', 'loa
 
     function getLandingScreenOptionsHtml(type, userValue) {
 
-        return getLandingScreenOptions(type).map(function (o) {
+        return getLandingScreenOptions(type).map(o => {
 
-            var selected = userValue === o.value || (o.isDefault && !userValue);
-            var selectedHtml = selected ? ' selected' : '';
-            var optionValue = o.isDefault ? '' : o.value;
+            const selected = userValue === o.value || (o.isDefault && !userValue);
+            const selectedHtml = selected ? ' selected' : '';
+            const optionValue = o.isDefault ? '' : o.value;
 
-            return '<option value="' + optionValue + '"' + selectedHtml + '>' + o.name + '</option>';
+            return `<option value="${optionValue}"${selectedHtml}>${o.name}</option>`;
         }).join('');
     }
 
     function renderViewOrder(context, user, result) {
 
-        var html = '';
+        let html = '';
 
-        var index = 0;
+        let index = 0;
 
-        html += result.Items.map(function (view) {
+        html += result.Items.map(view => {
 
-            var currentHtml = '';
+            let currentHtml = '';
 
-            currentHtml += '<div class="listItem viewItem" data-viewid="' + view.Id + '">';
+            currentHtml += `<div class="listItem viewItem" data-viewid="${view.Id}">`;
 
             currentHtml += '<span class="material-icons listItemIcon folder_open"></span>';
 
@@ -155,8 +166,8 @@ define(['require', 'apphost', 'layoutManager', 'focusManager', 'globalize', 'loa
 
             currentHtml += '</div>';
 
-            currentHtml += '<button type="button" is="paper-icon-button-light" class="btnViewItemUp btnViewItemMove autoSize" title="' + globalize.translate('Up') + '"><span class="material-icons keyboard_arrow_up"></span></button>';
-            currentHtml += '<button type="button" is="paper-icon-button-light" class="btnViewItemDown btnViewItemMove autoSize" title="' + globalize.translate('Down') + '"><span class="material-icons keyboard_arrow_down"></span></button>';
+            currentHtml += `<button type="button" is="paper-icon-button-light" class="btnViewItemUp btnViewItemMove autoSize" title="${globalize.translate('Up')}"><span class="material-icons keyboard_arrow_up"></span></button>`;
+            currentHtml += `<button type="button" is="paper-icon-button-light" class="btnViewItemDown btnViewItemMove autoSize" title="${globalize.translate('Down')}"><span class="material-icons keyboard_arrow_down"></span></button>`;
 
             currentHtml += '</div>';
 
@@ -170,14 +181,14 @@ define(['require', 'apphost', 'layoutManager', 'focusManager', 'globalize', 'loa
 
     function updateHomeSectionValues(context, userSettings) {
 
-        for (var i = 1; i <= 7; i++) {
+        for (let i = 1; i <= 7; i++) {
 
-            var select = context.querySelector('#selectHomeSection' + i);
-            var defaultValue = homeSections.getDefaultSection(i - 1);
+            const select = context.querySelector(`#selectHomeSection${i}`);
+            const defaultValue = homeSections.getDefaultSection(i - 1);
 
-            var option = select.querySelector('option[value=' + defaultValue + ']') || select.querySelector('option[value=""]');
+            const option = select.querySelector(`option[value=${defaultValue}]`) || select.querySelector('option[value=""]');
 
-            var userValue = userSettings.get('homesection' + (i - 1));
+            const userValue = userSettings.get(`homesection${i - 1}`);
 
             option.value = '';
 
@@ -193,42 +204,42 @@ define(['require', 'apphost', 'layoutManager', 'focusManager', 'globalize', 'loa
 
     function getPerLibrarySettingsHtml(item, user, userSettings, apiClient) {
 
-        var html = '';
+        let html = '';
 
-        var isChecked;
+        let isChecked;
 
         if (item.Type === 'Channel' || item.CollectionType === 'boxsets' || item.CollectionType === 'playlists') {
-            isChecked = (user.Configuration.MyMediaExcludes || []).indexOf(item.Id) === -1;
+            isChecked = !(user.Configuration.MyMediaExcludes || []).includes(item.Id);
             html += '<div>';
             html += '<label>';
-            html += '<input type="checkbox" is="emby-checkbox" class="chkIncludeInMyMedia" data-folderid="' + item.Id + '"' + (isChecked ? ' checked="checked"' : '') + '/>';
-            html += '<span>' + globalize.translate('DisplayInMyMedia') + '</span>';
+            html += `<input type="checkbox" is="emby-checkbox" class="chkIncludeInMyMedia" data-folderid="${item.Id}"${isChecked ? ' checked="checked"' : ''}/>`;
+            html += `<span>${globalize.translate('DisplayInMyMedia')}</span>`;
             html += '</label>';
             html += '</div>';
         }
 
-        var excludeFromLatest = ['playlists', 'livetv', 'boxsets', 'channels'];
-        if (excludeFromLatest.indexOf(item.CollectionType || '') === -1) {
+        const excludeFromLatest = ['playlists', 'livetv', 'boxsets', 'channels'];
+        if (!excludeFromLatest.includes(item.CollectionType || '')) {
 
-            isChecked = user.Configuration.LatestItemsExcludes.indexOf(item.Id) === -1;
+            isChecked = !user.Configuration.LatestItemsExcludes.includes(item.Id);
             html += '<label class="fldIncludeInLatest">';
-            html += '<input type="checkbox" is="emby-checkbox" class="chkIncludeInLatest" data-folderid="' + item.Id + '"' + (isChecked ? ' checked="checked"' : '') + '/>';
-            html += '<span>' + globalize.translate('DisplayInOtherHomeScreenSections') + '</span>';
+            html += `<input type="checkbox" is="emby-checkbox" class="chkIncludeInLatest" data-folderid="${item.Id}"${isChecked ? ' checked="checked"' : ''}/>`;
+            html += `<span>${globalize.translate('DisplayInOtherHomeScreenSections')}</span>`;
             html += '</label>';
         }
 
         if (html) {
 
-            html = '<div class="checkboxListContainer">' + html + '</div>';
+            html = `<div class="checkboxListContainer">${html}</div>`;
         }
 
         if (item.CollectionType === 'movies' || item.CollectionType === 'tvshows' || item.CollectionType === 'music' || item.CollectionType === 'livetv') {
 
-            var idForLanding = item.CollectionType === 'livetv' ? item.CollectionType : item.Id;
+            const idForLanding = item.CollectionType === 'livetv' ? item.CollectionType : item.Id;
             html += '<div class="selectContainer">';
-            html += '<select is="emby-select" class="selectLanding" data-folderid="' + idForLanding + '" label="' + globalize.translate('LabelDefaultScreen') + '">';
+            html += `<select is="emby-select" class="selectLanding" data-folderid="${idForLanding}" label="${globalize.translate('LabelDefaultScreen')}">`;
 
-            var userValue = userSettings.get('landing-' + idForLanding);
+            const userValue = userSettings.get(`landing-${idForLanding}`);
 
             html += getLandingScreenOptionsHtml(item.CollectionType, userValue);
 
@@ -238,7 +249,7 @@ define(['require', 'apphost', 'layoutManager', 'focusManager', 'globalize', 'loa
 
         if (html) {
 
-            var prefix = '';
+            let prefix = '';
             prefix += '<div class="verticalSection">';
 
             prefix += '<h2 class="sectionTitle">';
@@ -254,10 +265,10 @@ define(['require', 'apphost', 'layoutManager', 'focusManager', 'globalize', 'loa
 
     function renderPerLibrarySettings(context, user, userViews, userSettings, apiClient) {
 
-        var elem = context.querySelector('.perLibrarySettings');
-        var html = '';
+        const elem = context.querySelector('.perLibrarySettings');
+        let html = '';
 
-        for (var i = 0, length = userViews.length; i < length; i++) {
+        for (let i = 0, length = userViews.length; i < length; i++) {
 
             html += getPerLibrarySettingsHtml(userViews[i], user, userSettings, apiClient);
         }
@@ -271,10 +282,10 @@ define(['require', 'apphost', 'layoutManager', 'focusManager', 'globalize', 'loa
 
         updateHomeSectionValues(context, userSettings);
 
-        var promise1 = apiClient.getUserViews({ IncludeHidden: true }, user.Id);
-        var promise2 = apiClient.getJSON(apiClient.getUrl('Users/' + user.Id + '/GroupingOptions'));
+        const promise1 = apiClient.getUserViews({ IncludeHidden: true }, user.Id);
+        const promise2 = apiClient.getJSON(apiClient.getUrl(`Users/${user.Id}/GroupingOptions`));
 
-        Promise.all([promise1, promise2]).then(function (responses) {
+        Promise.all([promise1, promise2]).then(responses => {
 
             renderViewOrder(context, user, responses[0]);
 
@@ -286,38 +297,19 @@ define(['require', 'apphost', 'layoutManager', 'focusManager', 'globalize', 'loa
         });
     }
 
-    function getSibling(elem, type, className) {
-
-        var sibling = elem[type];
-
-        while (sibling != null) {
-            if (sibling.classList.contains(className)) {
-                break;
-            }
-        }
-
-        if (sibling != null) {
-            if (!sibling.classList.contains(className)) {
-                sibling = null;
-            }
-        }
-
-        return sibling;
-    }
-
     function onSectionOrderListClick(e) {
 
-        var target = dom.parentWithClass(e.target, 'btnViewItemMove');
+        const target = dom.parentWithClass(e.target, 'btnViewItemMove');
 
         if (target) {
-            var viewItem = dom.parentWithClass(target, 'viewItem');
+            const viewItem = dom.parentWithClass(target, 'viewItem');
 
             if (viewItem) {
-                var ul = dom.parentWithClass(viewItem, 'paperList');
+                const ul = dom.parentWithClass(viewItem, 'paperList');
 
                 if (target.classList.contains('btnViewItemDown')) {
 
-                    var next = viewItem.nextSibling;
+                    const next = viewItem.nextSibling;
 
                     if (next) {
                         viewItem.parentNode.removeChild(viewItem);
@@ -327,7 +319,7 @@ define(['require', 'apphost', 'layoutManager', 'focusManager', 'globalize', 'loa
 
                 } else {
 
-                    var prev = viewItem.previousSibling;
+                    const prev = viewItem.previousSibling;
 
                     if (prev) {
                         viewItem.parentNode.removeChild(viewItem);
@@ -341,10 +333,10 @@ define(['require', 'apphost', 'layoutManager', 'focusManager', 'globalize', 'loa
 
     function getCheckboxItems(selector, context, isChecked) {
 
-        var inputs = context.querySelectorAll(selector);
-        var list = [];
+        const inputs = context.querySelectorAll(selector);
+        const list = [];
 
-        for (var i = 0, length = inputs.length; i < length; i++) {
+        for (let i = 0, length = inputs.length; i < length; i++) {
 
             if (inputs[i].checked === isChecked) {
                 list.push(inputs[i]);
@@ -359,25 +351,25 @@ define(['require', 'apphost', 'layoutManager', 'focusManager', 'globalize', 'loa
 
         user.Configuration.HidePlayedInLatest = context.querySelector('.chkHidePlayedFromLatest').checked;
 
-        user.Configuration.LatestItemsExcludes = getCheckboxItems('.chkIncludeInLatest', context, false).map(function (i) {
+        user.Configuration.LatestItemsExcludes = getCheckboxItems('.chkIncludeInLatest', context, false).map(i => {
 
             return i.getAttribute('data-folderid');
         });
 
-        user.Configuration.MyMediaExcludes = getCheckboxItems('.chkIncludeInMyMedia', context, false).map(function (i) {
+        user.Configuration.MyMediaExcludes = getCheckboxItems('.chkIncludeInMyMedia', context, false).map(i => {
 
             return i.getAttribute('data-folderid');
         });
 
-        user.Configuration.GroupedFolders = getCheckboxItems('.chkGroupFolder', context, true).map(function (i) {
+        user.Configuration.GroupedFolders = getCheckboxItems('.chkGroupFolder', context, true).map(i => {
 
             return i.getAttribute('data-folderid');
         });
 
-        var viewItems = context.querySelectorAll('.viewItem');
-        var orderedViews = [];
-        var i;
-        var length;
+        const viewItems = context.querySelectorAll('.viewItem');
+        const orderedViews = [];
+        let i;
+        let length;
         for (i = 0, length = viewItems.length; i < length; i++) {
             orderedViews.push(viewItems[i].getAttribute('data-viewid'));
         }
@@ -394,10 +386,10 @@ define(['require', 'apphost', 'layoutManager', 'focusManager', 'globalize', 'loa
         userSettingsInstance.set('homesection5', context.querySelector('#selectHomeSection6').value);
         userSettingsInstance.set('homesection6', context.querySelector('#selectHomeSection7').value);
 
-        var selectLandings = context.querySelectorAll('.selectLanding');
+        const selectLandings = context.querySelectorAll('.selectLanding');
         for (i = 0, length = selectLandings.length; i < length; i++) {
-            var selectLanding = selectLandings[i];
-            userSettingsInstance.set('landing-' + selectLanding.getAttribute('data-folderid'), selectLanding.value);
+            const selectLanding = selectLandings[i];
+            userSettingsInstance.set(`landing-${selectLanding.getAttribute('data-folderid')}`, selectLanding.value);
         }
 
         return apiClient.updateUserConfiguration(user.Id, user.Configuration);
@@ -407,20 +399,20 @@ define(['require', 'apphost', 'layoutManager', 'focusManager', 'globalize', 'loa
 
         loading.show();
 
-        apiClient.getUser(userId).then(function (user) {
+        apiClient.getUser(userId).then(user => {
 
-            saveUser(context, user, userSettings, apiClient).then(function () {
+            saveUser(context, user, userSettings, apiClient).then(() => {
 
                 loading.hide();
                 if (enableSaveConfirmation) {
-                    require(['toast'], function (toast) {
+                    import('toast').then(({default: toast}) => {
                         toast(globalize.translate('SettingsSaved'));
                     });
                 }
 
                 events.trigger(instance, 'saved');
 
-            }, function () {
+            }, () => {
                 loading.hide();
             });
         });
@@ -428,14 +420,14 @@ define(['require', 'apphost', 'layoutManager', 'focusManager', 'globalize', 'loa
 
     function onSubmit(e) {
 
-        var self = this;
-        var apiClient = connectionManager.getApiClient(self.options.serverId);
-        var userId = self.options.userId;
-        var userSettings = self.options.userSettings;
+        const self = this;
+        const apiClient = connectionManager.getApiClient(self.options.serverId);
+        const userId = self.options.userId;
+        const userSettings = self.options.userSettings;
 
-        userSettings.setUserInfo(userId, apiClient).then(function () {
+        userSettings.setUserInfo(userId, apiClient).then(() => {
 
-            var enableSaveConfirmation = self.options.enableSaveConfirmation;
+            const enableSaveConfirmation = self.options.enableSaveConfirmation;
             save(self, self.options.element, userId, userSettings, apiClient, enableSaveConfirmation);
         });
 
@@ -448,13 +440,13 @@ define(['require', 'apphost', 'layoutManager', 'focusManager', 'globalize', 'loa
 
     function onChange(e) {
 
-        var chkIncludeInMyMedia = dom.parentWithClass(e.target, 'chkIncludeInMyMedia');
+        const chkIncludeInMyMedia = dom.parentWithClass(e.target, 'chkIncludeInMyMedia');
         if (!chkIncludeInMyMedia) {
             return;
         }
 
-        var section = dom.parentWithClass(chkIncludeInMyMedia, 'verticalSection');
-        var fldIncludeInLatest = section.querySelector('.fldIncludeInLatest');
+        const section = dom.parentWithClass(chkIncludeInMyMedia, 'verticalSection');
+        const fldIncludeInLatest = section.querySelector('.fldIncludeInLatest');
         if (fldIncludeInLatest) {
             if (chkIncludeInMyMedia.checked) {
                 fldIncludeInLatest.classList.remove('hide');
@@ -466,13 +458,13 @@ define(['require', 'apphost', 'layoutManager', 'focusManager', 'globalize', 'loa
 
     function embed(options, self) {
 
-        require(['text!./homeScreenSettings.template.html'], function (template) {
+        return import('text!./homeScreenSettings.template.html').then(({default: template}) => {
 
-            for (var i = 1; i <= numConfigurableSections; i++) {
-                template = template.replace('{section' + i + 'label}', globalize.translate('LabelHomeScreenSectionValue', i));
+            for (let i = 1; i <= numConfigurableSections; i++) {
+                template = template.replace(`{section${i}label}`, globalize.translate('LabelHomeScreenSectionValue', i));
             }
 
-            options.element.innerHTML = globalize.translateDocument(template, 'core');
+            options.element.innerHTML = globalize.translateHtml(template, 'core');
 
             options.element.querySelector('.viewOrderList').addEventListener('click', onSectionOrderListClick);
             options.element.querySelector('form').addEventListener('submit', onSubmit.bind(self));
@@ -492,47 +484,48 @@ define(['require', 'apphost', 'layoutManager', 'focusManager', 'globalize', 'loa
         });
     }
 
-    function HomeScreenSettings(options) {
+    class HomeScreenSettings {
+        constructor(options) {
+            this.options = options;
+            embed(options, this);
+        }
 
-        this.options = options;
+        loadData(autoFocus) {
 
-        embed(options, this);
+            const self = this;
+            const context = self.options.element;
+
+            loading.show();
+
+            const userId = self.options.userId;
+            const apiClient = connectionManager.getApiClient(self.options.serverId);
+            const userSettings = self.options.userSettings;
+
+            apiClient.getUser(userId).then(user => {
+
+                userSettings.setUserInfo(userId, apiClient).then(() => {
+
+                    self.dataLoaded = true;
+
+                    loadForm(context, user, userSettings, apiClient);
+
+                    if (autoFocus) {
+                        focusManager.autoFocus(context);
+                    }
+                });
+            });
+        }
+
+        submit() {
+            onSubmit.call(this);
+        }
+
+        destroy() {
+
+            this.options = null;
+        }
     }
 
-    HomeScreenSettings.prototype.loadData = function (autoFocus) {
+/* eslint-enable indent */
 
-        var self = this;
-        var context = self.options.element;
-
-        loading.show();
-
-        var userId = self.options.userId;
-        var apiClient = connectionManager.getApiClient(self.options.serverId);
-        var userSettings = self.options.userSettings;
-
-        apiClient.getUser(userId).then(function (user) {
-
-            userSettings.setUserInfo(userId, apiClient).then(function () {
-
-                self.dataLoaded = true;
-
-                loadForm(context, user, userSettings, apiClient);
-
-                if (autoFocus) {
-                    focusManager.autoFocus(context);
-                }
-            });
-        });
-    };
-
-    HomeScreenSettings.prototype.submit = function () {
-        onSubmit.call(this);
-    };
-
-    HomeScreenSettings.prototype.destroy = function () {
-
-        this.options = null;
-    };
-
-    return HomeScreenSettings;
-});
+export default HomeScreenSettings;
diff --git a/src/components/homesections/homesections.js b/src/components/homesections/homesections.js
index 3cd30893b9..010b6b1a78 100644
--- a/src/components/homesections/homesections.js
+++ b/src/components/homesections/homesections.js
@@ -1,7 +1,24 @@
-define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'layoutManager', 'imageLoader', 'globalize', 'itemShortcuts', 'itemHelper', 'appRouter', 'scripts/imagehelper', 'paper-icon-button-light', 'emby-itemscontainer', 'emby-scroller', 'emby-button', 'css!./homesections'], function (connectionManager, cardBuilder, appSettings, dom, appHost, layoutManager, imageLoader, globalize, itemShortcuts, itemHelper, appRouter, imageHelper) {
-    'use strict';
+import connectionManager from 'connectionManager';
+import cardBuilder from 'cardBuilder';
+import appSettings from 'appSettings';
+import dom from 'dom';
+import appHost from 'apphost';
+import layoutManager from 'layoutManager';
+import imageLoader from 'imageLoader';
+import globalize from 'globalize';
+import itemShortcuts from 'itemShortcuts';
+import itemHelper from 'itemHelper';
+import appRouter from 'appRouter';
+import imageHelper from 'scripts/imagehelper';
+import 'paper-icon-button-light';
+import 'emby-itemscontainer';
+import 'emby-scroller';
+import 'emby-button';
+import 'css!./homesections';
 
-    function getDefaultSection(index) {
+/* eslint-disable indent */
+
+    export function getDefaultSection(index) {
         switch (index) {
             case 0:
                 return 'smalllibrarytiles';
@@ -23,9 +40,9 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la
     }
 
     function getAllSectionsToShow(userSettings, sectionCount) {
-        var sections = [];
-        for (var i = 0, length = sectionCount; i < length; i++) {
-            var section = userSettings.get('homesection' + i) || getDefaultSection(i);
+        const sections = [];
+        for (let i = 0, length = sectionCount; i < length; i++) {
+            let section = userSettings.get('homesection' + i) || getDefaultSection(i);
             if (section === 'folders') {
                 section = getDefaultSection(0);
             }
@@ -36,22 +53,22 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la
         return sections;
     }
 
-    function loadSections(elem, apiClient, user, userSettings) {
+    export function loadSections(elem, apiClient, user, userSettings) {
         return getUserViews(apiClient, user.Id).then(function (userViews) {
-            var html = '';
+            let html = '';
 
             if (userViews.length) {
-                var sectionCount = 7;
-                for (var i = 0; i < sectionCount; i++) {
+                const sectionCount = 7;
+                for (let i = 0; i < sectionCount; i++) {
                     html += '<div class="verticalSection section' + i + '"></div>';
                 }
 
                 elem.innerHTML = html;
                 elem.classList.add('homeSectionsContainer');
 
-                var promises = [];
-                var sections = getAllSectionsToShow(userSettings, sectionCount);
-                for (var i = 0; i < sections.length; i++) {
+                const promises = [];
+                const sections = getAllSectionsToShow(userSettings, sectionCount);
+                for (let i = 0; i < sections.length; i++) {
                     promises.push(loadSection(elem, apiClient, user, userSettings, userViews, sections, i));
                 }
 
@@ -62,7 +79,7 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la
                     });
                 });
             } else {
-                var noLibDescription;
+                let noLibDescription;
                 if (user['Policy'] && user['Policy']['IsAdministrator']) {
                     noLibDescription = globalize.translate('NoCreatedLibraries', '<br><a id="button-createLibrary" class="button-link">', '</a>');
                 } else {
@@ -75,7 +92,7 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la
                 html += '</div>';
                 elem.innerHTML = html;
 
-                var createNowLink = elem.querySelector('#button-createLibrary');
+                const createNowLink = elem.querySelector('#button-createLibrary');
                 if (createNowLink) {
                     createNowLink.addEventListener('click', function () {
                         Dashboard.navigate('library.html');
@@ -85,9 +102,9 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la
         });
     }
 
-    function destroySections(elem) {
-        var elems = elem.querySelectorAll('.itemsContainer');
-        for (var i = 0; i < elems.length; i++) {
+    export function destroySections(elem) {
+        const elems = elem.querySelectorAll('.itemsContainer');
+        for (let i = 0; i < elems.length; i++) {
             elems[i].fetchData = null;
             elems[i].parentContainer = null;
             elems[i].getItemsHtml = null;
@@ -96,24 +113,22 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la
         elem.innerHTML = '';
     }
 
-    function pause(elem) {
-        var elems = elem.querySelectorAll('.itemsContainer');
-        for (var i = 0; i < elems.length; i++) {
+    export function pause(elem) {
+        const elems = elem.querySelectorAll('.itemsContainer');
+        for (let i = 0; i < elems.length; i++) {
             elems[i].pause();
         }
     }
 
-    function resume(elem, options) {
-        var elems = elem.querySelectorAll('.itemsContainer');
-        var i;
-        var length;
-        var promises = [];
+    export function resume(elem, options) {
+        const elems = elem.querySelectorAll('.itemsContainer');
+        const promises = [];
 
-        for (i = 0, length = elems.length; i < length; i++) {
+        for (let i = 0, length = elems.length; i < length; i++) {
             promises.push(elems[i].resume(options));
         }
 
-        var promise = Promise.all(promises);
+        const promise = Promise.all(promises);
         if (!options || options.returnPromise !== false) {
             return promise;
         }
@@ -121,10 +136,10 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la
 
     function loadSection(page, apiClient, user, userSettings, userViews, allSections, index) {
 
-        var section = allSections[index];
-        var userId = user.Id;
+        const section = allSections[index];
+        const userId = user.Id;
 
-        var elem = page.querySelector('.section' + index);
+        const elem = page.querySelector('.section' + index);
 
         if (section === 'latestmedia') {
             loadRecentlyAdded(elem, apiClient, user, userViews);
@@ -168,11 +183,11 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la
     }
 
     function getPortraitShape() {
-        return enableScrollX() ? 'autooverflow' : 'auto';
+        return enableScrollX() ? 'overflowPortrait' : 'portrait';
     }
 
     function getLibraryButtonsHtml(items) {
-        var html = '';
+        let html = '';
 
         html += '<div class="verticalSection verticalSection-extrabottompadding">';
         html += '<h2 class="sectionTitle sectionTitle-cards padded-left">' + globalize.translate('HeaderMyMedia') + '</h2>';
@@ -180,9 +195,9 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la
         html += '<div is="emby-itemscontainer" class="itemsContainer padded-left padded-right vertical-wrap focuscontainer-x" data-multiselect="false">';
 
         // library card background images
-        for (var i = 0, length = items.length; i < length; i++) {
-            var item = items[i];
-            var icon = imageHelper.getLibraryIcon(item.CollectionType);
+        for (let i = 0, length = items.length; i < length; i++) {
+            const item = items[i];
+            const icon = imageHelper.getLibraryIcon(item.CollectionType);
             html += '<a is="emby-linkbutton" href="' + appRouter.getRouteUrl(item) + '" class="raised homeLibraryButton"><span class="material-icons homeLibraryIcon ' + icon + '"></span><span class="homeLibraryText">' + item.Name + '</span></a>';
         }
 
@@ -194,7 +209,7 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la
 
     function loadlibraryButtons(elem, apiClient, user, userSettings, userViews) {
         elem.classList.remove('verticalSection');
-        var html = getLibraryButtonsHtml(userViews);
+        const html = getLibraryButtonsHtml(userViews);
 
         elem.innerHTML = html;
         imageLoader.lazyChildren(elem);
@@ -210,8 +225,8 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la
 
     function getFetchLatestItemsFn(serverId, parentId, collectionType) {
         return function () {
-            var apiClient = connectionManager.getApiClient(serverId);
-            var limit = 16;
+            const apiClient = connectionManager.getApiClient(serverId);
+            let limit = 16;
 
             if (enableScrollX()) {
                 if (collectionType === 'music') {
@@ -227,9 +242,9 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la
                 }
             }
 
-            var options = {
+            const options = {
                 Limit: limit,
-                Fields: 'PrimaryImageAspectRatio,BasicSyncInfo',
+                Fields: 'PrimaryImageAspectRatio,BasicSyncInfo,Path',
                 ImageTypeLimit: 1,
                 EnableImageTypes: 'Primary,Backdrop,Thumb',
                 ParentId: parentId
@@ -241,8 +256,8 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la
 
     function getLatestItemsHtmlFn(itemType, viewType) {
         return function (items) {
-            var cardLayout = false;
-            var shape;
+            const cardLayout = false;
+            let shape;
             if (itemType === 'Channel' || viewType === 'movies' || viewType === 'books' || viewType === 'tvshows') {
                 shape = getPortraitShape();
             } else if (viewType === 'music' || viewType === 'homevideos') {
@@ -254,7 +269,7 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la
             return cardBuilder.getCardsHtml({
                 items: items,
                 shape: shape,
-                preferThumb: viewType !== 'movies' && itemType !== 'Channel' && viewType !== 'music' ? 'auto' : null,
+                preferThumb: viewType !== 'movies' && viewType !== 'tvshows' && itemType !== 'Channel' && viewType !== 'music' ? 'auto' : null,
                 showUnplayedIndicator: false,
                 showChildCountIndicator: true,
                 context: 'home',
@@ -272,7 +287,7 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la
     }
 
     function renderLatestSection(elem, apiClient, user, parent) {
-        var html = '';
+        let html = '';
 
         html += '<div class="sectionTitleContainer sectionTitleContainer-cards padded-left">';
         if (!layoutManager.tv) {
@@ -303,7 +318,7 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la
 
         elem.innerHTML = html;
 
-        var itemsContainer = elem.querySelector('.itemsContainer');
+        const itemsContainer = elem.querySelector('.itemsContainer');
         itemsContainer.fetchData = getFetchLatestItemsFn(apiClient.serverId(), parent.Id, parent.CollectionType);
         itemsContainer.getItemsHtml = getLatestItemsHtmlFn(parent.Type, parent.CollectionType);
         itemsContainer.parentContainer = elem;
@@ -311,10 +326,10 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la
 
     function loadRecentlyAdded(elem, apiClient, user, userViews) {
         elem.classList.remove('verticalSection');
-        var excludeViewTypes = ['playlists', 'livetv', 'boxsets', 'channels'];
+        const excludeViewTypes = ['playlists', 'livetv', 'boxsets', 'channels'];
 
-        for (var i = 0, length = userViews.length; i < length; i++) {
-            var item = userViews[i];
+        for (let i = 0, length = userViews.length; i < length; i++) {
+            const item = userViews[i];
             if (user.Configuration.LatestItemsExcludes.indexOf(item.Id) !== -1) {
                 continue;
             }
@@ -323,7 +338,7 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la
                 continue;
             }
 
-            var frag = document.createElement('div');
+            const frag = document.createElement('div');
             frag.classList.add('verticalSection');
             frag.classList.add('hide');
             elem.appendChild(frag);
@@ -334,12 +349,14 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la
 
     function getRequirePromise(deps) {
         return new Promise(function (resolve, reject) {
-            require(deps, resolve);
+            import(deps).then(() => {
+                return resolve;
+            });
         });
     }
 
-    function loadLibraryTiles(elem, apiClient, user, userSettings, shape, userViews, allSections) {
-        var html = '';
+    export function loadLibraryTiles(elem, apiClient, user, userSettings, shape, userViews, allSections) {
+        let html = '';
         if (userViews.length) {
             html += '<h2 class="sectionTitle sectionTitle-cards padded-left">' + globalize.translate('HeaderMyMedia') + '</h2>';
             if (enableScrollX()) {
@@ -372,10 +389,10 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la
 
     function getContinueWatchingFetchFn(serverId) {
         return function () {
-            var apiClient = connectionManager.getApiClient(serverId);
-            var screenWidth = dom.getWindowSize().innerWidth;
+            const apiClient = connectionManager.getApiClient(serverId);
+            const screenWidth = dom.getWindowSize().innerWidth;
 
-            var limit;
+            let limit;
             if (enableScrollX()) {
                 limit = 12;
             } else {
@@ -383,7 +400,7 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la
                 limit = Math.min(limit, 5);
             }
 
-            var options = {
+            const options = {
                 Limit: limit,
                 Recursive: true,
                 Fields: 'PrimaryImageAspectRatio,BasicSyncInfo',
@@ -398,7 +415,7 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la
     }
 
     function getContinueWatchingItemsHtml(items) {
-        var cardLayout = false;
+        const cardLayout = false;
         return cardBuilder.getCardsHtml({
             items: items,
             preferThumb: true,
@@ -419,7 +436,7 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la
     }
 
     function loadResumeVideo(elem, apiClient, userId) {
-        var html = '';
+        let html = '';
 
         html += '<h2 class="sectionTitle sectionTitle-cards padded-left">' + globalize.translate('HeaderContinueWatching') + '</h2>';
         if (enableScrollX()) {
@@ -437,7 +454,7 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la
         elem.classList.add('hide');
         elem.innerHTML = html;
 
-        var itemsContainer = elem.querySelector('.itemsContainer');
+        const itemsContainer = elem.querySelector('.itemsContainer');
         itemsContainer.fetchData = getContinueWatchingFetchFn(apiClient.serverId());
         itemsContainer.getItemsHtml = getContinueWatchingItemsHtml;
         itemsContainer.parentContainer = elem;
@@ -445,10 +462,10 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la
 
     function getContinueListeningFetchFn(serverId) {
         return function () {
-            var apiClient = connectionManager.getApiClient(serverId);
-            var screenWidth = dom.getWindowSize().innerWidth;
+            const apiClient = connectionManager.getApiClient(serverId);
+            const screenWidth = dom.getWindowSize().innerWidth;
 
-            var limit;
+            let limit;
             if (enableScrollX()) {
                 limit = 12;
             } else {
@@ -456,7 +473,7 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la
                 limit = Math.min(limit, 5);
             }
 
-            var options = {
+            const options = {
                 Limit: limit,
                 Recursive: true,
                 Fields: 'PrimaryImageAspectRatio,BasicSyncInfo',
@@ -471,7 +488,7 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la
     }
 
     function getContinueListeningItemsHtml(items) {
-        var cardLayout = false;
+        const cardLayout = false;
         return cardBuilder.getCardsHtml({
             items: items,
             preferThumb: true,
@@ -492,7 +509,7 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la
     }
 
     function loadResumeAudio(elem, apiClient, userId) {
-        var html = '';
+        let html = '';
 
         html += '<h2 class="sectionTitle sectionTitle-cards padded-left">' + globalize.translate('HeaderContinueWatching') + '</h2>';
         if (enableScrollX()) {
@@ -510,7 +527,7 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la
         elem.classList.add('hide');
         elem.innerHTML = html;
 
-        var itemsContainer = elem.querySelector('.itemsContainer');
+        const itemsContainer = elem.querySelector('.itemsContainer');
         itemsContainer.fetchData = getContinueListeningFetchFn(apiClient.serverId());
         itemsContainer.getItemsHtml = getContinueListeningItemsHtml;
         itemsContainer.parentContainer = elem;
@@ -518,7 +535,7 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la
 
     function getOnNowFetchFn(serverId) {
         return function () {
-            var apiClient = connectionManager.getApiClient(serverId);
+            const apiClient = connectionManager.getApiClient(serverId);
             return apiClient.getLiveTvRecommendedPrograms({
                 userId: apiClient.getCurrentUserId(),
                 IsAiring: true,
@@ -532,7 +549,7 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la
     }
 
     function getOnNowItemsHtml(items) {
-        var cardLayout = false;
+        const cardLayout = false;
         return cardBuilder.getCardsHtml({
             items: items,
             preferThumb: 'auto',
@@ -559,7 +576,7 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la
             return Promise.resolve();
         }
 
-        var userId = user.Id;
+        const userId = user.Id;
         return apiClient.getLiveTvRecommendedPrograms({
             userId: apiClient.getCurrentUserId(),
             IsAiring: true,
@@ -569,7 +586,7 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la
             EnableTotalRecordCount: false,
             Fields: 'ChannelInfo,PrimaryImageAspectRatio'
         }).then(function (result) {
-            var html = '';
+            let html = '';
             if (result.Items.length) {
                 elem.classList.remove('padded-left');
                 elem.classList.remove('padded-right');
@@ -654,7 +671,7 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la
 
                 elem.innerHTML = html;
 
-                var itemsContainer = elem.querySelector('.itemsContainer');
+                const itemsContainer = elem.querySelector('.itemsContainer');
                 itemsContainer.parentContainer = elem;
                 itemsContainer.fetchData = getOnNowFetchFn(apiClient.serverId());
                 itemsContainer.getItemsHtml = getOnNowItemsHtml;
@@ -664,10 +681,10 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la
 
     function getNextUpFetchFn(serverId) {
         return function () {
-            var apiClient = connectionManager.getApiClient(serverId);
+            const apiClient = connectionManager.getApiClient(serverId);
             return apiClient.getNextUpEpisodes({
                 Limit: enableScrollX() ? 24 : 15,
-                Fields: 'PrimaryImageAspectRatio,SeriesInfo,DateCreated,BasicSyncInfo',
+                Fields: 'PrimaryImageAspectRatio,SeriesInfo,DateCreated,BasicSyncInfo,Path',
                 UserId: apiClient.getCurrentUserId(),
                 ImageTypeLimit: 1,
                 EnableImageTypes: 'Primary,Backdrop,Banner,Thumb',
@@ -677,7 +694,7 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la
     }
 
     function getNextUpItemsHtml(items) {
-        var cardLayout = false;
+        const cardLayout = false;
         return cardBuilder.getCardsHtml({
             items: items,
             preferThumb: true,
@@ -695,7 +712,7 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la
     }
 
     function loadNextUp(elem, apiClient, userId) {
-        var html = '';
+        let html = '';
 
         html += '<div class="sectionTitleContainer sectionTitleContainer-cards padded-left">';
         if (!layoutManager.tv) {
@@ -727,7 +744,7 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la
         elem.classList.add('hide');
         elem.innerHTML = html;
 
-        var itemsContainer = elem.querySelector('.itemsContainer');
+        const itemsContainer = elem.querySelector('.itemsContainer');
         itemsContainer.fetchData = getNextUpFetchFn(apiClient.serverId());
         itemsContainer.getItemsHtml = getNextUpItemsHtml;
         itemsContainer.parentContainer = elem;
@@ -735,7 +752,7 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la
 
     function getLatestRecordingsFetchFn(serverId, activeRecordingsOnly) {
         return function () {
-            var apiClient = connectionManager.getApiClient(serverId);
+            const apiClient = connectionManager.getApiClient(serverId);
             return apiClient.getLiveTvRecordings({
                 userId: apiClient.getCurrentUserId(),
                 Limit: enableScrollX() ? 12 : 5,
@@ -749,7 +766,7 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la
 
     function getLatestRecordingItemsHtml(activeRecordingsOnly) {
         return function (items) {
-            var cardLayout = false;
+            const cardLayout = false;
             return cardBuilder.getCardsHtml({
                 items: items,
                 shape: enableScrollX() ? 'autooverflow' : 'auto',
@@ -774,11 +791,11 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la
     }
 
     function loadLatestLiveTvRecordings(elem, activeRecordingsOnly, apiClient, userId) {
-        var title = activeRecordingsOnly ?
+        const title = activeRecordingsOnly ?
             globalize.translate('HeaderActiveRecordings') :
             globalize.translate('HeaderLatestRecordings');
 
-        var html = '';
+        let html = '';
 
         html += '<div class="sectionTitleContainer sectionTitleContainer-cards">';
         html += '<h2 class="sectionTitle sectionTitle-cards padded-left">' + title + '</h2>';
@@ -799,18 +816,19 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la
         elem.classList.add('hide');
         elem.innerHTML = html;
 
-        var itemsContainer = elem.querySelector('.itemsContainer');
+        const itemsContainer = elem.querySelector('.itemsContainer');
         itemsContainer.fetchData = getLatestRecordingsFetchFn(apiClient.serverId(), activeRecordingsOnly);
         itemsContainer.getItemsHtml = getLatestRecordingItemsHtml(activeRecordingsOnly);
         itemsContainer.parentContainer = elem;
     }
 
-    return {
-        loadLibraryTiles: loadLibraryTiles,
-        getDefaultSection: getDefaultSection,
-        loadSections: loadSections,
-        destroySections: destroySections,
-        pause: pause,
-        resume: resume
-    };
-});
+export default {
+    loadLibraryTiles: loadLibraryTiles,
+    getDefaultSection: getDefaultSection,
+    loadSections: loadSections,
+    destroySections: destroySections,
+    pause: pause,
+    resume: resume
+};
+
+/* eslint-enable indent */
diff --git a/src/components/htmlMediaHelper.js b/src/components/htmlMediaHelper.js
index 3f17eeb336..062c80efa6 100644
--- a/src/components/htmlMediaHelper.js
+++ b/src/components/htmlMediaHelper.js
@@ -1,17 +1,20 @@
-define(['appSettings', 'browser', 'events'], function (appSettings, browser, events) {
-    'use strict';
+/* eslint-disable indent */
 
-    function getSavedVolume() {
+import appSettings from 'appSettings' ;
+import browser from 'browser';
+import events from 'events';
+
+    export function getSavedVolume() {
         return appSettings.get('volume') || 1;
     }
 
-    function saveVolume(value) {
+    export function saveVolume(value) {
         if (value) {
             appSettings.set('volume', value);
         }
     }
 
-    function getCrossOriginValue(mediaSource) {
+    export function getCrossOriginValue(mediaSource) {
         if (mediaSource.IsRemote) {
             return null;
         }
@@ -30,7 +33,7 @@ define(['appSettings', 'browser', 'events'], function (appSettings, browser, eve
         return false;
     }
 
-    function enableHlsShakaPlayer(item, mediaSource, mediaType) {
+    export function enableHlsShakaPlayer(item, mediaSource, mediaType) {
         /* eslint-disable-next-line compat/compat */
         if (!!window.MediaSource && !!MediaSource.isTypeSupported) {
 
@@ -56,7 +59,7 @@ define(['appSettings', 'browser', 'events'], function (appSettings, browser, eve
         return false;
     }
 
-    function enableHlsJsPlayer(runTimeTicks, mediaType) {
+    export function enableHlsJsPlayer(runTimeTicks, mediaType) {
 
         if (window.MediaSource == null) {
             return false;
@@ -98,7 +101,7 @@ define(['appSettings', 'browser', 'events'], function (appSettings, browser, eve
 
     var recoverDecodingErrorDate;
     var recoverSwapAudioCodecDate;
-    function handleHlsJsMediaError(instance, reject) {
+    export function handleHlsJsMediaError(instance, reject) {
 
         var hlsPlayer = instance._hlsPlayer;
 
@@ -134,7 +137,7 @@ define(['appSettings', 'browser', 'events'], function (appSettings, browser, eve
         }
     }
 
-    function onErrorInternal(instance, type) {
+    export function onErrorInternal(instance, type) {
 
         // Needed for video
         if (instance.destroyCustomTrack) {
@@ -148,7 +151,7 @@ define(['appSettings', 'browser', 'events'], function (appSettings, browser, eve
         ]);
     }
 
-    function isValidDuration(duration) {
+    export function isValidDuration(duration) {
         if (duration && !isNaN(duration) && duration !== Number.POSITIVE_INFINITY && duration !== Number.NEGATIVE_INFINITY) {
             return true;
         }
@@ -162,7 +165,7 @@ define(['appSettings', 'browser', 'events'], function (appSettings, browser, eve
         }
     }
 
-    function seekOnPlaybackStart(instance, element, ticks, onMediaReady) {
+    export function seekOnPlaybackStart(instance, element, ticks, onMediaReady) {
 
         var seconds = (ticks || 0) / 10000000;
 
@@ -200,7 +203,7 @@ define(['appSettings', 'browser', 'events'], function (appSettings, browser, eve
         }
     }
 
-    function applySrc(elem, src, options) {
+    export function applySrc(elem, src, options) {
 
         if (window.Windows && options.mediaSource && options.mediaSource.IsLocal) {
 
@@ -228,7 +231,7 @@ define(['appSettings', 'browser', 'events'], function (appSettings, browser, eve
         elem.addEventListener('error', onErrorFn);
     }
 
-    function playWithPromise(elem, onErrorFn) {
+    export function playWithPromise(elem, onErrorFn) {
 
         try {
             var promise = elem.play();
@@ -256,7 +259,7 @@ define(['appSettings', 'browser', 'events'], function (appSettings, browser, eve
         }
     }
 
-    function destroyCastPlayer(instance) {
+    export function destroyCastPlayer(instance) {
 
         var player = instance._castPlayer;
         if (player) {
@@ -270,7 +273,7 @@ define(['appSettings', 'browser', 'events'], function (appSettings, browser, eve
         }
     }
 
-    function destroyShakaPlayer(instance) {
+    export function destroyShakaPlayer(instance) {
         var player = instance._shakaPlayer;
         if (player) {
             try {
@@ -283,7 +286,7 @@ define(['appSettings', 'browser', 'events'], function (appSettings, browser, eve
         }
     }
 
-    function destroyHlsPlayer(instance) {
+    export function destroyHlsPlayer(instance) {
         var player = instance._hlsPlayer;
         if (player) {
             try {
@@ -296,7 +299,7 @@ define(['appSettings', 'browser', 'events'], function (appSettings, browser, eve
         }
     }
 
-    function destroyFlvPlayer(instance) {
+    export function destroyFlvPlayer(instance) {
         var player = instance._flvPlayer;
         if (player) {
             try {
@@ -311,7 +314,7 @@ define(['appSettings', 'browser', 'events'], function (appSettings, browser, eve
         }
     }
 
-    function bindEventsToHlsPlayer(instance, hls, elem, onErrorFn, resolve, reject) {
+    export function bindEventsToHlsPlayer(instance, hls, elem, onErrorFn, resolve, reject) {
 
         hls.on(Hls.Events.MANIFEST_PARSED, function () {
             playWithPromise(elem, onErrorFn).then(resolve, function () {
@@ -403,7 +406,7 @@ define(['appSettings', 'browser', 'events'], function (appSettings, browser, eve
         });
     }
 
-    function onEndedInternal(instance, elem, onErrorFn) {
+    export function onEndedInternal(instance, elem, onErrorFn) {
 
         elem.removeEventListener('error', onErrorFn);
 
@@ -427,7 +430,7 @@ define(['appSettings', 'browser', 'events'], function (appSettings, browser, eve
         instance._currentPlayOptions = null;
     }
 
-    function getBufferedRanges(instance, elem) {
+    export function getBufferedRanges(instance, elem) {
 
         var ranges = [];
         var seekable = elem.buffered || [];
@@ -462,23 +465,4 @@ define(['appSettings', 'browser', 'events'], function (appSettings, browser, eve
         return ranges;
     }
 
-    return {
-        getSavedVolume: getSavedVolume,
-        saveVolume: saveVolume,
-        enableHlsJsPlayer: enableHlsJsPlayer,
-        enableHlsShakaPlayer: enableHlsShakaPlayer,
-        handleHlsJsMediaError: handleHlsJsMediaError,
-        isValidDuration: isValidDuration,
-        onErrorInternal: onErrorInternal,
-        seekOnPlaybackStart: seekOnPlaybackStart,
-        applySrc: applySrc,
-        playWithPromise: playWithPromise,
-        destroyHlsPlayer: destroyHlsPlayer,
-        destroyFlvPlayer: destroyFlvPlayer,
-        destroyCastPlayer: destroyCastPlayer,
-        bindEventsToHlsPlayer: bindEventsToHlsPlayer,
-        onEndedInternal: onEndedInternal,
-        getCrossOriginValue: getCrossOriginValue,
-        getBufferedRanges: getBufferedRanges
-    };
-});
+/* eslint-enable indent */
diff --git a/src/components/imageDownloader/imageDownloader.js b/src/components/imageDownloader/imageDownloader.js
index a3965279cf..fbe98c532f 100644
--- a/src/components/imageDownloader/imageDownloader.js
+++ b/src/components/imageDownloader/imageDownloader.js
@@ -339,7 +339,7 @@ define(['dom', 'loading', 'apphost', 'dialogHelper', 'connectionManager', 'image
 
             var dlg = dialogHelper.createDialog(dialogOptions);
 
-            dlg.innerHTML = globalize.translateDocument(template, 'core');
+            dlg.innerHTML = globalize.translateHtml(template, 'core');
 
             if (layoutManager.tv) {
                 scrollHelper.centerFocus.on(dlg, false);
diff --git a/src/components/imageOptionsEditor/imageOptionsEditor.js b/src/components/imageOptionsEditor/imageOptionsEditor.js
index 257921dfa2..6660ecf74c 100644
--- a/src/components/imageOptionsEditor/imageOptionsEditor.js
+++ b/src/components/imageOptionsEditor/imageOptionsEditor.js
@@ -1,5 +1,16 @@
-define(['globalize', 'dom', 'dialogHelper', 'emby-checkbox', 'emby-select', 'emby-input'], function (globalize, dom, dialogHelper) {
-    'use strict';
+/* eslint-disable indent */
+
+/**
+ * Module for image Options Editor.
+ * @module components/imageOptionsEditor/imageOptionsEditor
+ */
+
+import globalize from 'globalize';
+import dom from 'dom';
+import dialogHelper from 'dialogHelper';
+import 'emby-checkbox';
+import 'emby-select';
+import 'emby-input';
 
     function getDefaultImageConfig(itemType, type) {
         return {
@@ -10,7 +21,7 @@ define(['globalize', 'dom', 'dialogHelper', 'emby-checkbox', 'emby-select', 'emb
     }
 
     function findImageOptions(imageOptions, type) {
-        return imageOptions.filter(function (i) {
+        return imageOptions.filter(i => {
             return i.Type == type;
         })[0];
     }
@@ -31,14 +42,14 @@ define(['globalize', 'dom', 'dialogHelper', 'emby-checkbox', 'emby-select', 'emb
     }
 
     function loadValues(context, itemType, options, availableOptions) {
-        var supportedImageTypes = availableOptions.SupportedImageTypes || [];
-        setVisibilityOfBackdrops(context.querySelector('.backdropFields'), -1 != supportedImageTypes.indexOf('Backdrop'));
-        setVisibilityOfBackdrops(context.querySelector('.screenshotFields'), -1 != supportedImageTypes.indexOf('Screenshot'));
-        Array.prototype.forEach.call(context.querySelectorAll('.imageType'), function (i) {
-            var imageType = i.getAttribute('data-imagetype');
-            var container = dom.parentWithTag(i, 'LABEL');
+        const supportedImageTypes = availableOptions.SupportedImageTypes || [];
+        setVisibilityOfBackdrops(context.querySelector('.backdropFields'), supportedImageTypes.includes('Backdrop'));
+        setVisibilityOfBackdrops(context.querySelector('.screenshotFields'), supportedImageTypes.includes('Screenshot'));
+        Array.prototype.forEach.call(context.querySelectorAll('.imageType'), i => {
+            const imageType = i.getAttribute('data-imagetype');
+            const container = dom.parentWithTag(i, 'LABEL');
 
-            if (-1 == supportedImageTypes.indexOf(imageType)) {
+            if (!supportedImageTypes.includes(imageType)) {
                 container.classList.add('hide');
             } else {
                 container.classList.remove('hide');
@@ -50,16 +61,16 @@ define(['globalize', 'dom', 'dialogHelper', 'emby-checkbox', 'emby-select', 'emb
                 i.checked = false;
             }
         });
-        var backdropConfig = getImageConfig(options, availableOptions, 'Backdrop', itemType);
+        const backdropConfig = getImageConfig(options, availableOptions, 'Backdrop', itemType);
         context.querySelector('#txtMaxBackdrops').value = backdropConfig.Limit;
         context.querySelector('#txtMinBackdropDownloadWidth').value = backdropConfig.MinWidth;
-        var screenshotConfig = getImageConfig(options, availableOptions, 'Screenshot', itemType);
+        const screenshotConfig = getImageConfig(options, availableOptions, 'Screenshot', itemType);
         context.querySelector('#txtMaxScreenshots').value = screenshotConfig.Limit;
         context.querySelector('#txtMinScreenshotDownloadWidth').value = screenshotConfig.MinWidth;
     }
 
     function saveValues(context, options) {
-        options.ImageOptions = Array.prototype.map.call(context.querySelectorAll('.imageType:not(.hide)'), function (c) {
+        options.ImageOptions = Array.prototype.map.call(context.querySelectorAll('.imageType:not(.hide)'), c => {
             return {
                 Type: c.getAttribute('data-imagetype'),
                 Limit: c.checked ? 1 : 0,
@@ -78,35 +89,36 @@ define(['globalize', 'dom', 'dialogHelper', 'emby-checkbox', 'emby-select', 'emb
         });
     }
 
-    function editor() {
-        this.show = function (itemType, options, availableOptions) {
-            return new Promise(function (resolve, reject) {
-                var xhr = new XMLHttpRequest();
-                xhr.open('GET', 'components/imageOptionsEditor/imageOptionsEditor.template.html', true);
+    async function showEditor(itemType, options, availableOptions) {
+        const response = await fetch('components/imageOptionsEditor/imageOptionsEditor.template.html');
+        const template = await response.text();
 
-                xhr.onload = function (e) {
-                    var template = this.response;
-                    var dlg = dialogHelper.createDialog({
-                        size: 'small',
-                        removeOnClose: true,
-                        scrollY: false
-                    });
-                    dlg.classList.add('formDialog');
-                    dlg.innerHTML = globalize.translateDocument(template);
-                    dlg.addEventListener('close', function () {
-                        saveValues(dlg, options);
-                    });
-                    loadValues(dlg, itemType, options, availableOptions);
-                    dialogHelper.open(dlg).then(resolve, resolve);
-                    dlg.querySelector('.btnCancel').addEventListener('click', function () {
-                        dialogHelper.close(dlg);
-                    });
-                };
-
-                xhr.send();
-            });
-        };
+        var dlg = dialogHelper.createDialog({
+            size: 'small',
+            removeOnClose: true,
+            scrollY: false
+        });
+        dlg.classList.add('formDialog');
+        dlg.innerHTML = globalize.translateHtml(template);
+        dlg.addEventListener('close', function () {
+            saveValues(dlg, options);
+        });
+        loadValues(dlg, itemType, options, availableOptions);
+        dialogHelper.open(dlg).then(() => {
+            return;
+        }).catch(() => {
+            return;
+        });
+        dlg.querySelector('.btnCancel').addEventListener('click', function () {
+            dialogHelper.close(dlg);
+        });
     }
 
-    return editor;
-});
+export class editor {
+    constructor() {
+        this.show = showEditor;
+    }
+}
+
+/* eslint-enable indent */
+export default editor;
diff --git a/src/components/imageUploader/imageUploader.js b/src/components/imageUploader/imageUploader.js
index e078a9fa30..3cf7aa000d 100644
--- a/src/components/imageUploader/imageUploader.js
+++ b/src/components/imageUploader/imageUploader.js
@@ -1,10 +1,26 @@
-define(['dialogHelper', 'connectionManager', 'dom', 'loading', 'scrollHelper', 'layoutManager', 'globalize', 'require', 'emby-button', 'emby-select', 'formDialogStyle', 'css!./style'], function (dialogHelper, connectionManager, dom, loading, scrollHelper, layoutManager, globalize, require) {
-    'use strict';
+/* eslint-disable indent */
 
-    var currentItemId;
-    var currentServerId;
-    var currentFile;
-    var hasChanges = false;
+/**
+ * Module for imageUploader.
+ * @module components/imageUploader/imageUploader
+ */
+
+import dialogHelper from 'dialogHelper';
+import connectionManager from 'connectionManager';
+import dom from 'dom';
+import loading from 'loading';
+import scrollHelper from 'scrollHelper';
+import layoutManager from 'layoutManager';
+import globalize from 'globalize';
+import 'emby-button';
+import 'emby-select';
+import 'formDialogStyle';
+import 'css!./style';
+
+    let currentItemId;
+    let currentServerId;
+    let currentFile;
+    let hasChanges = false;
 
     function onFileReaderError(evt) {
 
@@ -12,14 +28,14 @@ define(['dialogHelper', 'connectionManager', 'dom', 'loading', 'scrollHelper', '
 
         switch (evt.target.error.code) {
             case evt.target.error.NOT_FOUND_ERR:
-                require(['toast'], function (toast) {
+                import('toast').then(({default: toast}) => {
                     toast(globalize.translate('MessageFileReadError'));
                 });
                 break;
             case evt.target.error.ABORT_ERR:
                 break; // noop
             default:
-                require(['toast'], function (toast) {
+                import('toast').then(({default: toast}) => {
                     toast(globalize.translate('MessageFileReadError'));
                 });
                 break;
@@ -28,7 +44,7 @@ define(['dialogHelper', 'connectionManager', 'dom', 'loading', 'scrollHelper', '
 
     function setFiles(page, files) {
 
-        var file = files[0];
+        const file = files[0];
 
         if (!file || !file.type.match('image.*')) {
             page.querySelector('#imageOutput').innerHTML = '';
@@ -39,25 +55,26 @@ define(['dialogHelper', 'connectionManager', 'dom', 'loading', 'scrollHelper', '
 
         currentFile = file;
 
-        var reader = new FileReader();
+        const reader = new FileReader();
 
         reader.onerror = onFileReaderError;
-        reader.onloadstart = function () {
+        reader.onloadstart = () => {
             page.querySelector('#fldUpload').classList.add('hide');
         };
-        reader.onabort = function () {
+        reader.onabort = () => {
             loading.hide();
             console.debug('File read cancelled');
         };
 
         // Closure to capture the file information.
-        reader.onload = (function (theFile) {
-            return function (e) {
+        reader.onload = (theFile => {
+            return e => {
 
                 // Render thumbnail.
-                var html = ['<img style="max-width:100%;max-height:100%;" src="', e.target.result, '" title="', escape(theFile.name), '"/>'].join('');
+                const html = ['<img style="max-width:100%;max-height:100%;" src="', e.target.result, '" title="', escape(theFile.name), '"/>'].join('');
 
                 page.querySelector('#imageOutput').innerHTML = html;
+                page.querySelector('#dropImageText').classList.add('hide');
                 page.querySelector('#fldUpload').classList.remove('hide');
             };
         })(file);
@@ -68,14 +85,14 @@ define(['dialogHelper', 'connectionManager', 'dom', 'loading', 'scrollHelper', '
 
     function onSubmit(e) {
 
-        var file = currentFile;
+        const file = currentFile;
 
         if (!file) {
             return false;
         }
 
         if (!file.type.startsWith('image/')) {
-            require(['toast'], function (toast) {
+            import('toast').then(({default: toast}) => {
                 toast(globalize.translate('MessageImageFileTypeAllowed'));
             });
             e.preventDefault();
@@ -84,18 +101,18 @@ define(['dialogHelper', 'connectionManager', 'dom', 'loading', 'scrollHelper', '
 
         loading.show();
 
-        var dlg = dom.parentWithClass(this, 'dialog');
+        const dlg = dom.parentWithClass(this, 'dialog');
 
-        var imageType = dlg.querySelector('#selectImageType').value;
+        const imageType = dlg.querySelector('#selectImageType').value;
         if (imageType === 'None') {
-            require(['toast'], function(toast) {
+            import('toast').then(({default: toast}) => {
                 toast(globalize.translate('MessageImageTypeNotSelected'));
             });
             e.preventDefault();
             return false;
         }
 
-        connectionManager.getApiClient(currentServerId).uploadItemImage(currentItemId, imageType, file).then(function () {
+        connectionManager.getApiClient(currentServerId).uploadItemImage(currentItemId, imageType, file).then(() => {
 
             dlg.querySelector('#uploadImage').value = '';
 
@@ -116,21 +133,21 @@ define(['dialogHelper', 'connectionManager', 'dom', 'loading', 'scrollHelper', '
             setFiles(page, this.files);
         });
 
-        page.querySelector('.btnBrowse').addEventListener('click', function () {
+        page.querySelector('.btnBrowse').addEventListener('click', () => {
             page.querySelector('#uploadImage').click();
         });
     }
 
-    function showEditor(options, resolve, reject) {
+    function showEditor(options, resolve) {
 
         options = options || {};
 
-        require(['text!./imageUploader.template.html'], function (template) {
+        return import('text!./imageUploader.template.html').then(({default: template}) => {
 
             currentItemId = options.itemId;
             currentServerId = options.serverId;
 
-            var dialogOptions = {
+            const dialogOptions = {
                 removeOnClose: true
             };
 
@@ -140,18 +157,18 @@ define(['dialogHelper', 'connectionManager', 'dom', 'loading', 'scrollHelper', '
                 dialogOptions.size = 'small';
             }
 
-            var dlg = dialogHelper.createDialog(dialogOptions);
+            const dlg = dialogHelper.createDialog(dialogOptions);
 
             dlg.classList.add('formDialog');
 
-            dlg.innerHTML = globalize.translateDocument(template, 'core');
+            dlg.innerHTML = globalize.translateHtml(template, 'core');
 
             if (layoutManager.tv) {
                 scrollHelper.centerFocus.on(dlg, false);
             }
 
             // Has to be assigned a z-index after the call to .open()
-            dlg.addEventListener('close', function () {
+            dlg.addEventListener('close', () => {
 
                 if (layoutManager.tv) {
                     scrollHelper.centerFocus.off(dlg, false);
@@ -167,22 +184,24 @@ define(['dialogHelper', 'connectionManager', 'dom', 'loading', 'scrollHelper', '
 
             dlg.querySelector('#selectImageType').value = options.imageType || 'Primary';
 
-            dlg.querySelector('.btnCancel').addEventListener('click', function () {
+            dlg.querySelector('.btnCancel').addEventListener('click', () => {
 
                 dialogHelper.close(dlg);
             });
         });
     }
 
-    return {
-        show: function (options) {
+    export function show(options) {
 
-            return new Promise(function (resolve, reject) {
+        return new Promise(resolve => {
 
-                hasChanges = false;
+            hasChanges = false;
 
-                showEditor(options, resolve, reject);
-            });
-        }
-    };
-});
+            showEditor(options, resolve);
+        });
+    }
+
+/* eslint-enable indent */
+export default {
+    show: show
+};
diff --git a/src/components/imageUploader/imageUploader.template.html b/src/components/imageUploader/imageUploader.template.html
index 9c6a139c04..6a9e21ff15 100644
--- a/src/components/imageUploader/imageUploader.template.html
+++ b/src/components/imageUploader/imageUploader.template.html
@@ -20,7 +20,7 @@
             </div>
             <div>
                 <div class="imageEditor-dropZone fieldDescription">
-                    <div>${LabelDropImageHere}</div>
+                    <div id="dropImageText">${LabelDropImageHere}</div>
                     <output id="imageOutput" class="flex align-items-center justify-content-center" style="position: absolute;top:0;left:0;right:0;bottom:0;width:100%;"></output>
                     <input type="file" accept="image/*" id="uploadImage" name="uploadImage" style="position: absolute;top:0;left:0;right:0;bottom:0;width:100%;opacity:0;" />
                 </div>
diff --git a/src/components/imageeditor/imageeditor.js b/src/components/imageeditor/imageeditor.js
index 2927a0b120..0a873fa4c7 100644
--- a/src/components/imageeditor/imageeditor.js
+++ b/src/components/imageeditor/imageeditor.js
@@ -200,7 +200,7 @@ define(['dialogHelper', 'connectionManager', 'loading', 'dom', 'layoutManager',
 
         require(['confirm'], function (confirm) {
 
-            confirm({
+            confirm.default({
 
                 text: globalize.translate('ConfirmDeleteImage'),
                 confirmText: globalize.translate('Delete'),
@@ -464,7 +464,7 @@ define(['dialogHelper', 'connectionManager', 'loading', 'dom', 'layoutManager',
 
                 dlg.classList.add('formDialog');
 
-                dlg.innerHTML = globalize.translateDocument(template, 'core');
+                dlg.innerHTML = globalize.translateHtml(template, 'core');
 
                 if (layoutManager.tv) {
                     scrollHelper.centerFocus.on(dlg, false);
diff --git a/src/components/images/imageLoader.js b/src/components/images/imageLoader.js
index f23b407def..069d32fb8b 100644
--- a/src/components/images/imageLoader.js
+++ b/src/components/images/imageLoader.js
@@ -1,5 +1,6 @@
 import * as lazyLoader from 'lazyLoader';
 import * as userSettings from 'userSettings';
+import * as blurhash from 'blurhash';
 import 'css!./style';
 /* eslint-disable indent */
 
@@ -11,47 +12,93 @@ import 'css!./style';
         fillImageElement(elem, source);
     }
 
+    function itemBlurhashing(target, blurhashstr) {
+        if (blurhash.isBlurhashValid(blurhashstr)) {
+            // Although the default values recommended by Blurhash developers is 32x32, a size of 18x18 seems to be the sweet spot for us,
+            // improving the performance and reducing the memory usage, while retaining almost full blur quality.
+            // Lower values had more visible pixelation
+            let width = 18;
+            let height = 18;
+            let pixels;
+            try {
+                pixels = blurhash.decode(blurhashstr, width, height);
+            } catch (err) {
+                console.error('Blurhash decode error: ', err);
+                target.classList.add('non-blurhashable');
+                return;
+            }
+            let canvas = document.createElement('canvas');
+            canvas.width = width;
+            canvas.height = height;
+            let ctx = canvas.getContext('2d');
+            let imgData = ctx.createImageData(width, height);
+
+            imgData.data.set(pixels);
+            ctx.putImageData(imgData, 0, 0);
+
+            requestAnimationFrame(() => {
+                canvas.classList.add('blurhash-canvas');
+                if (userSettings.enableFastFadein()) {
+                    canvas.classList.add('lazy-blurhash-fadein-fast');
+                } else {
+                    canvas.classList.add('lazy-blurhash-fadein');
+                }
+
+                target.parentNode.insertBefore(canvas, target);
+                target.classList.add('blurhashed');
+                target.removeAttribute('data-blurhash');
+            });
+        }
+    }
+
     export function fillImage(entry) {
         if (!entry) {
             throw new Error('entry cannot be null');
         }
-
+        let target = entry.target;
         var source = undefined;
-        if (entry.target) {
-            source = entry.target.getAttribute('data-src');
+
+        if (target) {
+            source = target.getAttribute('data-src');
         } else {
             source = entry;
         }
 
         if (entry.intersectionRatio > 0) {
-            if (source) fillImageElement(entry.target, source);
+            if (source) fillImageElement(target, source);
         } else if (!source) {
-            emptyImageElement(entry.target);
+            requestAnimationFrame(() => {
+                emptyImageElement(target);
+            });
         }
     }
 
     function fillImageElement(elem, url) {
         if (url === undefined) {
-            throw new Error('url cannot be undefined');
+            throw new TypeError('url cannot be undefined');
         }
 
         let preloaderImg = new Image();
         preloaderImg.src = url;
 
+        elem.classList.add('lazy-hidden');
+
         preloaderImg.addEventListener('load', () => {
-            if (elem.tagName !== 'IMG') {
-                elem.style.backgroundImage = "url('" + url + "')";
-            } else {
-                elem.setAttribute('src', url);
-            }
+            requestAnimationFrame(() => {
+                if (elem.tagName !== 'IMG') {
+                    elem.style.backgroundImage = "url('" + url + "')";
+                } else {
+                    elem.setAttribute('src', url);
+                }
+                elem.removeAttribute('data-src');
 
-            if (userSettings.enableFastFadein()) {
-                elem.classList.add('lazy-image-fadein-fast');
-            } else {
-                elem.classList.add('lazy-image-fadein');
-            }
-
-            elem.removeAttribute('data-src');
+                elem.classList.remove('lazy-hidden');
+                if (userSettings.enableFastFadein()) {
+                    elem.classList.add('lazy-image-fadein-fast');
+                } else {
+                    elem.classList.add('lazy-image-fadein');
+                }
+            });
         });
     }
 
@@ -65,14 +112,23 @@ import 'css!./style';
             url = elem.getAttribute('src');
             elem.setAttribute('src', '');
         }
-
         elem.setAttribute('data-src', url);
 
-        elem.classList.remove('lazy-image-fadein-fast');
-        elem.classList.remove('lazy-image-fadein');
+        elem.classList.remove('lazy-image-fadein-fast', 'lazy-image-fadein');
+        elem.classList.add('lazy-hidden');
     }
 
     export function lazyChildren(elem) {
+        if (userSettings.enableBlurhash()) {
+            for (const lazyElem of elem.querySelectorAll('.lazy')) {
+                const blurhashstr = lazyElem.getAttribute('data-blurhash');
+                if (!lazyElem.classList.contains('blurhashed', 'non-blurhashable') && blurhashstr) {
+                    itemBlurhashing(lazyElem, blurhashstr);
+                } else if (!blurhashstr && !lazyElem.classList.contains('blurhashed')) {
+                    lazyElem.classList.add('non-blurhashable');
+                }
+            }
+        }
         lazyLoader.lazyChildren(elem, fillImage);
     }
 
@@ -144,8 +200,15 @@ import 'css!./style';
         }
     }
 
+    export function setLazyImage(element, url) {
+        element.classList.add('lazy');
+        element.setAttribute('data-src', url);
+        lazyImage(element);
+    }
+
 /* eslint-enable indent */
 export default {
+    serLazyImage: setLazyImage,
     fillImages: fillImages,
     fillImage: fillImage,
     lazyImage: lazyImage,
diff --git a/src/components/images/style.css b/src/components/images/style.css
index 2b9422d55b..7e8b01aff2 100644
--- a/src/components/images/style.css
+++ b/src/components/images/style.css
@@ -1,13 +1,42 @@
-.cardImageContainer.lazy {
+.lazy-image-fadein {
+    opacity: 1;
+    transition: opacity 0.5s;
+}
+
+.lazy-image-fadein-fast {
+    opacity: 1;
+    transition: opacity 0.1s;
+}
+
+.lazy-hidden {
     opacity: 0;
 }
 
-.cardImageContainer.lazy.lazy-image-fadein {
-    opacity: 1;
-    transition: opacity 0.7s;
+@keyframes fadein {
+    from {
+        opacity: 0;
+    }
+
+    to {
+        opacity: 1;
+    }
 }
 
-.cardImageContainer.lazy.lazy-image-fadein-fast {
-    opacity: 1;
-    transition: opacity 0.2s;
+.lazy-blurhash-fadein-fast {
+    animation: fadein 0.1s;
+}
+
+.lazy-blurhash-fadein {
+    animation: fadein 0.4s;
+}
+
+.blurhash-canvas {
+    position: absolute;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    pointer-events: none;
 }
diff --git a/src/components/itemContextMenu.js b/src/components/itemContextMenu.js
index f258f5fe4b..7c89f7aeae 100644
--- a/src/components/itemContextMenu.js
+++ b/src/components/itemContextMenu.js
@@ -1,14 +1,24 @@
-define(['apphost', 'globalize', 'connectionManager', 'itemHelper', 'appRouter', 'playbackManager', 'loading', 'appSettings', 'browser', 'actionsheet'], function (appHost, globalize, connectionManager, itemHelper, appRouter, playbackManager, loading, appSettings, browser, actionsheet) {
-    'use strict';
+import appHost from 'apphost';
+import globalize from 'globalize';
+import connectionManager from 'connectionManager';
+import itemHelper from 'itemHelper';
+import appRouter from 'appRouter';
+import playbackManager from 'playbackManager';
+import loading from 'loading';
+import appSettings from 'appSettings';
+import browser from 'browser';
+import actionsheet from 'actionsheet';
 
-    function getCommands(options) {
-        var item = options.item;
-        var user = options.user;
+/* eslint-disable indent */
 
-        var canPlay = playbackManager.canPlay(item);
-        var restrictOptions = (browser.operaTv || browser.web0s) && !user.Policy.IsAdministrator;
+    export function getCommands(options) {
+        const item = options.item;
+        const user = options.user;
 
-        var commands = [];
+        const canPlay = playbackManager.canPlay(item);
+        const restrictOptions = (browser.operaTv || browser.web0s) && !user.Policy.IsAdministrator;
+
+        let commands = [];
 
         if (canPlay && item.MediaType !== 'Photo') {
             if (options.play !== false) {
@@ -28,6 +38,23 @@ define(['apphost', 'globalize', 'connectionManager', 'itemHelper', 'appRouter',
             }
         }
 
+        if (playbackManager.getCurrentPlayer() !== null) {
+            if (options.stopPlayback) {
+                commands.push({
+                    name: globalize.translate('StopPlayback'),
+                    id: 'stopPlayback',
+                    icon: 'stop'
+                });
+            }
+            if (options.clearQueue) {
+                commands.push({
+                    name: globalize.translate('ClearQueue'),
+                    id: 'clearQueue',
+                    icon: 'clear_all'
+                });
+            }
+        }
+
         if (playbackManager.canQueue(item)) {
             if (options.queue !== false) {
                 commands.push({
@@ -44,13 +71,6 @@ define(['apphost', 'globalize', 'connectionManager', 'itemHelper', 'appRouter',
                     icon: 'playlist_add'
                 });
             }
-
-            //if (options.queueAllFromHere) {
-            //    commands.push({
-            //        name: globalize.translate("QueueAllFromHere"),
-            //        id: "queueallfromhere"
-            //    });
-            //}
         }
 
         if (item.IsFolder || item.Type === 'MusicArtist' || item.Type === 'MusicGenre') {
@@ -161,10 +181,10 @@ define(['apphost', 'globalize', 'connectionManager', 'itemHelper', 'appRouter',
             });
         }
 
-        var canEdit = itemHelper.canEdit(user, item);
+        const canEdit = itemHelper.canEdit(user, item);
         if (canEdit) {
             if (options.edit !== false && item.Type !== 'SeriesTimer') {
-                var text = (item.Type === 'Timer' || item.Type === 'SeriesTimer') ? globalize.translate('Edit') : globalize.translate('EditMetadata');
+                const text = (item.Type === 'Timer' || item.Type === 'SeriesTimer') ? globalize.translate('Edit') : globalize.translate('EditMetadata');
                 commands.push({
                     name: text,
                     id: 'edit',
@@ -288,10 +308,11 @@ define(['apphost', 'globalize', 'connectionManager', 'itemHelper', 'appRouter',
                 icon: 'album'
             });
         }
-
-        if (options.openArtist !== false && item.ArtistItems && item.ArtistItems.length) {
+        // Show Album Artist by default, as a song can have multiple artists, which specific one would this option refer to?
+        // Although some albums can have multiple artists, it's not as common as songs.
+        if (options.openArtist !== false && item.AlbumArtists && item.AlbumArtists.length) {
             commands.push({
-                name: globalize.translate('ViewArtist'),
+                name: globalize.translate('ViewAlbumArtist'),
                 id: 'artist',
                 icon: 'person'
             });
@@ -311,31 +332,31 @@ define(['apphost', 'globalize', 'connectionManager', 'itemHelper', 'appRouter',
     }
 
     function executeCommand(item, id, options) {
-        var itemId = item.Id;
-        var serverId = item.ServerId;
-        var apiClient = connectionManager.getApiClient(serverId);
+        const itemId = item.Id;
+        const serverId = item.ServerId;
+        const apiClient = connectionManager.getApiClient(serverId);
 
         return new Promise(function (resolve, reject) {
             switch (id) {
                 case 'addtocollection':
-                    require(['collectionEditor'], function (collectionEditor) {
-                        new collectionEditor().show({
+                    import('collectionEditor').then(({default: collectionEditor}) => {
+                        new collectionEditor({
                             items: [itemId],
                             serverId: serverId
                         }).then(getResolveFunction(resolve, id, true), getResolveFunction(resolve, id));
                     });
                     break;
                 case 'addtoplaylist':
-                    require(['playlistEditor'], function (playlistEditor) {
-                        new playlistEditor().show({
+                    import('playlistEditor').then(({default: playlistEditor}) => {
+                        new playlistEditor({
                             items: [itemId],
                             serverId: serverId
                         }).then(getResolveFunction(resolve, id, true), getResolveFunction(resolve, id));
                     });
                     break;
                 case 'download':
-                    require(['fileDownloader'], function (fileDownloader) {
-                        var downloadHref = apiClient.getItemDownloadUrl(itemId);
+                    import('fileDownloader').then(({default: fileDownloader}) => {
+                        const downloadHref = apiClient.getItemDownloadUrl(itemId);
                         fileDownloader.download([{
                             url: downloadHref,
                             itemId: itemId,
@@ -346,17 +367,17 @@ define(['apphost', 'globalize', 'connectionManager', 'itemHelper', 'appRouter',
                         getResolveFunction(getResolveFunction(resolve, id), id)();
                     });
                     break;
-                case 'copy-stream':
-                    var downloadHref = apiClient.getItemDownloadUrl(itemId);
-                    var textAreaCopy = function () {
-                        var textArea = document.createElement('textarea');
+                case 'copy-stream': {
+                    const downloadHref = apiClient.getItemDownloadUrl(itemId);
+                    const textAreaCopy = function () {
+                        let textArea = document.createElement('textarea');
                         textArea.value = downloadHref;
                         document.body.appendChild(textArea);
                         textArea.focus();
                         textArea.select();
 
                         if (document.execCommand('copy')) {
-                            require(['toast'], function (toast) {
+                            import('toast').then(({default: toast}) => {
                                 toast(globalize.translate('CopyStreamURLSuccess'));
                             });
                         } else {
@@ -371,7 +392,7 @@ define(['apphost', 'globalize', 'connectionManager', 'itemHelper', 'appRouter',
                     } else {
                         /* eslint-disable-next-line compat/compat */
                         navigator.clipboard.writeText(downloadHref).then(function () {
-                            require(['toast'], function (toast) {
+                            import('toast').then(({default: toast}) => {
                                 toast(globalize.translate('CopyStreamURLSuccess'));
                             });
                         }).catch(function () {
@@ -380,8 +401,9 @@ define(['apphost', 'globalize', 'connectionManager', 'itemHelper', 'appRouter',
                     }
                     getResolveFunction(resolve, id)();
                     break;
+                }
                 case 'editsubtitles':
-                    require(['subtitleEditor'], function (subtitleEditor) {
+                    import('subtitleEditor').then(({default: subtitleEditor}) => {
                         subtitleEditor.show(itemId, serverId).then(getResolveFunction(resolve, id, true), getResolveFunction(resolve, id));
                     });
                     break;
@@ -389,7 +411,7 @@ define(['apphost', 'globalize', 'connectionManager', 'itemHelper', 'appRouter',
                     editItem(apiClient, item).then(getResolveFunction(resolve, id, true), getResolveFunction(resolve, id));
                     break;
                 case 'editimages':
-                    require(['imageEditor'], function (imageEditor) {
+                    import('imageEditor').then(({default: imageEditor}) => {
                         imageEditor.show({
                             itemId: itemId,
                             serverId: serverId
@@ -397,13 +419,13 @@ define(['apphost', 'globalize', 'connectionManager', 'itemHelper', 'appRouter',
                     });
                     break;
                 case 'identify':
-                    require(['itemIdentifier'], function (itemIdentifier) {
+                    import('itemIdentifier').then(({default: itemIdentifier}) => {
                         itemIdentifier.show(itemId, serverId).then(getResolveFunction(resolve, id, true), getResolveFunction(resolve, id));
                     });
                     break;
                 case 'moremediainfo':
-                    require(['itemMediaInfo'], function (itemMediaInfo) {
-                        itemMediaInfo.show(itemId, serverId).then(getResolveFunction(resolve, id, true), getResolveFunction(resolve, id));
+                    import('itemMediaInfo').then(({default: itemMediaInfo}) => {
+                        itemMediaInfo.show(itemId, serverId).then(getResolveFunction(resolve, id), getResolveFunction(resolve, id));
                     });
                     break;
                 case 'refresh':
@@ -430,8 +452,14 @@ define(['apphost', 'globalize', 'connectionManager', 'itemHelper', 'appRouter',
                     play(item, false, true, true);
                     getResolveFunction(resolve, id)();
                     break;
+                case 'stopPlayback':
+                    playbackManager.stop();
+                    break;
+                case 'clearQueue':
+                    playbackManager.clearQueue();
+                    break;
                 case 'record':
-                    require(['recordingCreator'], function (recordingCreator) {
+                    import('recordingCreator').then(({default: recordingCreator}) => {
                         recordingCreator.show(itemId, serverId).then(getResolveFunction(resolve, id, true), getResolveFunction(resolve, id));
                     });
                     break;
@@ -458,7 +486,7 @@ define(['apphost', 'globalize', 'connectionManager', 'itemHelper', 'appRouter',
                     getResolveFunction(resolve, id)();
                     break;
                 case 'artist':
-                    appRouter.showItem(item.ArtistItems[0].Id, item.ServerId);
+                    appRouter.showItem(item.AlbumArtists[0].Id, item.ServerId);
                     getResolveFunction(resolve, id)();
                     break;
                 case 'playallfromhere':
@@ -502,8 +530,8 @@ define(['apphost', 'globalize', 'connectionManager', 'itemHelper', 'appRouter',
     }
 
     function deleteTimer(apiClient, item, resolve, command) {
-        require(['recordingHelper'], function (recordingHelper) {
-            var timerId = item.TimerId || item.Id;
+        import('recordingHelper').then(({default: recordingHelper}) => {
+            const timerId = item.TimerId || item.Id;
             recordingHelper.cancelTimerWithConfirmation(timerId, item.ServerId).then(function () {
                 getResolveFunction(resolve, command, true)();
             });
@@ -511,7 +539,7 @@ define(['apphost', 'globalize', 'connectionManager', 'itemHelper', 'appRouter',
     }
 
     function deleteSeriesTimer(apiClient, item, resolve, command) {
-        require(['recordingHelper'], function (recordingHelper) {
+        import('recordingHelper').then(({default: recordingHelper}) => {
             recordingHelper.cancelSeriesTimerWithConfirmation(item.Id, item.ServerId).then(function () {
                 getResolveFunction(resolve, command, true)();
             });
@@ -519,9 +547,9 @@ define(['apphost', 'globalize', 'connectionManager', 'itemHelper', 'appRouter',
     }
 
     function play(item, resume, queue, queueNext) {
-        var method = queue ? (queueNext ? 'queueNext' : 'queue') : 'play';
+        const method = queue ? (queueNext ? 'queueNext' : 'queue') : 'play';
 
-        var startPosition = 0;
+        let startPosition = 0;
         if (resume && item.UserData && item.UserData.PlaybackPositionTicks) {
             startPosition = item.UserData.PlaybackPositionTicks;
         }
@@ -542,18 +570,18 @@ define(['apphost', 'globalize', 'connectionManager', 'itemHelper', 'appRouter',
 
     function editItem(apiClient, item) {
         return new Promise(function (resolve, reject) {
-            var serverId = apiClient.serverInfo().Id;
+            const serverId = apiClient.serverInfo().Id;
 
             if (item.Type === 'Timer') {
-                require(['recordingEditor'], function (recordingEditor) {
+                import('recordingEditor').then(({default: recordingEditor}) => {
                     recordingEditor.show(item.Id, serverId).then(resolve, reject);
                 });
             } else if (item.Type === 'SeriesTimer') {
-                require(['seriesRecordingEditor'], function (recordingEditor) {
+                import('seriesRecordingEditor').then(({default: recordingEditor}) => {
                     recordingEditor.show(item.Id, serverId).then(resolve, reject);
                 });
             } else {
-                require(['metadataEditor'], function (metadataEditor) {
+                import('metadataEditor').then(({default: metadataEditor}) => {
                     metadataEditor.show(item.Id, serverId).then(resolve, reject);
                 });
             }
@@ -562,7 +590,7 @@ define(['apphost', 'globalize', 'connectionManager', 'itemHelper', 'appRouter',
 
     function deleteItem(apiClient, item) {
         return new Promise(function (resolve, reject) {
-            require(['deleteHelper'], function (deleteHelper) {
+            import('deleteHelper').then(({default: deleteHelper}) => {
                 deleteHelper.deleteItem({
                     item: item,
                     navigate: false
@@ -574,7 +602,7 @@ define(['apphost', 'globalize', 'connectionManager', 'itemHelper', 'appRouter',
     }
 
     function refresh(apiClient, item) {
-        require(['refreshDialog'], function (refreshDialog) {
+        import('refreshDialog').then(({default: refreshDialog}) => {
             new refreshDialog({
                 itemIds: [item.Id],
                 serverId: apiClient.serverInfo().Id,
@@ -583,8 +611,8 @@ define(['apphost', 'globalize', 'connectionManager', 'itemHelper', 'appRouter',
         });
     }
 
-    function show(options) {
-        var commands = getCommands(options);
+    export function show(options) {
+        const commands = getCommands(options);
         if (!commands.length) {
             return Promise.reject();
         }
@@ -598,8 +626,9 @@ define(['apphost', 'globalize', 'connectionManager', 'itemHelper', 'appRouter',
         });
     }
 
-    return {
-        getCommands: getCommands,
-        show: show
-    };
-});
+/* eslint-enable indent */
+
+export default {
+    getCommands: getCommands,
+    show: show
+};
diff --git a/src/components/itemHelper.js b/src/components/itemHelper.js
index b18f37110c..3508866bdb 100644
--- a/src/components/itemHelper.js
+++ b/src/components/itemHelper.js
@@ -1,14 +1,12 @@
 define(['apphost', 'globalize'], function (appHost, globalize) {
     'use strict';
 
-    function getDisplayName(item, options) {
+    function getDisplayName(item, options = {}) {
 
         if (!item) {
             throw new Error('null item passed into getDisplayName');
         }
 
-        options = options || {};
-
         if (item.Type === 'Timer') {
             item = item.ProgramInfo || item;
         }
diff --git a/src/components/itemMediaInfo/itemMediaInfo.js b/src/components/itemMediaInfo/itemMediaInfo.js
index 81c84b6a23..c3fd9e0d0a 100644
--- a/src/components/itemMediaInfo/itemMediaInfo.js
+++ b/src/components/itemMediaInfo/itemMediaInfo.js
@@ -1,44 +1,61 @@
-define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings', 'connectionManager', 'loading', 'focusManager', 'dom', 'apphost', 'emby-select', 'listViewStyle', 'paper-icon-button-light', 'css!./../formdialog', 'material-icons', 'emby-button', 'flexStyles'], function (dialogHelper, require, layoutManager, globalize, userSettings, connectionManager, loading, focusManager, dom, appHost) {
-    'use strict';
+/* eslint-disable indent */
+
+/**
+ * Module for display media info.
+ * @module components/itemMediaInfo/itemMediaInfo
+ */
+
+import dialogHelper from 'dialogHelper';
+import layoutManager from 'layoutManager';
+import globalize from 'globalize';
+import connectionManager from 'connectionManager';
+import loading from 'loading';
+import 'emby-select';
+import 'listViewStyle';
+import 'paper-icon-button-light';
+import 'css!./../formdialog';
+import 'material-icons';
+import 'emby-button';
+import 'flexStyles';
 
     function setMediaInfo(user, page, item) {
-        var html = item.MediaSources.map(function (version) {
+        let html = item.MediaSources.map(version => {
             return getMediaSourceHtml(user, item, version);
         }).join('<div style="border-top:1px solid #444;margin: 1em 0;"></div>');
         if (item.MediaSources.length > 1) {
-            html = '<br/>' + html;
+            html = `<br/>${html}`;
         }
-        var mediaInfoContent = page.querySelector('#mediaInfoContent');
+        const mediaInfoContent = page.querySelector('#mediaInfoContent');
         mediaInfoContent.innerHTML = html;
     }
 
     function getMediaSourceHtml(user, item, version) {
-        var html = '';
+        let html = '';
         if (version.Name) {
-            html += '<div><h2 class="mediaInfoStreamType">' + version.Name + '</h2></div>';
+            html += `<div><h2 class="mediaInfoStreamType">${version.Name}</h2></div>`;
         }
         if (version.Container) {
-            html += createAttribute(globalize.translate('MediaInfoContainer'), version.Container) + '<br/>';
+            html += `${createAttribute(globalize.translate('MediaInfoContainer'), version.Container)}<br/>`;
         }
         if (version.Formats && version.Formats.length) {
-            html += createAttribute(globalize.translate('MediaInfoFormat'), version.Formats.join(',')) + '<br/>';
+            html += `${createAttribute(globalize.translate('MediaInfoFormat'), version.Formats.join(','))}<br/>`;
         }
         if (version.Path && user && user.Policy.IsAdministrator) {
-            html += createAttribute(globalize.translate('MediaInfoPath'), version.Path) + '<br/>';
+            html += `${createAttribute(globalize.translate('MediaInfoPath'), version.Path)}<br/>`;
         }
         if (version.Size) {
-            var size = (version.Size / (1024 * 1024)).toFixed(0) + ' MB';
-            html += createAttribute(globalize.translate('MediaInfoSize'), size) + '<br/>';
+            const size = `${(version.Size / (1024 * 1024)).toFixed(0)} MB`;
+            html += `${createAttribute(globalize.translate('MediaInfoSize'), size)}<br/>`;
         }
-        for (var i = 0, length = version.MediaStreams.length; i < length; i++) {
-            var stream = version.MediaStreams[i];
+        for (let i = 0, length = version.MediaStreams.length; i < length; i++) {
+            const stream = version.MediaStreams[i];
             if (stream.Type === 'Data') {
                 continue;
             }
             html += '<div class="mediaInfoStream">';
-            var displayType = globalize.translate('MediaInfoStreamType' + stream.Type);
-            html += '<h2 class="mediaInfoStreamType">' + displayType + '</h2>';
-            var attributes = [];
+            const displayType = globalize.translate(`MediaInfoStreamType${stream.Type}`);
+            html += `<h2 class="mediaInfoStreamType">${displayType}</h2>`;
+            const attributes = [];
             if (stream.DisplayTitle) {
                 attributes.push(createAttribute('Title', stream.DisplayTitle));
             }
@@ -61,7 +78,7 @@ define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings',
                 attributes.push(createAttribute(globalize.translate('MediaInfoLevel'), stream.Level));
             }
             if (stream.Width || stream.Height) {
-                attributes.push(createAttribute(globalize.translate('MediaInfoResolution'), stream.Width + 'x' + stream.Height));
+                attributes.push(createAttribute(globalize.translate('MediaInfoResolution'), `${stream.Width}x${stream.Height}`));
             }
             if (stream.AspectRatio && stream.Codec !== 'mjpeg') {
                 attributes.push(createAttribute(globalize.translate('MediaInfoAspectRatio'), stream.AspectRatio));
@@ -79,16 +96,16 @@ define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings',
                 attributes.push(createAttribute(globalize.translate('MediaInfoLayout'), stream.ChannelLayout));
             }
             if (stream.Channels) {
-                attributes.push(createAttribute(globalize.translate('MediaInfoChannels'), stream.Channels + ' ch'));
+                attributes.push(createAttribute(globalize.translate('MediaInfoChannels'), `${stream.Channels} ch`));
             }
             if (stream.BitRate && stream.Codec !== 'mjpeg') {
-                attributes.push(createAttribute(globalize.translate('MediaInfoBitrate'), (parseInt(stream.BitRate / 1000)) + ' kbps'));
+                attributes.push(createAttribute(globalize.translate('MediaInfoBitrate'), `${parseInt(stream.BitRate / 1000)} kbps`));
             }
             if (stream.SampleRate) {
-                attributes.push(createAttribute(globalize.translate('MediaInfoSampleRate'), stream.SampleRate + ' Hz'));
+                attributes.push(createAttribute(globalize.translate('MediaInfoSampleRate'), `${stream.SampleRate} Hz`));
             }
             if (stream.BitDepth) {
-                attributes.push(createAttribute(globalize.translate('MediaInfoBitDepth'), stream.BitDepth + ' bit'));
+                attributes.push(createAttribute(globalize.translate('MediaInfoBitDepth'), `${stream.BitDepth} bit`));
             }
             if (stream.PixelFormat) {
                 attributes.push(createAttribute(globalize.translate('MediaInfoPixelFormat'), stream.PixelFormat));
@@ -116,13 +133,13 @@ define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings',
     }
 
     function createAttribute(label, value) {
-        return '<span class="mediaInfoLabel">' + label + '</span><span class="mediaInfoAttribute">' + value + '</span>';
+        return `<span class="mediaInfoLabel">${label}</span><span class="mediaInfoAttribute">${value}</span>`;
     }
 
-    function showMediaInfoMore(itemId, serverId, template) {
-        var apiClient = connectionManager.getApiClient(serverId);
-        return apiClient.getItem(apiClient.getCurrentUserId(), itemId).then(function (item) {
-            var dialogOptions = {
+    function loadMediaInfo(itemId, serverId, template) {
+        const apiClient = connectionManager.getApiClient(serverId);
+        return apiClient.getItem(apiClient.getCurrentUserId(), itemId).then(item => {
+            const dialogOptions = {
                 size: 'small',
                 removeOnClose: true,
                 scrollY: false
@@ -130,35 +147,35 @@ define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings',
             if (layoutManager.tv) {
                 dialogOptions.size = 'fullscreen';
             }
-            var dlg = dialogHelper.createDialog(dialogOptions);
+            const dlg = dialogHelper.createDialog(dialogOptions);
             dlg.classList.add('formDialog');
-            var html = '';
-            html += globalize.translateDocument(template, 'core');
+            let html = '';
+            html += globalize.translateHtml(template, 'core');
             dlg.innerHTML = html;
             if (layoutManager.tv) {
                 dlg.querySelector('.formDialogContent');
             }
             dialogHelper.open(dlg);
-            dlg.querySelector('.btnCancel').addEventListener('click', function (e) {
+            dlg.querySelector('.btnCancel').addEventListener('click', () => {
                 dialogHelper.close(dlg);
             });
-            apiClient.getCurrentUser().then(function (user) {
+            apiClient.getCurrentUser().then(user => {
                 setMediaInfo(user, dlg, item);
             });
             loading.hide();
         });
     }
 
-    function showMediaInfo(itemId, serverId) {
+    export function show(itemId, serverId) {
         loading.show();
-        return new Promise(function (resolve, reject) {
-            require(['text!./itemMediaInfo.template.html'], function (template) {
-                showMediaInfoMore(itemId, serverId, template).then(resolve, reject);
+        return import('text!./itemMediaInfo.template.html').then(({default: template}) => {
+            return new Promise((resolve, reject) => {
+                loadMediaInfo(itemId, serverId, template).then(resolve, reject);
             });
         });
     }
 
-    return {
-        show: showMediaInfo
-    };
-});
+/* eslint-enable indent */
+export default {
+    show: show
+};
diff --git a/src/components/itemidentifier/itemidentifier.js b/src/components/itemidentifier/itemidentifier.js
index b335d1dfd3..e9231623ca 100644
--- a/src/components/itemidentifier/itemidentifier.js
+++ b/src/components/itemidentifier/itemidentifier.js
@@ -1,15 +1,34 @@
-define(['dialogHelper', 'loading', 'connectionManager', 'require', 'globalize', 'scrollHelper', 'layoutManager', 'focusManager', 'browser', 'emby-input', 'emby-checkbox', 'paper-icon-button-light', 'css!./../formdialog', 'material-icons', 'cardStyle'], function (dialogHelper, loading, connectionManager, require, globalize, scrollHelper, layoutManager, focusManager, browser) {
-    'use strict';
+/* eslint-disable indent */
 
-    var enableFocusTransform = !browser.slow && !browser.edge;
+/**
+ * Module for itemidentifier media item.
+ * @module components/itemidentifier/itemidentifier
+ */
 
-    var currentItem;
-    var currentItemType;
-    var currentServerId;
-    var currentResolve;
-    var currentReject;
-    var hasChanges = false;
-    var currentSearchResult;
+import dialogHelper from 'dialogHelper';
+import loading from 'loading';
+import connectionManager from 'connectionManager';
+import globalize from 'globalize';
+import scrollHelper from 'scrollHelper';
+import layoutManager from 'layoutManager';
+import focusManager from 'focusManager';
+import browser from 'browser';
+import 'emby-input';
+import 'emby-checkbox';
+import 'paper-icon-button-light';
+import 'css!./../formdialog';
+import 'material-icons';
+import 'cardStyle';
+
+    const enableFocusTransform = !browser.slow && !browser.edge;
+
+    let currentItem;
+    let currentItemType;
+    let currentServerId;
+    let currentResolve;
+    let currentReject;
+    let hasChanges = false;
+    let currentSearchResult;
 
     function getApiClient() {
         return connectionManager.getApiClient(currentServerId);
@@ -17,14 +36,14 @@ define(['dialogHelper', 'loading', 'connectionManager', 'require', 'globalize',
 
     function searchForIdentificationResults(page) {
 
-        var lookupInfo = {
+        let lookupInfo = {
             ProviderIds: {}
         };
 
-        var i;
-        var length;
-        var identifyField = page.querySelectorAll('.identifyField');
-        var value;
+        let i;
+        let length;
+        const identifyField = page.querySelectorAll('.identifyField');
+        let value;
         for (i = 0, length = identifyField.length; i < length; i++) {
 
             value = identifyField[i].value;
@@ -39,9 +58,9 @@ define(['dialogHelper', 'loading', 'connectionManager', 'require', 'globalize',
             }
         }
 
-        var hasId = false;
+        let hasId = false;
 
-        var txtLookupId = page.querySelectorAll('.txtLookupId');
+        const txtLookupId = page.querySelectorAll('.txtLookupId');
         for (i = 0, length = txtLookupId.length; i < length; i++) {
 
             value = txtLookupId[i].value;
@@ -53,7 +72,7 @@ define(['dialogHelper', 'loading', 'connectionManager', 'require', 'globalize',
         }
 
         if (!hasId && !lookupInfo.Name) {
-            require(['toast'], function (toast) {
+            import('toast').then(({default: toast}) => {
                 toast(globalize.translate('PleaseEnterNameOrId'));
             });
             return;
@@ -71,16 +90,16 @@ define(['dialogHelper', 'loading', 'connectionManager', 'require', 'globalize',
 
         loading.show();
 
-        var apiClient = getApiClient();
+        const apiClient = getApiClient();
 
         apiClient.ajax({
             type: 'POST',
-            url: apiClient.getUrl('Items/RemoteSearch/' + currentItemType),
+            url: apiClient.getUrl(`Items/RemoteSearch/${currentItemType}`),
             data: JSON.stringify(lookupInfo),
             contentType: 'application/json',
             dataType: 'json'
 
-        }).then(function (results) {
+        }).then(results => {
 
             loading.hide();
             showIdentificationSearchResults(page, results);
@@ -89,29 +108,29 @@ define(['dialogHelper', 'loading', 'connectionManager', 'require', 'globalize',
 
     function showIdentificationSearchResults(page, results) {
 
-        var identificationSearchResults = page.querySelector('.identificationSearchResults');
+        const identificationSearchResults = page.querySelector('.identificationSearchResults');
 
         page.querySelector('.popupIdentifyForm').classList.add('hide');
         identificationSearchResults.classList.remove('hide');
         page.querySelector('.identifyOptionsForm').classList.add('hide');
         page.querySelector('.dialogContentInner').classList.remove('dialog-content-centered');
 
-        var html = '';
-        var i;
-        var length;
+        let html = '';
+        let i;
+        let length;
         for (i = 0, length = results.length; i < length; i++) {
 
-            var result = results[i];
+            const result = results[i];
             html += getSearchResultHtml(result, i);
         }
 
-        var elem = page.querySelector('.identificationSearchResultList');
+        const elem = page.querySelector('.identificationSearchResultList');
         elem.innerHTML = html;
 
         function onSearchImageClick() {
-            var index = parseInt(this.getAttribute('data-index'));
+            const index = parseInt(this.getAttribute('data-index'));
 
-            var currentResult = results[index];
+            const currentResult = results[index];
 
             if (currentItem != null) {
 
@@ -122,7 +141,7 @@ define(['dialogHelper', 'loading', 'connectionManager', 'require', 'globalize',
             }
         }
 
-        var searchImages = elem.querySelectorAll('.card');
+        const searchImages = elem.querySelectorAll('.card');
         for (i = 0, length = searchImages.length; i < length; i++) {
 
             searchImages[i].addEventListener('click', onSearchImageClick);
@@ -143,7 +162,7 @@ define(['dialogHelper', 'loading', 'connectionManager', 'require', 'globalize',
 
     function showIdentifyOptions(page, identifyResult) {
 
-        var identifyOptionsForm = page.querySelector('.identifyOptionsForm');
+        const identifyOptionsForm = page.querySelector('.identifyOptionsForm');
 
         page.querySelector('.popupIdentifyForm').classList.add('hide');
         page.querySelector('.identificationSearchResults').classList.add('hide');
@@ -153,19 +172,19 @@ define(['dialogHelper', 'loading', 'connectionManager', 'require', 'globalize',
 
         currentSearchResult = identifyResult;
 
-        var lines = [];
+        const lines = [];
         lines.push(identifyResult.Name);
 
         if (identifyResult.ProductionYear) {
             lines.push(identifyResult.ProductionYear);
         }
 
-        var resultHtml = lines.join('<br/>');
+        let resultHtml = lines.join('<br/>');
 
         if (identifyResult.ImageUrl) {
-            var displayUrl = getSearchImageDisplayUrl(identifyResult.ImageUrl, identifyResult.SearchProviderName);
+            const displayUrl = getSearchImageDisplayUrl(identifyResult.ImageUrl, identifyResult.SearchProviderName);
 
-            resultHtml = '<div style="display:flex;align-items:center;"><img src="' + displayUrl + '" style="max-height:240px;" /><div style="margin-left:1em;">' + resultHtml + '</div>';
+            resultHtml = `<div style="display:flex;align-items:center;"><img src="${displayUrl}" style="max-height:240px;" /><div style="margin-left:1em;">${resultHtml}</div>`;
         }
 
         page.querySelector('.selectedSearchResult').innerHTML = resultHtml;
@@ -177,10 +196,10 @@ define(['dialogHelper', 'loading', 'connectionManager', 'require', 'globalize',
 
         // TODO move card creation code to Card component
 
-        var html = '';
-        var cssClass = 'card scalableCard';
-        var cardBoxCssClass = 'cardBox';
-        var padderClass;
+        let html = '';
+        let cssClass = 'card scalableCard';
+        let cardBoxCssClass = 'cardBox';
+        let padderClass;
 
         if (currentItemType === 'Episode') {
             cssClass += ' backdropCard backdropCard-scalable';
@@ -203,30 +222,32 @@ define(['dialogHelper', 'loading', 'connectionManager', 'require', 'globalize',
 
         cardBoxCssClass += ' cardBox-bottompadded';
 
-        html += '<button type="button" class="' + cssClass + '" data-index="' + index + '">';
-        html += '<div class="' + cardBoxCssClass + '">';
+        html += `<button type="button" class="${cssClass}" data-index="${index}">`;
+        html += `<div class="${cardBoxCssClass}">`;
         html += '<div class="cardScalable">';
-        html += '<div class="' + padderClass + '"></div>';
+        html += `<div class="${padderClass}"></div>`;
 
         html += '<div class="cardContent searchImage">';
 
         if (result.ImageUrl) {
-            var displayUrl = getSearchImageDisplayUrl(result.ImageUrl, result.SearchProviderName);
+            const displayUrl = getSearchImageDisplayUrl(result.ImageUrl, result.SearchProviderName);
 
-            html += '<div class="cardImageContainer coveredImage" style="background-image:url(\'' + displayUrl + '\');"></div>';
+            html += `<div class="cardImageContainer coveredImage" style="background-image:url('${displayUrl}');"></div>`;
         } else {
 
-            html += '<div class="cardImageContainer coveredImage defaultCardBackground defaultCardBackground1"><div class="cardText cardCenteredText">' + result.Name + '</div></div>';
+            html += `<div class="cardImageContainer coveredImage defaultCardBackground defaultCardBackground1"><div class="cardText cardCenteredText">${result.Name}</div></div>`;
         }
         html += '</div>';
         html += '</div>';
 
-        var numLines = 2;
+        let numLines = 3;
         if (currentItemType === 'MusicAlbum') {
             numLines++;
         }
 
-        var lines = [result.Name];
+        const lines = [result.Name];
+
+        lines.push(result.SearchProviderName);
 
         if (result.AlbumArtist) {
             lines.push(result.AlbumArtist.Name);
@@ -235,7 +256,7 @@ define(['dialogHelper', 'loading', 'connectionManager', 'require', 'globalize',
             lines.push(result.ProductionYear);
         }
 
-        for (var i = 0; i < numLines; i++) {
+        for (let i = 0; i < numLines; i++) {
 
             if (i === 0) {
                 html += '<div class="cardText cardText-first cardTextCentered">';
@@ -252,7 +273,7 @@ define(['dialogHelper', 'loading', 'connectionManager', 'require', 'globalize',
     }
 
     function getSearchImageDisplayUrl(url, provider) {
-        var apiClient = getApiClient();
+        const apiClient = getApiClient();
 
         return apiClient.getUrl('Items/RemoteSearch/Image', { imageUrl: url, ProviderName: provider });
     }
@@ -261,26 +282,26 @@ define(['dialogHelper', 'loading', 'connectionManager', 'require', 'globalize',
 
         loading.show();
 
-        var options = {
+        const options = {
             ReplaceAllImages: page.querySelector('#chkIdentifyReplaceImages').checked
         };
 
-        var apiClient = getApiClient();
+        const apiClient = getApiClient();
 
         apiClient.ajax({
             type: 'POST',
-            url: apiClient.getUrl('Items/RemoteSearch/Apply/' + currentItem.Id, options),
+            url: apiClient.getUrl(`Items/RemoteSearch/Apply/${currentItem.Id}`, options),
             data: JSON.stringify(currentSearchResult),
             contentType: 'application/json'
 
-        }).then(function () {
+        }).then(() => {
 
             hasChanges = true;
             loading.hide();
 
             dialogHelper.close(page);
 
-        }, function () {
+        }, () => {
 
             loading.hide();
 
@@ -290,28 +311,28 @@ define(['dialogHelper', 'loading', 'connectionManager', 'require', 'globalize',
 
     function showIdentificationForm(page, item) {
 
-        var apiClient = getApiClient();
+        const apiClient = getApiClient();
 
-        apiClient.getJSON(apiClient.getUrl('Items/' + item.Id + '/ExternalIdInfos')).then(function (idList) {
+        apiClient.getJSON(apiClient.getUrl(`Items/${item.Id}/ExternalIdInfos`)).then(idList => {
 
-            var html = '';
+            let html = '';
 
-            for (var i = 0, length = idList.length; i < length; i++) {
+            for (let i = 0, length = idList.length; i < length; i++) {
 
-                var idInfo = idList[i];
+                const idInfo = idList[i];
 
-                var id = 'txtLookup' + idInfo.Key;
+                const id = `txtLookup${idInfo.Key}`;
 
                 html += '<div class="inputContainer">';
 
-                var fullName = idInfo.Name;
+                let fullName = idInfo.Name;
                 if (idInfo.Type) {
-                    fullName = idInfo.Name + ' ' + globalize.translate(idInfo.Type);
+                    fullName = `${idInfo.Name} ${globalize.translate(idInfo.Type)}`;
                 }
 
-                var idLabel = globalize.translate('LabelDynamicExternalId', fullName);
+                const idLabel = globalize.translate('LabelDynamicExternalId', fullName);
 
-                html += '<input is="emby-input" class="txtLookupId" data-providerkey="' + idInfo.Key + '" id="' + id + '" label="' + idLabel + '"/>';
+                html += `<input is="emby-input" class="txtLookupId" data-providerkey="${idInfo.Key}" id="${id}" label="${idLabel}"/>`;
 
                 html += '</div>';
             }
@@ -338,16 +359,16 @@ define(['dialogHelper', 'loading', 'connectionManager', 'require', 'globalize',
 
         loading.show();
 
-        require(['text!./itemidentifier.template.html'], function (template) {
+        return import('text!./itemidentifier.template.html').then(({default: template}) => {
 
-            var apiClient = getApiClient();
+            const apiClient = getApiClient();
 
-            apiClient.getItem(apiClient.getCurrentUserId(), itemId).then(function (item) {
+            apiClient.getItem(apiClient.getCurrentUserId(), itemId).then(item => {
 
                 currentItem = item;
                 currentItemType = currentItem.Type;
 
-                var dialogOptions = {
+                const dialogOptions = {
                     size: 'small',
                     removeOnClose: true,
                     scrollY: false
@@ -357,13 +378,13 @@ define(['dialogHelper', 'loading', 'connectionManager', 'require', 'globalize',
                     dialogOptions.size = 'fullscreen';
                 }
 
-                var dlg = dialogHelper.createDialog(dialogOptions);
+                const dlg = dialogHelper.createDialog(dialogOptions);
 
                 dlg.classList.add('formDialog');
                 dlg.classList.add('recordingDialog');
 
-                var html = '';
-                html += globalize.translateDocument(template, 'core');
+                let html = '';
+                html += globalize.translateHtml(template, 'core');
 
                 dlg.innerHTML = html;
 
@@ -384,21 +405,21 @@ define(['dialogHelper', 'loading', 'connectionManager', 'require', 'globalize',
 
                 dialogHelper.open(dlg);
 
-                dlg.querySelector('.popupIdentifyForm').addEventListener('submit', function (e) {
+                dlg.querySelector('.popupIdentifyForm').addEventListener('submit', e => {
 
                     e.preventDefault();
                     searchForIdentificationResults(dlg);
                     return false;
                 });
 
-                dlg.querySelector('.identifyOptionsForm').addEventListener('submit', function (e) {
+                dlg.querySelector('.identifyOptionsForm').addEventListener('submit', e => {
 
                     e.preventDefault();
                     submitIdentficationResult(dlg);
                     return false;
                 });
 
-                dlg.querySelector('.btnCancel').addEventListener('click', function (e) {
+                dlg.querySelector('.btnCancel').addEventListener('click', () => {
 
                     dialogHelper.close(dlg);
                 });
@@ -421,14 +442,15 @@ define(['dialogHelper', 'loading', 'connectionManager', 'require', 'globalize',
         }
     }
 
+    // TODO investigate where this was used
     function showEditorFindNew(itemName, itemYear, itemType, resolveFunc) {
 
         currentItem = null;
         currentItemType = itemType;
 
-        require(['text!./itemidentifier.template.html'], function (template) {
+        return import('text!./itemidentifier.template.html').then(({default: template}) => {
 
-            var dialogOptions = {
+            const dialogOptions = {
                 size: 'small',
                 removeOnClose: true,
                 scrollY: false
@@ -438,13 +460,13 @@ define(['dialogHelper', 'loading', 'connectionManager', 'require', 'globalize',
                 dialogOptions.size = 'fullscreen';
             }
 
-            var dlg = dialogHelper.createDialog(dialogOptions);
+            const dlg = dialogHelper.createDialog(dialogOptions);
 
             dlg.classList.add('formDialog');
             dlg.classList.add('recordingDialog');
 
-            var html = '';
-            html += globalize.translateDocument(template, 'core');
+            let html = '';
+            html += globalize.translateHtml(template, 'core');
 
             dlg.innerHTML = html;
 
@@ -454,22 +476,22 @@ define(['dialogHelper', 'loading', 'connectionManager', 'require', 'globalize',
 
             dialogHelper.open(dlg);
 
-            dlg.querySelector('.btnCancel').addEventListener('click', function (e) {
+            dlg.querySelector('.btnCancel').addEventListener('click', () => {
 
                 dialogHelper.close(dlg);
             });
 
-            dlg.querySelector('.popupIdentifyForm').addEventListener('submit', function (e) {
+            dlg.querySelector('.popupIdentifyForm').addEventListener('submit', e => {
 
                 e.preventDefault();
                 searchForIdentificationResults(dlg);
                 return false;
             });
 
-            dlg.addEventListener('close', function () {
+            dlg.addEventListener('close', () => {
 
                 loading.hide();
-                var foundItem = hasChanges ? currentSearchResult : null;
+                const foundItem = hasChanges ? currentSearchResult : null;
 
                 resolveFunc(foundItem);
             });
@@ -498,29 +520,32 @@ define(['dialogHelper', 'loading', 'connectionManager', 'require', 'globalize',
         dlg.querySelector('.formDialogHeaderTitle').innerHTML = globalize.translate('Search');
     }
 
-    return {
-        show: function (itemId, serverId) {
+    export function show(itemId, serverId) {
 
-            return new Promise(function (resolve, reject) {
+        return new Promise((resolve, reject) => {
 
-                currentResolve = resolve;
-                currentReject = reject;
-                currentServerId = serverId;
-                hasChanges = false;
+            currentResolve = resolve;
+            currentReject = reject;
+            currentServerId = serverId;
+            hasChanges = false;
 
-                showEditor(itemId);
-            });
-        },
+            showEditor(itemId);
+        });
+    }
 
-        showFindNew: function (itemName, itemYear, itemType, serverId) {
+    export function showFindNew(itemName, itemYear, itemType, serverId) {
 
-            return new Promise(function (resolve, reject) {
+        return new Promise((resolve) => {
 
-                currentServerId = serverId;
+            currentServerId = serverId;
 
-                hasChanges = false;
-                showEditorFindNew(itemName, itemYear, itemType, resolve);
-            });
-        }
-    };
-});
+            hasChanges = false;
+            showEditorFindNew(itemName, itemYear, itemType, resolve);
+        });
+    }
+
+/* eslint-enable indent */
+export default {
+    show: show,
+    showFindNew: showFindNew
+};
diff --git a/src/components/lazyLoader/lazyLoaderIntersectionObserver.js b/src/components/lazyLoader/lazyLoaderIntersectionObserver.js
index 8cf5b9cd0a..7751fe8bc2 100644
--- a/src/components/lazyLoader/lazyLoaderIntersectionObserver.js
+++ b/src/components/lazyLoader/lazyLoaderIntersectionObserver.js
@@ -11,9 +11,9 @@
                 (entries) => {
                     entries.forEach(entry => {
                         callback(entry);
-                    },
-                    {rootMargin: '50%'});
-                });
+                    });
+                },
+                {rootMargin: '25%'});
 
             this.observer = observer;
         }
diff --git a/src/components/libraryoptionseditor/libraryoptionseditor.js b/src/components/libraryoptionseditor/libraryoptionseditor.js
index fec4656406..a6256de24c 100644
--- a/src/components/libraryoptionseditor/libraryoptionseditor.js
+++ b/src/components/libraryoptionseditor/libraryoptionseditor.js
@@ -1,63 +1,73 @@
-define(['globalize', 'dom', 'emby-checkbox', 'emby-select', 'emby-input'], function(globalize, dom) {
-    'use strict';
+/* eslint-disable indent */
+
+/**
+ * Module for library options editor.
+ * @module components/libraryoptionseditor/libraryoptionseditor
+ */
+
+import globalize from 'globalize';
+import dom from 'dom';
+import 'emby-checkbox';
+import 'emby-select';
+import 'emby-input';
 
     function populateLanguages(parent) {
-        return ApiClient.getCultures().then(function(languages) {
+        return ApiClient.getCultures().then(languages => {
             populateLanguagesIntoSelect(parent.querySelector('#selectLanguage'), languages);
             populateLanguagesIntoList(parent.querySelector('.subtitleDownloadLanguages'), languages);
         });
     }
 
     function populateLanguagesIntoSelect(select, languages) {
-        var html = '';
+        let html = '';
         html += "<option value=''></option>";
-        for (var i = 0; i < languages.length; i++) {
-            var culture = languages[i];
-            html += "<option value='" + culture.TwoLetterISOLanguageName + "'>" + culture.DisplayName + '</option>';
+        for (let i = 0; i < languages.length; i++) {
+            const culture = languages[i];
+            html += `<option value='${culture.TwoLetterISOLanguageName}'>${culture.DisplayName}</option>`;
         }
         select.innerHTML = html;
     }
 
     function populateLanguagesIntoList(element, languages) {
-        var html = '';
-        for (var i = 0; i < languages.length; i++) {
-            var culture = languages[i];
-            html += '<label><input type="checkbox" is="emby-checkbox" class="chkSubtitleLanguage" data-lang="' + culture.ThreeLetterISOLanguageName.toLowerCase() + '" /><span>' + culture.DisplayName + '</span></label>';
+        let html = '';
+        for (let i = 0; i < languages.length; i++) {
+            const culture = languages[i];
+            html += `<label><input type="checkbox" is="emby-checkbox" class="chkSubtitleLanguage" data-lang="${culture.ThreeLetterISOLanguageName.toLowerCase()}" /><span>${culture.DisplayName}</span></label>`;
         }
         element.innerHTML = html;
     }
 
     function populateCountries(select) {
-        return ApiClient.getCountries().then(function(allCountries) {
-            var html = '';
+        return ApiClient.getCountries().then(allCountries => {
+            let html = '';
             html += "<option value=''></option>";
-            for (var i = 0; i < allCountries.length; i++) {
-                var culture = allCountries[i];
-                html += "<option value='" + culture.TwoLetterISORegionName + "'>" + culture.DisplayName + '</option>';
+            for (let i = 0; i < allCountries.length; i++) {
+                const culture = allCountries[i];
+                html += `<option value='${culture.TwoLetterISORegionName}'>${culture.DisplayName}</option>`;
             }
             select.innerHTML = html;
         });
     }
 
     function populateRefreshInterval(select) {
-        var html = '';
-        html += "<option value='0'>" + globalize.translate('Never') + '</option>';
-        html += [30, 60, 90].map(function(val) {
-            return "<option value='" + val + "'>" + globalize.translate('EveryNDays', val) + '</option>';
+        let html = '';
+        html += `<option value='0'>${globalize.translate('Never')}</option>`;
+        html += [30, 60, 90].map(val => {
+            return `<option value='${val}'>${globalize.translate('EveryNDays', val)}</option>`;
         }).join('');
         select.innerHTML = html;
     }
 
     function renderMetadataReaders(page, plugins) {
-        var html = '';
-        var elem = page.querySelector('.metadataReaders');
+        let html = '';
+        const elem = page.querySelector('.metadataReaders');
 
         if (plugins.length < 1) return elem.innerHTML = '', elem.classList.add('hide'), !1;
-        html += '<h3 class="checkboxListLabel">' + globalize.translate('LabelMetadataReaders') + '</h3>';
+        html += `<h3 class="checkboxListLabel">${globalize.translate('LabelMetadataReaders')}</h3>`;
         html += '<div class="checkboxList paperList checkboxList-paperList">';
-        for (var i = 0; i < plugins.length; i++) {
-            var plugin = plugins[i];
-            html += '<div class="listItem localReaderOption sortableOption" data-pluginname="' + plugin.Name + '">';
+        for (let i = 0; i < plugins.length; i++) {
+            const plugin = plugins[i];
+            html += `<div class="listItem localReaderOption sortableOption" data-pluginname="${plugin.Name}">`;
             html += '<span class="listItemIcon material-icons live_tv"></span>';
             html += '<div class="listItemBody">';
             html += '<h3 class="listItemBodyText">';
@@ -65,14 +75,14 @@ define(['globalize', 'dom', 'emby-checkbox', 'emby-select', 'emby-input'], funct
             html += '</h3>';
             html += '</div>';
             if (i > 0) {
-                html += '<button type="button" is="paper-icon-button-light" title="' + globalize.translate('ButtonUp') + '" class="btnSortableMoveUp btnSortable" data-pluginindex="' + i + '"><span class="material-icons keyboard_arrow_up"></span></button>';
+                html += `<button type="button" is="paper-icon-button-light" title="${globalize.translate('ButtonUp')}" class="btnSortableMoveUp btnSortable" data-pluginindex="${i}"><span class="material-icons keyboard_arrow_up"></span></button>`;
             } else if (plugins.length > 1) {
-                html += '<button type="button" is="paper-icon-button-light" title="' + globalize.translate('ButtonDown') + '" class="btnSortableMoveDown btnSortable" data-pluginindex="' + i + '"><span class="material-icons keyboard_arrow_down"></span></button>';
+                html += `<button type="button" is="paper-icon-button-light" title="${globalize.translate('ButtonDown')}" class="btnSortableMoveDown btnSortable" data-pluginindex="${i}"><span class="material-icons keyboard_arrow_down"></span></button>`;
             }
             html += '</div>';
         }
         html += '</div>';
-        html += '<div class="fieldDescription">' + globalize.translate('LabelMetadataReadersHelp') + '</div>';
+        html += `<div class="fieldDescription">${globalize.translate('LabelMetadataReadersHelp')}</div>`;
         if (plugins.length < 2) {
             elem.classList.add('hide');
         } else {
@@ -83,25 +93,25 @@ define(['globalize', 'dom', 'emby-checkbox', 'emby-select', 'emby-input'], funct
     }
 
     function renderMetadataSavers(page, metadataSavers) {
-        var html = '';
-        var elem = page.querySelector('.metadataSavers');
+        let html = '';
+        const elem = page.querySelector('.metadataSavers');
         if (!metadataSavers.length) return elem.innerHTML = '', elem.classList.add('hide'), false;
-        html += '<h3 class="checkboxListLabel">' + globalize.translate('LabelMetadataSavers') + '</h3>';
+        html += `<h3 class="checkboxListLabel">${globalize.translate('LabelMetadataSavers')}</h3>`;
         html += '<div class="checkboxList paperList checkboxList-paperList">';
-        for (var i = 0; i < metadataSavers.length; i++) {
-            var plugin = metadataSavers[i];
-            html += '<label><input type="checkbox" data-defaultenabled="' + plugin.DefaultEnabled + '" is="emby-checkbox" class="chkMetadataSaver" data-pluginname="' + plugin.Name + '" ' + false + '><span>' + plugin.Name + '</span></label>';
+        for (let i = 0; i < metadataSavers.length; i++) {
+            const plugin = metadataSavers[i];
+            html += `<label><input type="checkbox" data-defaultenabled="${plugin.DefaultEnabled}" is="emby-checkbox" class="chkMetadataSaver" data-pluginname="${plugin.Name}" ${false}><span>${plugin.Name}</span></label>`;
         }
         html += '</div>';
-        html += '<div class="fieldDescription" style="margin-top:.25em;">' + globalize.translate('LabelMetadataSaversHelp') + '</div>';
+        html += `<div class="fieldDescription" style="margin-top:.25em;">${globalize.translate('LabelMetadataSaversHelp')}</div>`;
         elem.innerHTML = html;
         elem.classList.remove('hide');
         return true;
     }
 
     function getMetadataFetchersForTypeHtml(availableTypeOptions, libraryOptionsForType) {
-        var html = '';
-        var plugins = availableTypeOptions.MetadataFetchers;
+        let html = '';
+        let plugins = availableTypeOptions.MetadataFetchers;
 
         plugins = getOrderedPlugins(plugins, libraryOptionsForType.MetadataFetcherOrder || []);
         if (!plugins.length) return html;
@@ -112,15 +122,20 @@ define(['globalize', 'dom', 'emby-checkbox', 'emby-select', 'emby-input'], funct
 
         plugins.forEach((plugin, index) => {
             html += '<div class="listItem metadataFetcherItem sortableOption" data-pluginname="' + plugin.Name + '">';
-            var isChecked = libraryOptionsForType.MetadataFetchers ? -1 !== libraryOptionsForType.MetadataFetchers.indexOf(plugin.Name) : plugin.DefaultEnabled;
-            var checkedHtml = isChecked ? ' checked="checked"' : '';
+            const isChecked = libraryOptionsForType.MetadataFetchers ? libraryOptionsForType.MetadataFetchers.includes(plugin.Name) : plugin.DefaultEnabled;
+            const checkedHtml = isChecked ? ' checked="checked"' : '';
             html += '<label class="listItemCheckboxContainer"><input type="checkbox" is="emby-checkbox" class="chkMetadataFetcher" data-pluginname="' + plugin.Name + '" ' + checkedHtml + '><span></span></label>';
             html += '<div class="listItemBody">';
             html += '<h3 class="listItemBodyText">';
             html += plugin.Name;
             html += '</h3>';
             html += '</div>';
-            index > 0 ? html += '<button type="button" is="paper-icon-button-light" title="' + globalize.translate('ButtonUp') + '" class="btnSortableMoveUp btnSortable" data-pluginindex="' + index + '"><span class="material-icons keyboard_arrow_up"></span></button>' : plugins.length > 1 && (html += '<button type="button" is="paper-icon-button-light" title="' + globalize.translate('ButtonDown') + '" class="btnSortableMoveDown btnSortable" data-pluginindex="' + index + '"><span class="material-icons keyboard_arrow_down"></span></button>'), html += '</div>';
+            if (index > 0) {
+                html += '<button type="button" is="paper-icon-button-light" title="' + globalize.translate('ButtonUp') + '" class="btnSortableMoveUp btnSortable" data-pluginindex="' + index + '"><span class="material-icons keyboard_arrow_up"></span></button>';
+            } else if (plugins.length > 1) {
+                html += '<button type="button" is="paper-icon-button-light" title="' + globalize.translate('ButtonDown') + '" class="btnSortableMoveDown btnSortable" data-pluginindex="' + index + '"><span class="material-icons keyboard_arrow_down"></span></button>';
+            }
+            html += '</div>';
         });
 
         html += '</div>';
@@ -130,19 +145,19 @@ define(['globalize', 'dom', 'emby-checkbox', 'emby-select', 'emby-input'], funct
     }
 
     function getTypeOptions(allOptions, type) {
-        var allTypeOptions = allOptions.TypeOptions || [];
-        for (var i = 0; i < allTypeOptions.length; i++) {
-            var typeOptions = allTypeOptions[i];
+        const allTypeOptions = allOptions.TypeOptions || [];
+        for (let i = 0; i < allTypeOptions.length; i++) {
+            const typeOptions = allTypeOptions[i];
             if (typeOptions.Type === type) return typeOptions;
         }
         return null;
     }
 
     function renderMetadataFetchers(page, availableOptions, libraryOptions) {
-        var html = '';
-        var elem = page.querySelector('.metadataFetchers');
-        for (var i = 0; i < availableOptions.TypeOptions.length; i++) {
-            var availableTypeOptions = availableOptions.TypeOptions[i];
+        let html = '';
+        const elem = page.querySelector('.metadataFetchers');
+        for (let i = 0; i < availableOptions.TypeOptions.length; i++) {
+            const availableTypeOptions = availableOptions.TypeOptions[i];
             html += getMetadataFetchersForTypeHtml(availableTypeOptions, getTypeOptions(libraryOptions, availableTypeOptions.Type) || {});
         }
         elem.innerHTML = html;
@@ -161,41 +176,41 @@ define(['globalize', 'dom', 'emby-checkbox', 'emby-select', 'emby-input'], funct
     }
 
     function renderSubtitleFetchers(page, availableOptions, libraryOptions) {
-        var html = '';
-        var elem = page.querySelector('.subtitleFetchers');
+        let html = '';
+        const elem = page.querySelector('.subtitleFetchers');
 
-        var plugins = availableOptions.SubtitleFetchers;
+        let plugins = availableOptions.SubtitleFetchers;
         plugins = getOrderedPlugins(plugins, libraryOptions.SubtitleFetcherOrder || []);
         if (!plugins.length) return html;
 
-        html += '<h3 class="checkboxListLabel">' + globalize.translate('LabelSubtitleDownloaders') + '</h3>';
+        html += `<h3 class="checkboxListLabel">${globalize.translate('LabelSubtitleDownloaders')}</h3>`;
         html += '<div class="checkboxList paperList checkboxList-paperList">';
-        for (var i = 0; i < plugins.length; i++) {
-            var plugin = plugins[i];
-            html += '<div class="listItem subtitleFetcherItem sortableOption" data-pluginname="' + plugin.Name + '">';
-            var isChecked = libraryOptions.DisabledSubtitleFetchers ? -1 === libraryOptions.DisabledSubtitleFetchers.indexOf(plugin.Name) : plugin.DefaultEnabled;
-            var checkedHtml = isChecked ? ' checked="checked"' : '';
-            html += '<label class="listItemCheckboxContainer"><input type="checkbox" is="emby-checkbox" class="chkSubtitleFetcher" data-pluginname="' + plugin.Name + '" ' + checkedHtml + '><span></span></label>';
+        for (let i = 0; i < plugins.length; i++) {
+            const plugin = plugins[i];
+            html += `<div class="listItem subtitleFetcherItem sortableOption" data-pluginname="${plugin.Name}">`;
+            const isChecked = libraryOptions.DisabledSubtitleFetchers ? !libraryOptions.DisabledSubtitleFetchers.includes(plugin.Name) : plugin.DefaultEnabled;
+            const checkedHtml = isChecked ? ' checked="checked"' : '';
+            html += `<label class="listItemCheckboxContainer"><input type="checkbox" is="emby-checkbox" class="chkSubtitleFetcher" data-pluginname="${plugin.Name}" ${checkedHtml}><span></span></label>`;
             html += '<div class="listItemBody">';
             html += '<h3 class="listItemBodyText">';
             html += plugin.Name;
             html += '</h3>';
             html += '</div>';
             if (i > 0) {
-                html += '<button type="button" is="paper-icon-button-light" title="' + globalize.translate('ButtonUp') + '" class="btnSortableMoveUp btnSortable" data-pluginindex="' + i + '"><span class="material-icons keyboard_arrow_up"></span></button>';
+                html += `<button type="button" is="paper-icon-button-light" title="${globalize.translate('ButtonUp')}" class="btnSortableMoveUp btnSortable" data-pluginindex="${i}"><span class="material-icons keyboard_arrow_up"></span></button>`;
             } else if (plugins.length > 1) {
-                html += '<button type="button" is="paper-icon-button-light" title="' + globalize.translate('ButtonDown') + '" class="btnSortableMoveDown btnSortable" data-pluginindex="' + i + '"><span class="material-icons keyboard_arrow_down"></span></button>';
+                html += `<button type="button" is="paper-icon-button-light" title="${globalize.translate('ButtonDown')}" class="btnSortableMoveDown btnSortable" data-pluginindex="${i}"><span class="material-icons keyboard_arrow_down"></span></button>`;
             }
             html += '</div>';
         }
         html += '</div>';
-        html += '<div class="fieldDescription">' + globalize.translate('SubtitleDownloadersHelp') + '</div>';
+        html += `<div class="fieldDescription">${globalize.translate('SubtitleDownloadersHelp')}</div>`;
         elem.innerHTML = html;
     }
 
     function getImageFetchersForTypeHtml(availableTypeOptions, libraryOptionsForType) {
-        var html = '';
-        var plugins = availableTypeOptions.ImageFetchers;
+        let html = '';
+        let plugins = availableTypeOptions.ImageFetchers;
 
         plugins = getOrderedPlugins(plugins, libraryOptionsForType.ImageFetcherOrder || []);
         if (!plugins.length) return html;
@@ -203,17 +218,17 @@ define(['globalize', 'dom', 'emby-checkbox', 'emby-select', 'emby-input'], funct
         html += '<div class="imageFetcher" data-type="' + availableTypeOptions.Type + '">';
         html += '<div class="flex align-items-center" style="margin:1.5em 0 .5em;">';
         html += '<h3 class="checkboxListLabel" style="margin:0;">' + globalize.translate('HeaderTypeImageFetchers', availableTypeOptions.Type) + '</h3>';
-        var supportedImageTypes = availableTypeOptions.SupportedImageTypes || [];
+        const supportedImageTypes = availableTypeOptions.SupportedImageTypes || [];
         if (supportedImageTypes.length > 1 || 1 === supportedImageTypes.length && 'Primary' !== supportedImageTypes[0]) {
             html += '<button is="emby-button" class="raised btnImageOptionsForType" type="button" style="margin-left:1.5em;font-size:90%;"><span>' + globalize.translate('HeaderFetcherSettings') + '</span></button>';
         }
         html += '</div>';
         html += '<div class="checkboxList paperList checkboxList-paperList">';
-        for (var i = 0; i < plugins.length; i++) {
-            var plugin = plugins[i];
+        for (let i = 0; i < plugins.length; i++) {
+            const plugin = plugins[i];
             html += '<div class="listItem imageFetcherItem sortableOption" data-pluginname="' + plugin.Name + '">';
-            var isChecked = libraryOptionsForType.ImageFetchers ? -1 !== libraryOptionsForType.ImageFetchers.indexOf(plugin.Name) : plugin.DefaultEnabled;
-            var checkedHtml = isChecked ? ' checked="checked"' : '';
+            const isChecked = libraryOptionsForType.ImageFetchers ? libraryOptionsForType.ImageFetchers.includes(plugin.Name) : plugin.DefaultEnabled;
+            const checkedHtml = isChecked ? ' checked="checked"' : '';
             html += '<label class="listItemCheckboxContainer"><input type="checkbox" is="emby-checkbox" class="chkImageFetcher" data-pluginname="' + plugin.Name + '" ' + checkedHtml + '><span></span></label>';
             html += '<div class="listItemBody">';
             html += '<h3 class="listItemBodyText">';
@@ -234,10 +249,10 @@ define(['globalize', 'dom', 'emby-checkbox', 'emby-select', 'emby-input'], funct
     }
 
     function renderImageFetchers(page, availableOptions, libraryOptions) {
-        var html = '';
-        var elem = page.querySelector('.imageFetchers');
-        for (var i = 0; i < availableOptions.TypeOptions.length; i++) {
-            var availableTypeOptions = availableOptions.TypeOptions[i];
+        let html = '';
+        const elem = page.querySelector('.imageFetchers');
+        for (let i = 0; i < availableOptions.TypeOptions.length; i++) {
+            const availableTypeOptions = availableOptions.TypeOptions[i];
             html += getImageFetchersForTypeHtml(availableTypeOptions, getTypeOptions(libraryOptions, availableTypeOptions.Type) || {});
         }
         elem.innerHTML = html;
@@ -253,12 +268,12 @@ define(['globalize', 'dom', 'emby-checkbox', 'emby-select', 'emby-input'], funct
         return true;
     }
 
-    function populateMetadataSettings(parent, contentType, isNewLibrary) {
-        var isNewLibrary = parent.classList.contains('newlibrary');
+    function populateMetadataSettings(parent, contentType) {
+        const isNewLibrary = parent.classList.contains('newlibrary');
         return ApiClient.getJSON(ApiClient.getUrl('Libraries/AvailableOptions', {
             LibraryContentType: contentType,
             IsNewLibrary: isNewLibrary
-        })).then(function(availableOptions) {
+        })).then(availableOptions => {
             currentAvailableOptions = availableOptions;
             parent.availableOptions = availableOptions;
             renderMetadataSavers(parent, availableOptions.MetadataSavers);
@@ -267,14 +282,14 @@ define(['globalize', 'dom', 'emby-checkbox', 'emby-select', 'emby-input'], funct
             renderSubtitleFetchers(parent, availableOptions, {});
             renderImageFetchers(parent, availableOptions, {});
             availableOptions.SubtitleFetchers.length ? parent.querySelector('.subtitleDownloadSettings').classList.remove('hide') : parent.querySelector('.subtitleDownloadSettings').classList.add('hide');
-        }).catch(function() {
+        }).catch(() => {
             return Promise.resolve();
         });
     }
 
     function adjustSortableListElement(elem) {
-        var btnSortable = elem.querySelector('.btnSortable');
-        var inner = btnSortable.querySelector('.material-icons');
+        const btnSortable = elem.querySelector('.btnSortable');
+        const inner = btnSortable.querySelector('.material-icons');
         if (elem.previousSibling) {
             btnSortable.title = globalize.translate('ButtonUp');
             btnSortable.classList.add('btnSortableMoveUp');
@@ -291,22 +306,22 @@ define(['globalize', 'dom', 'emby-checkbox', 'emby-select', 'emby-input'], funct
     }
 
     function showImageOptionsForType(type) {
-        require(['imageoptionseditor'], function(ImageOptionsEditor) {
-            var typeOptions = getTypeOptions(currentLibraryOptions, type);
+        import('imageoptionseditor').then(({default: ImageOptionsEditor}) => {
+            let typeOptions = getTypeOptions(currentLibraryOptions, type);
             if (!typeOptions) {
                 typeOptions = {
                     Type: type
                 };
                 currentLibraryOptions.TypeOptions.push(typeOptions);
             }
-            var availableOptions = getTypeOptions(currentAvailableOptions || {}, type);
-            var imageOptionsEditor = new ImageOptionsEditor();
+            const availableOptions = getTypeOptions(currentAvailableOptions || {}, type);
+            const imageOptionsEditor = new ImageOptionsEditor();
             imageOptionsEditor.show(type, typeOptions, availableOptions);
         });
     }
 
     function onImageFetchersContainerClick(e) {
-        var btnImageOptionsForType = dom.parentWithClass(e.target, 'btnImageOptionsForType');
+        const btnImageOptionsForType = dom.parentWithClass(e.target, 'btnImageOptionsForType');
         if (btnImageOptionsForType) {
             return void showImageOptionsForType(dom.parentWithClass(btnImageOptionsForType, 'imageFetcher').getAttribute('data-type'));
         }
@@ -314,18 +329,18 @@ define(['globalize', 'dom', 'emby-checkbox', 'emby-select', 'emby-input'], funct
     }
 
     function onSortableContainerClick(e) {
-        var btnSortable = dom.parentWithClass(e.target, 'btnSortable');
+        const btnSortable = dom.parentWithClass(e.target, 'btnSortable');
         if (btnSortable) {
-            var li = dom.parentWithClass(btnSortable, 'sortableOption');
-            var list = dom.parentWithClass(li, 'paperList');
+            const li = dom.parentWithClass(btnSortable, 'sortableOption');
+            const list = dom.parentWithClass(li, 'paperList');
             if (btnSortable.classList.contains('btnSortableMoveDown')) {
-                var next = li.nextSibling;
+                const next = li.nextSibling;
                 if (next) {
                     li.parentNode.removeChild(li);
                     next.parentNode.insertBefore(li, next.nextSibling);
                 }
             } else {
-                var prev = li.previousSibling;
+                const prev = li.previousSibling;
                 if (prev) {
                     li.parentNode.removeChild(li);
                     prev.parentNode.insertBefore(li, prev);
@@ -342,41 +357,35 @@ define(['globalize', 'dom', 'emby-checkbox', 'emby-select', 'emby-input'], funct
         parent.querySelector('.imageFetchers').addEventListener('click', onImageFetchersContainerClick);
     }
 
-    function embed(parent, contentType, libraryOptions) {
+    export async function embed(parent, contentType, libraryOptions) {
         currentLibraryOptions = {
             TypeOptions: []
         };
         currentAvailableOptions = null;
-        var isNewLibrary = null === libraryOptions;
+        const isNewLibrary = null === libraryOptions;
         isNewLibrary && parent.classList.add('newlibrary');
-        return new Promise(function(resolve, reject) {
-            var xhr = new XMLHttpRequest;
-            xhr.open('GET', 'components/libraryoptionseditor/libraryoptionseditor.template.html', true);
-            xhr.onload = function(e) {
-                var template = this.response;
-                parent.innerHTML = globalize.translateDocument(template);
-                populateRefreshInterval(parent.querySelector('#selectAutoRefreshInterval'));
-                var promises = [populateLanguages(parent), populateCountries(parent.querySelector('#selectCountry'))];
-                Promise.all(promises).then(function() {
-                    return setContentType(parent, contentType).then(function() {
-                        libraryOptions && setLibraryOptions(parent, libraryOptions);
-                        bindEvents(parent);
-                        resolve();
-                    });
-                });
-            };
-            xhr.send();
+        const response = await fetch('components/libraryoptionseditor/libraryoptionseditor.template.html');
+        const template = await response.text();
+        parent.innerHTML = globalize.translateHtml(template);
+        populateRefreshInterval(parent.querySelector('#selectAutoRefreshInterval'));
+        const promises = [populateLanguages(parent), populateCountries(parent.querySelector('#selectCountry'))];
+        Promise.all(promises).then(function() {
+            return setContentType(parent, contentType).then(function() {
+                libraryOptions && setLibraryOptions(parent, libraryOptions);
+                bindEvents(parent);
+                return;
+            });
         });
     }
 
-    function setAdvancedVisible(parent, visible) {
-        var elems = parent.querySelectorAll('.advanced');
-        for (var i = 0; i < elems.length; i++) {
+    export function setAdvancedVisible(parent, visible) {
+        const elems = parent.querySelectorAll('.advanced');
+        for (let i = 0; i < elems.length; i++) {
             visible ? elems[i].classList.remove('advancedHide') : elems[i].classList.add('advancedHide');
         }
     }
 
-    function setContentType(parent, contentType) {
+    export function setContentType(parent, contentType) {
         if (contentType === 'homevideos' || contentType === 'photos') {
             parent.querySelector('.chkEnablePhotosContainer').classList.remove('hide');
         } else {
@@ -417,47 +426,47 @@ define(['globalize', 'dom', 'emby-checkbox', 'emby-select', 'emby-input'], funct
     }
 
     function setSubtitleFetchersIntoOptions(parent, options) {
-        options.DisabledSubtitleFetchers = Array.prototype.map.call(Array.prototype.filter.call(parent.querySelectorAll('.chkSubtitleFetcher'), function(elem) {
+        options.DisabledSubtitleFetchers = Array.prototype.map.call(Array.prototype.filter.call(parent.querySelectorAll('.chkSubtitleFetcher'), elem => {
             return !elem.checked;
-        }), function(elem) {
+        }), elem => {
             return elem.getAttribute('data-pluginname');
         });
 
-        options.SubtitleFetcherOrder = Array.prototype.map.call(parent.querySelectorAll('.subtitleFetcherItem'), function(elem) {
+        options.SubtitleFetcherOrder = Array.prototype.map.call(parent.querySelectorAll('.subtitleFetcherItem'), elem => {
             return elem.getAttribute('data-pluginname');
         });
     }
 
     function setMetadataFetchersIntoOptions(parent, options) {
-        var sections = parent.querySelectorAll('.metadataFetcher');
-        for (var i = 0; i < sections.length; i++) {
-            var section = sections[i];
-            var type = section.getAttribute('data-type');
-            var typeOptions = getTypeOptions(options, type);
+        const sections = parent.querySelectorAll('.metadataFetcher');
+        for (let i = 0; i < sections.length; i++) {
+            const section = sections[i];
+            const type = section.getAttribute('data-type');
+            let typeOptions = getTypeOptions(options, type);
             if (!typeOptions) {
                 typeOptions = {
                     Type: type
                 };
                 options.TypeOptions.push(typeOptions);
             }
-            typeOptions.MetadataFetchers = Array.prototype.map.call(Array.prototype.filter.call(section.querySelectorAll('.chkMetadataFetcher'), function(elem) {
+            typeOptions.MetadataFetchers = Array.prototype.map.call(Array.prototype.filter.call(section.querySelectorAll('.chkMetadataFetcher'), elem => {
                 return elem.checked;
-            }), function(elem) {
+            }), elem => {
                 return elem.getAttribute('data-pluginname');
             });
 
-            typeOptions.MetadataFetcherOrder = Array.prototype.map.call(section.querySelectorAll('.metadataFetcherItem'), function(elem) {
+            typeOptions.MetadataFetcherOrder = Array.prototype.map.call(section.querySelectorAll('.metadataFetcherItem'), elem => {
                 return elem.getAttribute('data-pluginname');
             });
         }
     }
 
     function setImageFetchersIntoOptions(parent, options) {
-        var sections = parent.querySelectorAll('.imageFetcher');
-        for (var i = 0; i < sections.length; i++) {
-            var section = sections[i];
-            var type = section.getAttribute('data-type');
-            var typeOptions = getTypeOptions(options, type);
+        const sections = parent.querySelectorAll('.imageFetcher');
+        for (let i = 0; i < sections.length; i++) {
+            const section = sections[i];
+            const type = section.getAttribute('data-type');
+            let typeOptions = getTypeOptions(options, type);
             if (!typeOptions) {
                 typeOptions = {
                     Type: type
@@ -465,23 +474,23 @@ define(['globalize', 'dom', 'emby-checkbox', 'emby-select', 'emby-input'], funct
                 options.TypeOptions.push(typeOptions);
             }
 
-            typeOptions.ImageFetchers = Array.prototype.map.call(Array.prototype.filter.call(section.querySelectorAll('.chkImageFetcher'), function(elem) {
+            typeOptions.ImageFetchers = Array.prototype.map.call(Array.prototype.filter.call(section.querySelectorAll('.chkImageFetcher'), elem => {
                 return elem.checked;
-            }), function(elem) {
+            }), elem => {
                 return elem.getAttribute('data-pluginname');
             });
 
-            typeOptions.ImageFetcherOrder = Array.prototype.map.call(section.querySelectorAll('.imageFetcherItem'), function(elem) {
+            typeOptions.ImageFetcherOrder = Array.prototype.map.call(section.querySelectorAll('.imageFetcherItem'), elem => {
                 return elem.getAttribute('data-pluginname');
             });
         }
     }
 
-    function setImageOptionsIntoOptions(parent, options) {
-        var originalTypeOptions = (currentLibraryOptions || {}).TypeOptions || [];
-        for (var i = 0; i < originalTypeOptions.length; i++) {
-            var originalTypeOption = originalTypeOptions[i];
-            var typeOptions = getTypeOptions(options, originalTypeOption.Type);
+    function setImageOptionsIntoOptions(options) {
+        const originalTypeOptions = (currentLibraryOptions || {}).TypeOptions || [];
+        for (let i = 0; i < originalTypeOptions.length; i++) {
+            const originalTypeOption = originalTypeOptions[i];
+            let typeOptions = getTypeOptions(options, originalTypeOption.Type);
 
             if (!typeOptions) {
                 typeOptions = {
@@ -493,8 +502,8 @@ define(['globalize', 'dom', 'emby-checkbox', 'emby-select', 'emby-input'], funct
         }
     }
 
-    function getLibraryOptions(parent) {
-        var options = {
+    export function getLibraryOptions(parent) {
+        const options = {
             EnableArchiveMediaFiles: false,
             EnablePhotos: parent.querySelector('.chkEnablePhotos').checked,
             EnableRealtimeMonitor: parent.querySelector('.chkEnableRealtimeMonitor').checked,
@@ -515,39 +524,39 @@ define(['globalize', 'dom', 'emby-checkbox', 'emby-select', 'emby-input'], funct
             SkipSubtitlesIfAudioTrackMatches: parent.querySelector('#chkSkipIfAudioTrackPresent').checked,
             SaveSubtitlesWithMedia: parent.querySelector('#chkSaveSubtitlesLocally').checked,
             RequirePerfectSubtitleMatch: parent.querySelector('#chkRequirePerfectMatch').checked,
-            MetadataSavers: Array.prototype.map.call(Array.prototype.filter.call(parent.querySelectorAll('.chkMetadataSaver'), function(elem) {
+            MetadataSavers: Array.prototype.map.call(Array.prototype.filter.call(parent.querySelectorAll('.chkMetadataSaver'), elem => {
                 return elem.checked;
-            }), function(elem) {
+            }), elem => {
                 return elem.getAttribute('data-pluginname');
             }),
             TypeOptions: []
         };
 
-        options.LocalMetadataReaderOrder = Array.prototype.map.call(parent.querySelectorAll('.localReaderOption'), function(elem) {
+        options.LocalMetadataReaderOrder = Array.prototype.map.call(parent.querySelectorAll('.localReaderOption'), elem => {
             return elem.getAttribute('data-pluginname');
         });
-        options.SubtitleDownloadLanguages = Array.prototype.map.call(Array.prototype.filter.call(parent.querySelectorAll('.chkSubtitleLanguage'), function(elem) {
+        options.SubtitleDownloadLanguages = Array.prototype.map.call(Array.prototype.filter.call(parent.querySelectorAll('.chkSubtitleLanguage'), elem => {
             return elem.checked;
-        }), function(elem) {
+        }), elem => {
             return elem.getAttribute('data-lang');
         });
         setSubtitleFetchersIntoOptions(parent, options);
         setMetadataFetchersIntoOptions(parent, options);
         setImageFetchersIntoOptions(parent, options);
-        setImageOptionsIntoOptions(parent, options);
+        setImageOptionsIntoOptions(options);
 
         return options;
     }
 
     function getOrderedPlugins(plugins, configuredOrder) {
         plugins = plugins.slice(0);
-        plugins.sort(function(a, b) {
+        plugins.sort((a, b) => {
             return a = configuredOrder.indexOf(a.Name), b = configuredOrder.indexOf(b.Name), a < b ? -1 : a > b ? 1 : 0;
         });
         return plugins;
     }
 
-    function setLibraryOptions(parent, options) {
+    export function setLibraryOptions(parent, options) {
         currentLibraryOptions = options;
         currentAvailableOptions = parent.availableOptions;
         parent.querySelector('#selectLanguage').value = options.PreferredMetadataLanguage || '';
@@ -568,11 +577,11 @@ define(['globalize', 'dom', 'emby-checkbox', 'emby-select', 'emby-input'], funct
         parent.querySelector('#chkSaveSubtitlesLocally').checked = options.SaveSubtitlesWithMedia;
         parent.querySelector('#chkSkipIfAudioTrackPresent').checked = options.SkipSubtitlesIfAudioTrackMatches;
         parent.querySelector('#chkRequirePerfectMatch').checked = options.RequirePerfectSubtitleMatch;
-        Array.prototype.forEach.call(parent.querySelectorAll('.chkMetadataSaver'), function(elem) {
-            elem.checked = options.MetadataSavers ? -1 !== options.MetadataSavers.indexOf(elem.getAttribute('data-pluginname')) : 'true' === elem.getAttribute('data-defaultenabled');
+        Array.prototype.forEach.call(parent.querySelectorAll('.chkMetadataSaver'), elem => {
+            elem.checked = options.MetadataSavers ? options.MetadataSavers.includes(elem.getAttribute('data-pluginname')) : 'true' === elem.getAttribute('data-defaultenabled');
         });
-        Array.prototype.forEach.call(parent.querySelectorAll('.chkSubtitleLanguage'), function(elem) {
-            elem.checked = !!options.SubtitleDownloadLanguages && -1 !== options.SubtitleDownloadLanguages.indexOf(elem.getAttribute('data-lang'));
+        Array.prototype.forEach.call(parent.querySelectorAll('.chkSubtitleLanguage'), elem => {
+            elem.checked = !!options.SubtitleDownloadLanguages && options.SubtitleDownloadLanguages.includes(elem.getAttribute('data-lang'));
         });
         renderMetadataReaders(parent, getOrderedPlugins(parent.availableOptions.MetadataReaders, options.LocalMetadataReaderOrder || []));
         renderMetadataFetchers(parent, parent.availableOptions, options);
@@ -580,14 +589,14 @@ define(['globalize', 'dom', 'emby-checkbox', 'emby-select', 'emby-input'], funct
         renderSubtitleFetchers(parent, parent.availableOptions, options);
     }
 
-    var currentLibraryOptions;
-    var currentAvailableOptions;
+    let currentLibraryOptions;
+    let currentAvailableOptions;
 
-    return {
-        embed: embed,
-        setContentType: setContentType,
-        getLibraryOptions: getLibraryOptions,
-        setLibraryOptions: setLibraryOptions,
-        setAdvancedVisible: setAdvancedVisible
-    };
-});
+/* eslint-enable indent */
+export default {
+    embed: embed,
+    setContentType: setContentType,
+    getLibraryOptions: getLibraryOptions,
+    setLibraryOptions: setLibraryOptions,
+    setAdvancedVisible: setAdvancedVisible
+};
diff --git a/src/components/libraryoptionseditor/libraryoptionseditor.template.html b/src/components/libraryoptionseditor/libraryoptionseditor.template.html
index caa177108d..92cebc9da4 100644
--- a/src/components/libraryoptionseditor/libraryoptionseditor.template.html
+++ b/src/components/libraryoptionseditor/libraryoptionseditor.template.html
@@ -79,7 +79,7 @@
 
 <div class="checkboxContainer checkboxContainer-withDescription chkAutomaticallyGroupSeriesContainer hide advanced">
     <label>
-        <input type="checkbox" is="emby-checkbox" class="chkAutomaticallyGroupSeries" checked />
+        <input type="checkbox" is="emby-checkbox" class="chkAutomaticallyGroupSeries" />
         <span>${OptionAutomaticallyGroupSeries}</span>
     </label>
     <div class="fieldDescription checkboxFieldDescription">${OptionAutomaticallyGroupSeriesHelp}</div>
diff --git a/src/components/listview/listview.js b/src/components/listview/listview.js
index 587355b351..922b6abc20 100644
--- a/src/components/listview/listview.js
+++ b/src/components/listview/listview.js
@@ -1,5 +1,21 @@
-define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutManager', 'globalize', 'datetime', 'apphost', 'css!./listview', 'emby-ratingbutton', 'emby-playstatebutton'], function (itemHelper, mediaInfo, indicators, connectionManager, layoutManager, globalize, datetime, appHost) {
-    'use strict';
+/* eslint-disable indent */
+
+/**
+ * Module for display list view.
+ * @module components/listview/listview
+ */
+
+import itemHelper from 'itemHelper';
+import mediaInfo from 'mediaInfo';
+import indicators from 'indicators';
+import connectionManager from 'connectionManager';
+import layoutManager from 'layoutManager';
+import globalize from 'globalize';
+import datetime from 'datetime';
+import cardBuilder from 'cardBuilder';
+import 'css!./listview';
+import 'emby-ratingbutton';
+import 'emby-playstatebutton';
 
     function getIndex(item, options) {
 
@@ -8,9 +24,9 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
             return item.ParentIndexNumber == null ? '' : globalize.translate('ValueDiscNumber', item.ParentIndexNumber);
         }
 
-        var sortBy = (options.sortBy || '').toLowerCase();
-        var code;
-        var name;
+        const sortBy = (options.sortBy || '').toLowerCase();
+        let code;
+        let name;
 
         if (sortBy.indexOf('sortname') === 0) {
 
@@ -69,72 +85,64 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
 
     function getImageUrl(item, width) {
 
-        var apiClient = connectionManager.getApiClient(item.ServerId);
+        const apiClient = connectionManager.getApiClient(item.ServerId);
+        let itemId;
 
-        var options = {
+        const options = {
             maxWidth: width * 2,
             type: 'Primary'
         };
 
         if (item.ImageTags && item.ImageTags.Primary) {
-
             options.tag = item.ImageTags.Primary;
-            return apiClient.getScaledImageUrl(item.Id, options);
-        }
-
-        if (item.AlbumId && item.AlbumPrimaryImageTag) {
-
+            itemId = item.Id;
+        } else if (item.AlbumId && item.AlbumPrimaryImageTag) {
             options.tag = item.AlbumPrimaryImageTag;
-            return apiClient.getScaledImageUrl(item.AlbumId, options);
+            itemId = item.AlbumId;
         } else if (item.SeriesId && item.SeriesPrimaryImageTag) {
-
             options.tag = item.SeriesPrimaryImageTag;
-            return apiClient.getScaledImageUrl(item.SeriesId, options);
-
+            itemId = item.SeriesId;
         } else if (item.ParentPrimaryImageTag) {
-
             options.tag = item.ParentPrimaryImageTag;
-            return apiClient.getScaledImageUrl(item.ParentPrimaryImageItemId, options);
+            itemId = item.ParentPrimaryImageItemId;
         }
 
+        if (itemId) {
+            return apiClient.getScaledImageUrl(itemId, options);
+        }
         return null;
     }
 
     function getChannelImageUrl(item, width) {
 
-        var apiClient = connectionManager.getApiClient(item.ServerId);
-
-        var options = {
+        const apiClient = connectionManager.getApiClient(item.ServerId);
+        const options = {
             maxWidth: width * 2,
             type: 'Primary'
         };
 
         if (item.ChannelId && item.ChannelPrimaryImageTag) {
-
             options.tag = item.ChannelPrimaryImageTag;
-            return apiClient.getScaledImageUrl(item.ChannelId, options);
         }
 
-        return null;
+        if (item.ChannelId) {
+            return apiClient.getScaledImageUrl(item.ChannelId, options);
+        }
     }
 
     function getTextLinesHtml(textlines, isLargeStyle) {
+        let html = '';
 
-        var html = '';
-
-        var largeTitleTagName = layoutManager.tv ? 'h2' : 'div';
-
-        for (var i = 0, length = textlines.length; i < length; i++) {
-
-            var text = textlines[i];
+        const largeTitleTagName = layoutManager.tv ? 'h2' : 'div';
 
+        for (const [i, text] of textlines.entries()) {
             if (!text) {
                 continue;
             }
 
             if (i === 0) {
                 if (isLargeStyle) {
-                    html += '<' + largeTitleTagName + ' class="listItemBodyText">';
+                    html += `<${largeTitleTagName} class="listItemBodyText">`;
                 } else {
                     html += '<div class="listItemBodyText">';
                 }
@@ -143,7 +151,7 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
             }
             html += (textlines[i] || '&nbsp;');
             if (i === 0 && isLargeStyle) {
-                html += '</' + largeTitleTagName + '>';
+                html += `</${largeTitleTagName}>`;
             } else {
                 html += '</div>';
             }
@@ -154,13 +162,13 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
 
     function getRightButtonsHtml(options) {
 
-        var html = '';
+        let html = '';
 
-        for (var i = 0, length = options.rightButtons.length; i < length; i++) {
+        for (let i = 0, length = options.rightButtons.length; i < length; i++) {
 
-            var button = options.rightButtons[i];
+            const button = options.rightButtons[i];
 
-            html += '<button is="paper-icon-button-light" class="listItemButton itemAction" data-action="custom" data-customaction="' + button.id + '" title="' + button.title + '"><span class="material-icons ' + button.icon + '"></span></button>';
+            html += `<button is="paper-icon-button-light" class="listItemButton itemAction" data-action="custom" data-customaction="${button.id}" title="${button.title}"><span class="material-icons ${button.icon}"></span></button>`;
         }
 
         return html;
@@ -170,34 +178,34 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
         return item.Id;
     }
 
-    function getListViewHtml(options) {
+    export function getListViewHtml(options) {
 
-        var items = options.items;
+        const items = options.items;
 
-        var groupTitle = '';
-        var action = options.action || 'link';
+        let groupTitle = '';
+        const action = options.action || 'link';
 
-        var isLargeStyle = options.imageSize === 'large';
-        var enableOverview = options.enableOverview;
+        const isLargeStyle = options.imageSize === 'large';
+        const enableOverview = options.enableOverview;
 
-        var clickEntireItem = layoutManager.tv ? true : false;
-        var outerTagName = clickEntireItem ? 'button' : 'div';
-        var enableSideMediaInfo = options.enableSideMediaInfo != null ? options.enableSideMediaInfo : true;
+        const clickEntireItem = layoutManager.tv ? true : false;
+        const outerTagName = clickEntireItem ? 'button' : 'div';
+        const enableSideMediaInfo = options.enableSideMediaInfo != null ? options.enableSideMediaInfo : true;
 
-        var outerHtml = '';
+        let outerHtml = '';
 
-        var enableContentWrapper = options.enableOverview && !layoutManager.tv;
-        var containerAlbumArtistIds = (options.containerAlbumArtists || []).map(getId);
+        const enableContentWrapper = options.enableOverview && !layoutManager.tv;
+        const containerAlbumArtistIds = (options.containerAlbumArtists || []).map(getId);
 
-        for (var i = 0, length = items.length; i < length; i++) {
+        for (let i = 0, length = items.length; i < length; i++) {
 
-            var item = items[i];
+            const item = items[i];
 
-            var html = '';
+            let html = '';
 
             if (options.showIndex) {
 
-                var itemGroupTitle = getIndex(item, options);
+                const itemGroupTitle = getIndex(item, options);
 
                 if (itemGroupTitle !== groupTitle) {
 
@@ -219,7 +227,7 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
                 }
             }
 
-            var cssClass = 'listItem';
+            let cssClass = 'listItem';
 
             if (options.border || (options.highlight !== false && !layoutManager.tv)) {
                 cssClass += ' listItem-border';
@@ -233,28 +241,28 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
                 cssClass += ' listItem-focusscale';
             }
 
-            var downloadWidth = 80;
+            let downloadWidth = 80;
 
             if (isLargeStyle) {
                 cssClass += ' listItem-largeImage';
                 downloadWidth = 500;
             }
 
-            var playlistItemId = item.PlaylistItemId ? (' data-playlistitemid="' + item.PlaylistItemId + '"') : '';
+            const playlistItemId = item.PlaylistItemId ? (` data-playlistitemid="${item.PlaylistItemId}"`) : '';
 
-            var positionTicksData = item.UserData && item.UserData.PlaybackPositionTicks ? (' data-positionticks="' + item.UserData.PlaybackPositionTicks + '"') : '';
-            var collectionIdData = options.collectionId ? (' data-collectionid="' + options.collectionId + '"') : '';
-            var playlistIdData = options.playlistId ? (' data-playlistid="' + options.playlistId + '"') : '';
-            var mediaTypeData = item.MediaType ? (' data-mediatype="' + item.MediaType + '"') : '';
-            var collectionTypeData = item.CollectionType ? (' data-collectiontype="' + item.CollectionType + '"') : '';
-            var channelIdData = item.ChannelId ? (' data-channelid="' + item.ChannelId + '"') : '';
+            const positionTicksData = item.UserData && item.UserData.PlaybackPositionTicks ? (` data-positionticks="${item.UserData.PlaybackPositionTicks}"`) : '';
+            const collectionIdData = options.collectionId ? (` data-collectionid="${options.collectionId}"`) : '';
+            const playlistIdData = options.playlistId ? (` data-playlistid="${options.playlistId}"`) : '';
+            const mediaTypeData = item.MediaType ? (` data-mediatype="${item.MediaType}"`) : '';
+            const collectionTypeData = item.CollectionType ? (` data-collectiontype="${item.CollectionType}"`) : '';
+            const channelIdData = item.ChannelId ? (` data-channelid="${item.ChannelId}"`) : '';
 
             if (enableContentWrapper) {
 
                 cssClass += ' listItem-withContentWrapper';
             }
 
-            html += '<' + outerTagName + ' class="' + cssClass + '"' + playlistItemId + ' data-action="' + action + '" data-isfolder="' + item.IsFolder + '" data-id="' + item.Id + '" data-serverid="' + item.ServerId + '" data-type="' + item.Type + '"' + mediaTypeData + collectionTypeData + channelIdData + positionTicksData + collectionIdData + playlistIdData + '>';
+            html += `<${outerTagName} class="${cssClass}"${playlistItemId} data-action="${action}" data-isfolder="${item.IsFolder}" data-id="${item.Id}" data-serverid="${item.ServerId}" data-type="${item.Type}"${mediaTypeData}${collectionTypeData}${channelIdData}${positionTicksData}${collectionIdData}${playlistIdData}>`;
 
             if (enableContentWrapper) {
 
@@ -275,32 +283,32 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
                     imageClass += ' listItemImage-large-tv';
                 }
 
-                var playOnImageClick = options.imagePlayButton && !layoutManager.tv;
+                const playOnImageClick = options.imagePlayButton && !layoutManager.tv;
 
                 if (!clickEntireItem) {
                     imageClass += ' itemAction';
                 }
 
-                var imageAction = playOnImageClick ? 'resume' : action;
+                const imageAction = playOnImageClick ? 'link' : action;
 
                 if (imgUrl) {
                     html += '<div data-action="' + imageAction + '" class="' + imageClass + ' lazy" data-src="' + imgUrl + '" item-icon>';
                 } else {
-                    html += '<div class="' + imageClass + '">';
+                    html += '<div class="' + imageClass + ' cardImageContainer ' + cardBuilder.getDefaultBackgroundClass(item.Name) + '">' + cardBuilder.getDefaultText(item, options);
                 }
 
-                var indicatorsHtml = '';
+                let indicatorsHtml = '';
                 indicatorsHtml += indicators.getPlayedIndicatorHtml(item);
 
                 if (indicatorsHtml) {
-                    html += '<div class="indicators listItemIndicators">' + indicatorsHtml + '</div>';
+                    html += `<div class="indicators listItemIndicators">${indicatorsHtml}</div>`;
                 }
 
                 if (playOnImageClick) {
                     html += '<button is="paper-icon-button-light" class="listItemImageButton itemAction" data-action="resume"><span class="material-icons listItemImageButton-icon play_arrow"></span></button>';
                 }
 
-                var progressHtml = indicators.getProgressBarHtml(item, {
+                const progressHtml = indicators.getProgressBarHtml(item, {
                     containerClass: 'listItemProgressBar'
                 });
 
@@ -317,7 +325,7 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
                 html += '</div>';
             }
 
-            var textlines = [];
+            const textlines = [];
 
             if (options.showProgramDateTime) {
                 textlines.push(datetime.toLocaleString(datetime.parseISO8601Date(item.StartDate), {
@@ -340,7 +348,7 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
                 }
             }
 
-            var parentTitle = null;
+            let parentTitle = null;
 
             if (options.showParentTitle) {
                 if (item.Type === 'Episode') {
@@ -350,12 +358,12 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
                 }
             }
 
-            var displayName = itemHelper.getDisplayName(item, {
+            let displayName = itemHelper.getDisplayName(item, {
                 includeParentInfo: options.includeParentInfoInTitle
             });
 
             if (options.showIndexNumber && item.IndexNumber != null) {
-                displayName = item.IndexNumber + '. ' + displayName;
+                displayName = `${item.IndexNumber}. ${displayName}`;
             }
 
             if (options.showParentTitle && options.parentTitleWithTitle) {
@@ -386,14 +394,14 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
                 }
             } else {
 
-                var showArtist = options.artist === true;
-                var artistItems = item.ArtistItems;
+                let showArtist = options.artist === true;
+                const artistItems = item.ArtistItems;
 
                 if (!showArtist && options.artist !== false) {
 
                     if (!artistItems || !artistItems.length) {
                         showArtist = true;
-                    } else if (artistItems.length > 1 || containerAlbumArtistIds.indexOf(artistItems[0].Id) === -1) {
+                    } else if (artistItems.length > 1 || !containerAlbumArtistIds.includes(artistItems[0].Id)) {
                         showArtist = true;
                     }
                 }
@@ -401,7 +409,7 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
                 if (showArtist) {
 
                     if (artistItems && item.Type !== 'MusicAlbum') {
-                        textlines.push(artistItems.map(function (a) {
+                        textlines.push(artistItems.map(a => {
                             return a.Name;
                         }).join(', '));
                     }
@@ -424,23 +432,23 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
                 cssClass += ' listItemBody-noleftpadding';
             }
 
-            html += '<div class="' + cssClass + '">';
-
-            const moreIcon = 'more_vert';
+            html += `<div class="${cssClass}">`;
 
             html += getTextLinesHtml(textlines, isLargeStyle);
 
             if (options.mediaInfo !== false) {
                 if (!enableSideMediaInfo) {
 
-                    var mediaInfoClass = 'secondary listItemMediaInfo listItemBodyText';
+                    const mediaInfoClass = 'secondary listItemMediaInfo listItemBodyText';
 
-                    html += '<div class="' + mediaInfoClass + '">' + mediaInfo.getPrimaryMediaInfoHtml(item, {
+                    html += `<div class="${mediaInfoClass}">`;
+                    html += mediaInfo.getPrimaryMediaInfoHtml(item, {
                         episodeTitle: false,
                         originalAirDate: false,
                         subtitles: false
 
-                    }) + '</div>';
+                    });
+                    html += '</div>';
                 }
             }
 
@@ -454,7 +462,8 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
 
             if (options.mediaInfo !== false) {
                 if (enableSideMediaInfo) {
-                    html += '<div class="secondary listItemMediaInfo">' + mediaInfo.getPrimaryMediaInfoHtml(item, {
+                    html += '<div class="secondary listItemMediaInfo">';
+                    html += mediaInfo.getPrimaryMediaInfoHtml(item, {
 
                         year: false,
                         container: false,
@@ -462,7 +471,8 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
                         criticRating: false,
                         endsAt: false
 
-                    }) + '</div>';
+                    });
+                    html += '</div>';
                 }
             }
 
@@ -478,10 +488,6 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
                     html += '<button is="paper-icon-button-light" class="listItemButton itemAction" data-action="addtoplaylist"><span class="material-icons playlist_add"></span></button>';
                 }
 
-                if (options.moreButton !== false) {
-                    html += '<button is="paper-icon-button-light" class="listItemButton itemAction" data-action="menu"><span class="material-icons ' + moreIcon + '"></span></button>';
-                }
-
                 if (options.infoButton) {
                     html += '<button is="paper-icon-button-light" class="listItemButton itemAction" data-action="link"><span class="material-icons info_outline"></span></button>';
                 }
@@ -492,17 +498,21 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
 
                 if (options.enableUserDataButtons !== false) {
 
-                    var userData = item.UserData || {};
-                    var likes = userData.Likes == null ? '' : userData.Likes;
+                    const userData = item.UserData || {};
+                    const likes = userData.Likes == null ? '' : userData.Likes;
 
-                    if (itemHelper.canMarkPlayed(item)) {
+                    if (itemHelper.canMarkPlayed(item) && options.enablePlayedButton !== false) {
                         html += '<button is="emby-playstatebutton" type="button" class="listItemButton paper-icon-button-light" data-id="' + item.Id + '" data-serverid="' + item.ServerId + '" data-itemtype="' + item.Type + '" data-played="' + (userData.Played) + '"><span class="material-icons check"></span></button>';
                     }
 
-                    if (itemHelper.canRate(item)) {
+                    if (itemHelper.canRate(item) && options.enableRatingButton !== false) {
                         html += '<button is="emby-ratingbutton" type="button" class="listItemButton paper-icon-button-light" data-id="' + item.Id + '" data-serverid="' + item.ServerId + '" data-itemtype="' + item.Type + '" data-likes="' + likes + '" data-isfavorite="' + (userData.IsFavorite) + '"><span class="material-icons favorite"></span></button>';
                     }
                 }
+
+                if (options.moreButton !== false) {
+                    html += '<button is="paper-icon-button-light" class="listItemButton itemAction" data-action="menu"><span class="material-icons more_vert"></span></button>';
+                }
             }
             html += '</div>';
 
@@ -516,7 +526,7 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
                 }
             }
 
-            html += '</' + outerTagName + '>';
+            html += `</${outerTagName}>`;
 
             outerHtml += html;
         }
@@ -524,7 +534,7 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
         return outerHtml;
     }
 
-    return {
-        getListViewHtml: getListViewHtml
-    };
-});
+/* eslint-enable indent */
+export default {
+    getListViewHtml: getListViewHtml
+};
diff --git a/src/components/loading/loader.gif b/src/components/loading/loader.gif
deleted file mode 100644
index 86fb6daa79..0000000000
Binary files a/src/components/loading/loader.gif and /dev/null differ
diff --git a/src/components/loading/loading.js b/src/components/loading/loading.js
index 9a9aa3ca7d..f36e41f44d 100644
--- a/src/components/loading/loading.js
+++ b/src/components/loading/loading.js
@@ -1,10 +1,6 @@
-define(['components/loading/loadingLegacy', 'browser', 'css!./loading'], function (loadingLegacy, browser) {
+define(['css!./loading'], function () {
     'use strict';
 
-    if (browser.tizen || browser.operaTv || browser.chromecast || browser.orsay || browser.web0s || browser.ps4) {
-        return loadingLegacy;
-    }
-
     var loadingElem;
     var layer1;
     var layer2;
diff --git a/src/components/loading/loadingLegacy.css b/src/components/loading/loadingLegacy.css
deleted file mode 100644
index 17ea94950e..0000000000
--- a/src/components/loading/loadingLegacy.css
+++ /dev/null
@@ -1,10 +0,0 @@
-.loading-spinner {
-    margin-top: -3em;
-    margin-left: -3em;
-    width: 6em;
-    height: 6em;
-    position: fixed;
-    top: 50%;
-    left: 50%;
-    z-index: 9999999;
-}
diff --git a/src/components/loading/loadingLegacy.js b/src/components/loading/loadingLegacy.js
deleted file mode 100644
index d766a4aca4..0000000000
--- a/src/components/loading/loadingLegacy.js
+++ /dev/null
@@ -1,28 +0,0 @@
-define(['require', 'css!./loadingLegacy'], function (require) {
-    'use strict';
-
-    var loadingElem;
-
-    return {
-        show: function () {
-            var elem = loadingElem;
-            if (!elem) {
-                elem = document.createElement('img');
-                elem.src = require.toUrl('.').split('?')[0] + '/loader.gif';
-
-                loadingElem = elem;
-                elem.classList.add('loading-spinner');
-
-                document.body.appendChild(elem);
-            }
-
-            elem.classList.remove('hide');
-        },
-        hide: function () {
-            var elem = loadingElem;
-            if (elem) {
-                elem.classList.add('hide');
-            }
-        }
-    };
-});
diff --git a/src/components/loadingDialog/loadingDialog.js b/src/components/loadingDialog/loadingDialog.js
deleted file mode 100644
index bd6a80fd5b..0000000000
--- a/src/components/loadingDialog/loadingDialog.js
+++ /dev/null
@@ -1,92 +0,0 @@
-define(['loading', 'events', 'dialogHelper', 'dom', 'layoutManager', 'scrollHelper', 'globalize', 'require', 'material-icons', 'emby-button', 'paper-icon-button-light', 'emby-input', 'formDialogStyle', 'flexStyles'], function (loading, events, dialogHelper, dom, layoutManager, scrollHelper, globalize, require) {
-    'use strict';
-
-    function showDialog(instance, options, template) {
-        var dialogOptions = {
-            removeOnClose: true,
-            scrollY: false
-        };
-
-        var enableTvLayout = layoutManager.tv;
-        if (enableTvLayout) {
-            dialogOptions.size = 'fullscreen';
-        }
-
-        var dlg = dialogHelper.createDialog(dialogOptions);
-
-        var configuredButtons = [];
-
-        dlg.classList.add('formDialog');
-
-        dlg.innerHTML = globalize.translateHtml(template, 'core');
-
-        dlg.classList.add('align-items-center');
-        dlg.classList.add('justify-items-center');
-
-        var formDialogContent = dlg.querySelector('.formDialogContent');
-        formDialogContent.style['flex-grow'] = 'initial';
-        formDialogContent.style['max-width'] = '50%';
-        formDialogContent.style['max-height'] = '60%';
-
-        if (enableTvLayout) {
-            scrollHelper.centerFocus.on(formDialogContent, false);
-            dlg.querySelector('.formDialogHeader').style.marginTop = '15%';
-        } else {
-            dlg.classList.add('dialog-fullscreen-lowres');
-        }
-
-        //dlg.querySelector('.btnCancel').addEventListener('click', function (e) {
-        //    dialogHelper.close(dlg);
-        //});
-
-        dlg.querySelector('.formDialogHeaderTitle').innerHTML = options.title;
-
-        dlg.querySelector('.text').innerHTML = options.text;
-
-        instance.dlg = dlg;
-
-        return dialogHelper.open(dlg).then(function () {
-            if (enableTvLayout) {
-                scrollHelper.centerFocus.off(dlg.querySelector('.formDialogContent'), false);
-            }
-
-            loading.hide();
-        });
-    }
-
-    function LoadingDialog(options) {
-        this.options = options;
-    }
-
-    LoadingDialog.prototype.show = function () {
-        var instance = this;
-        loading.show();
-
-        return new Promise(function (resolve, reject) {
-            require(['text!./../dialog/dialog.template.html'], function (template) {
-                showDialog(instance, instance.options, template);
-                resolve();
-            });
-        });
-    };
-
-    LoadingDialog.prototype.setTitle = function (title) {
-    };
-
-    LoadingDialog.prototype.setText = function (text) {
-    };
-
-    LoadingDialog.prototype.hide = function () {
-        if (this.dlg) {
-            dialogHelper.close(this.dlg);
-            this.dlg = null;
-        }
-    };
-
-    LoadingDialog.prototype.destroy = function () {
-        this.dlg = null;
-        this.options = null;
-    };
-
-    return LoadingDialog;
-});
diff --git a/src/components/maintabsmanager.js b/src/components/maintabsmanager.js
index e1c5434363..0d31c2958a 100644
--- a/src/components/maintabsmanager.js
+++ b/src/components/maintabsmanager.js
@@ -1,11 +1,16 @@
-define(['dom', 'browser', 'events', 'emby-tabs', 'emby-button'], function (dom, browser, events) {
-    'use strict';
+import dom from 'dom';
+import browser from 'browser';
+import events from 'events';
+import 'emby-tabs';
+import 'emby-button';
 
-    var tabOwnerView;
-    var queryScope = document.querySelector('.skinHeader');
-    var footerTabsContainer;
-    var headerTabsContainer;
-    var tabsElem;
+/* eslint-disable indent */
+
+    let tabOwnerView;
+    const queryScope = document.querySelector('.skinHeader');
+    let footerTabsContainer;
+    let headerTabsContainer;
+    let tabsElem;
 
     function enableTabsInFooter() {
         return false;
@@ -44,7 +49,7 @@ define(['dom', 'browser', 'events', 'emby-tabs', 'emby-button'], function (dom,
                 return false;
             }
 
-            var classList = elem.classList;
+            const classList = elem.classList;
             if (classList) {
                 return !classList.contains('scrollX') && !classList.contains('animatedScrollX');
             }
@@ -52,7 +57,7 @@ define(['dom', 'browser', 'events', 'emby-tabs', 'emby-button'], function (dom,
             return true;
         }
 
-        var parent = target;
+        let parent = target;
         while (parent != null) {
             if (!allowSwipeOn(parent)) {
                 return false;
@@ -70,22 +75,22 @@ define(['dom', 'browser', 'events', 'emby-tabs', 'emby-button'], function (dom,
         }
 
         // implement without hammer
-        var pageCount = getTabContainersFn().length;
-        var onSwipeLeft = function (e, target) {
+        const pageCount = getTabContainersFn().length;
+        const onSwipeLeft = function (e, target) {
             if (allowSwipe(target) && view.contains(target)) {
                 tabsElem.selectNext();
             }
         };
 
-        var onSwipeRight = function (e, target) {
+        const onSwipeRight = function (e, target) {
             if (allowSwipe(target) && view.contains(target)) {
                 tabsElem.selectPrevious();
             }
         };
 
-        require(['touchHelper'], function (TouchHelper) {
+        import('touchHelper').then(({default: TouchHelper}) => {
 
-            var touchHelper = new TouchHelper(view.parentNode.parentNode);
+            const touchHelper = new TouchHelper(view.parentNode.parentNode);
 
             events.on(touchHelper, 'swipeleft', onSwipeLeft);
             events.on(touchHelper, 'swiperight', onSwipeRight);
@@ -96,9 +101,9 @@ define(['dom', 'browser', 'events', 'emby-tabs', 'emby-button'], function (dom,
         });
     }
 
-    function setTabs(view, selectedIndex, getTabsFn, getTabContainersFn, onBeforeTabChange, onTabChange, setSelectedIndex) {
+    export function setTabs(view, selectedIndex, getTabsFn, getTabContainersFn, onBeforeTabChange, onTabChange, setSelectedIndex) {
 
-        var enableInFooter = enableTabsInFooter();
+        const enableInFooter = enableTabsInFooter();
 
         if (!view) {
             if (tabOwnerView) {
@@ -129,7 +134,7 @@ define(['dom', 'browser', 'events', 'emby-tabs', 'emby-button'], function (dom,
 
         ensureElements(enableInFooter);
 
-        var tabsContainerElem = enableInFooter ? footerTabsContainer : headerTabsContainer;
+        const tabsContainerElem = enableInFooter ? footerTabsContainer : headerTabsContainer;
 
         if (!tabOwnerView) {
             tabsContainerElem.classList.remove('hide');
@@ -137,18 +142,18 @@ define(['dom', 'browser', 'events', 'emby-tabs', 'emby-button'], function (dom,
 
         if (tabOwnerView !== view) {
 
-            var index = 0;
+            let index = 0;
 
-            var indexAttribute = selectedIndex == null ? '' : (' data-index="' + selectedIndex + '"');
-            var tabsHtml = '<div is="emby-tabs"' + indexAttribute + ' class="tabs-viewmenubar"><div class="emby-tabs-slider" style="white-space:nowrap;">' + getTabsFn().map(function (t) {
+            const indexAttribute = selectedIndex == null ? '' : (' data-index="' + selectedIndex + '"');
+            const tabsHtml = '<div is="emby-tabs"' + indexAttribute + ' class="tabs-viewmenubar"><div class="emby-tabs-slider" style="white-space:nowrap;">' + getTabsFn().map(function (t) {
 
-                var tabClass = 'emby-tab-button';
+                let tabClass = 'emby-tab-button';
 
                 if (t.enabled === false) {
                     tabClass += ' hide';
                 }
 
-                var tabHtml;
+                let tabHtml;
 
                 if (t.cssClass) {
                     tabClass += ' ' + t.cssClass;
@@ -177,16 +182,16 @@ define(['dom', 'browser', 'events', 'emby-tabs', 'emby-button'], function (dom,
 
             tabsElem.addEventListener('beforetabchange', function (e) {
 
-                var tabContainers = getTabContainersFn();
+                const tabContainers = getTabContainersFn();
                 if (e.detail.previousIndex != null) {
 
-                    var previousPanel = tabContainers[e.detail.previousIndex];
+                    const previousPanel = tabContainers[e.detail.previousIndex];
                     if (previousPanel) {
                         previousPanel.classList.remove('is-active');
                     }
                 }
 
-                var newPanel = tabContainers[e.detail.selectedTabIndex];
+                const newPanel = tabContainers[e.detail.selectedTabIndex];
 
                 //if (e.detail.previousIndex != null && e.detail.previousIndex != e.detail.selectedTabIndex) {
                 //    if (newPanel.animate && (animateTabs || []).indexOf(e.detail.selectedTabIndex) != -1) {
@@ -241,9 +246,9 @@ define(['dom', 'browser', 'events', 'emby-tabs', 'emby-button'], function (dom,
         };
     }
 
-    function selectedTabIndex(index) {
+    export function selectedTabIndex(index) {
 
-        var tabsContainerElem = headerTabsContainer;
+        const tabsContainerElem = headerTabsContainer;
 
         if (!tabsElem) {
             tabsElem = tabsContainerElem.querySelector('[is="emby-tabs"]');
@@ -256,13 +261,8 @@ define(['dom', 'browser', 'events', 'emby-tabs', 'emby-button'], function (dom,
         }
     }
 
-    function getTabsElement() {
+    export function getTabsElement() {
         return document.querySelector('.tabs-viewmenubar');
     }
 
-    return {
-        setTabs: setTabs,
-        getTabsElement: getTabsElement,
-        selectedTabIndex: selectedTabIndex
-    };
-});
+/* eslint-enable indent */
diff --git a/src/components/mediaLibraryCreator/mediaLibraryCreator.js b/src/components/mediaLibraryCreator/mediaLibraryCreator.js
index bbef6e1f07..4e0d7b026c 100644
--- a/src/components/mediaLibraryCreator/mediaLibraryCreator.js
+++ b/src/components/mediaLibraryCreator/mediaLibraryCreator.js
@@ -1,5 +1,24 @@
-define(['loading', 'dialogHelper', 'dom', 'jQuery', 'components/libraryoptionseditor/libraryoptionseditor', 'globalize', 'emby-toggle', 'emby-input', 'emby-select', 'paper-icon-button-light', 'listViewStyle', 'formDialogStyle', 'emby-button', 'flexStyles'], function (loading, dialogHelper, dom, $, libraryoptionseditor, globalize) {
-    'use strict';
+/* eslint-disable indent */
+
+/**
+ * Module for media library creator.
+ * @module components/mediaLibraryCreator/mediaLibraryCreator
+ */
+
+import loading from 'loading';
+import dialogHelper from 'dialogHelper';
+import dom from 'dom';
+import $ from 'jQuery';
+import libraryoptionseditor from 'components/libraryoptionseditor/libraryoptionseditor';
+import globalize from 'globalize';
+import 'emby-toggle';
+import 'emby-input';
+import 'emby-select';
+import 'paper-icon-button-light';
+import 'listViewStyle';
+import 'formDialogStyle';
+import 'emby-button';
+import 'flexStyles';
 
     function onAddLibrary() {
         if (isCreating) {
@@ -7,7 +26,7 @@ define(['loading', 'dialogHelper', 'dom', 'jQuery', 'components/libraryoptionsed
         }
 
         if (pathInfos.length == 0) {
-            require(['alert'], function (alert) {
+            import('alert').then(({default: alert}) => {
                 alert({
                     text: globalize.translate('PleaseAddAtLeastOneFolder'),
                     type: 'error'
@@ -19,23 +38,23 @@ define(['loading', 'dialogHelper', 'dom', 'jQuery', 'components/libraryoptionsed
 
         isCreating = true;
         loading.show();
-        var dlg = dom.parentWithClass(this, 'dlg-librarycreator');
-        var name = $('#txtValue', dlg).val();
-        var type = $('#selectCollectionType', dlg).val();
+        const dlg = dom.parentWithClass(this, 'dlg-librarycreator');
+        const name = $('#txtValue', dlg).val();
+        let type = $('#selectCollectionType', dlg).val();
 
         if (type == 'mixed') {
             type = null;
         }
 
-        var libraryOptions = libraryoptionseditor.getLibraryOptions(dlg.querySelector('.libraryOptions'));
+        const libraryOptions = libraryoptionseditor.getLibraryOptions(dlg.querySelector('.libraryOptions'));
         libraryOptions.PathInfos = pathInfos;
-        ApiClient.addVirtualFolder(name, type, currentOptions.refresh, libraryOptions).then(function () {
+        ApiClient.addVirtualFolder(name, type, currentOptions.refresh, libraryOptions).then(() => {
             hasChanges = true;
             isCreating = false;
             loading.hide();
             dialogHelper.close(dlg);
-        }, function () {
-            require(['toast'], function (toast) {
+        }, () => {
+            import('toast').then(({default: toast}) => {
                 toast(globalize.translate('ErrorAddingMediaPathToVirtualFolder'));
             });
 
@@ -46,15 +65,15 @@ define(['loading', 'dialogHelper', 'dom', 'jQuery', 'components/libraryoptionsed
     }
 
     function getCollectionTypeOptionsHtml(collectionTypeOptions) {
-        return collectionTypeOptions.map(function (i) {
-            return '<option value="' + i.value + '">' + i.name + '</option>';
+        return collectionTypeOptions.map(i => {
+            return `<option value="${i.value}">${i.name}</option>`;
         }).join('');
     }
 
     function initEditor(page, collectionTypeOptions) {
         $('#selectCollectionType', page).html(getCollectionTypeOptionsHtml(collectionTypeOptions)).val('').on('change', function () {
-            var value = this.value;
-            var dlg = $(this).parents('.dialog')[0];
+            const value = this.value;
+            const dlg = $(this).parents('.dialog')[0];
             libraryoptionseditor.setContentType(dlg.querySelector('.libraryOptions'), value == 'mixed' ? '' : value);
 
             if (value) {
@@ -64,12 +83,12 @@ define(['loading', 'dialogHelper', 'dom', 'jQuery', 'components/libraryoptionsed
             }
 
             if (value != 'mixed') {
-                var index = this.selectedIndex;
+                const index = this.selectedIndex;
 
                 if (index != -1) {
-                    var name = this.options[index].innerHTML.replace('*', '').replace('&amp;', '&');
+                    const name = this.options[index].innerHTML.replace('*', '').replace('&amp;', '&');
                     $('#txtValue', dlg).val(name);
-                    var folderOption = collectionTypeOptions.filter(function (i) {
+                    const folderOption = collectionTypeOptions.filter(i => {
                         return i.value == value;
                     })[0];
                     $('.collectionTypeFieldDescription', dlg).html(folderOption.message || '');
@@ -83,15 +102,15 @@ define(['loading', 'dialogHelper', 'dom', 'jQuery', 'components/libraryoptionsed
     }
 
     function onToggleAdvancedChange() {
-        var dlg = dom.parentWithClass(this, 'dlg-librarycreator');
+        const dlg = dom.parentWithClass(this, 'dlg-librarycreator');
         libraryoptionseditor.setAdvancedVisible(dlg.querySelector('.libraryOptions'), this.checked);
     }
 
     function onAddButtonClick() {
-        var page = dom.parentWithClass(this, 'dlg-librarycreator');
+        const page = dom.parentWithClass(this, 'dlg-librarycreator');
 
-        require(['directorybrowser'], function (directoryBrowser) {
-            var picker = new directoryBrowser();
+        import('directorybrowser').then(({default: directoryBrowser}) => {
+            const picker = new directoryBrowser();
             picker.show({
                 enableNetworkSharePath: true,
                 callback: function (path, networkSharePath) {
@@ -106,24 +125,24 @@ define(['loading', 'dialogHelper', 'dom', 'jQuery', 'components/libraryoptionsed
     }
 
     function getFolderHtml(pathInfo, index) {
-        var html = '';
+        let html = '';
         html += '<div class="listItem listItem-border lnkPath" style="padding-left:.5em;">';
-        html += '<div class="' + (pathInfo.NetworkPath ? 'listItemBody two-line' : 'listItemBody') + '">';
-        html += '<div class="listItemBodyText">' + pathInfo.Path + '</div>';
+        html += `<div class="${pathInfo.NetworkPath ? 'listItemBody two-line' : 'listItemBody'}">`;
+        html += `<div class="listItemBodyText">${pathInfo.Path}</div>`;
 
         if (pathInfo.NetworkPath) {
-            html += '<div class="listItemBodyText secondary">' + pathInfo.NetworkPath + '</div>';
+            html += `<div class="listItemBodyText secondary">${pathInfo.NetworkPath}</div>`;
         }
 
         html += '</div>';
-        html += '<button type="button" is="paper-icon-button-light"" class="listItemButton btnRemovePath" data-index="' + index + '"><span class="material-icons remove_circle"></span></button>';
+        html += `<button type="button" is="paper-icon-button-light"" class="listItemButton btnRemovePath" data-index="${index}"><span class="material-icons remove_circle"></span></button>`;
         html += '</div>';
         return html;
     }
 
     function renderPaths(page) {
-        var foldersHtml = pathInfos.map(getFolderHtml).join('');
-        var folderList = page.querySelector('.folderList');
+        const foldersHtml = pathInfos.map(getFolderHtml).join('');
+        const folderList = page.querySelector('.folderList');
         folderList.innerHTML = foldersHtml;
 
         if (foldersHtml) {
@@ -134,13 +153,13 @@ define(['loading', 'dialogHelper', 'dom', 'jQuery', 'components/libraryoptionsed
     }
 
     function addMediaLocation(page, path, networkSharePath) {
-        var pathLower = path.toLowerCase();
-        var pathFilter = pathInfos.filter(function (p) {
+        const pathLower = path.toLowerCase();
+        const pathFilter = pathInfos.filter(p => {
             return p.Path.toLowerCase() == pathLower;
         });
 
         if (!pathFilter.length) {
-            var pathInfo = {
+            const pathInfo = {
                 Path: path
             };
 
@@ -154,11 +173,11 @@ define(['loading', 'dialogHelper', 'dom', 'jQuery', 'components/libraryoptionsed
     }
 
     function onRemoveClick(e) {
-        var button = dom.parentWithClass(e.target, 'btnRemovePath');
-        var index = parseInt(button.getAttribute('data-index'));
-        var location = pathInfos[index].Path;
-        var locationLower = location.toLowerCase();
-        pathInfos = pathInfos.filter(function (p) {
+        const button = dom.parentWithClass(e.target, 'btnRemovePath');
+        const index = parseInt(button.getAttribute('data-index'));
+        const location = pathInfos[index].Path;
+        const locationLower = location.toLowerCase();
+        pathInfos = pathInfos.filter(p => {
             return p.Path.toLowerCase() != locationLower;
         });
         renderPaths(dom.parentWithClass(button, 'dlg-librarycreator'));
@@ -169,54 +188,49 @@ define(['loading', 'dialogHelper', 'dom', 'jQuery', 'components/libraryoptionsed
     }
 
     function initLibraryOptions(dlg) {
-        libraryoptionseditor.embed(dlg.querySelector('.libraryOptions')).then(function () {
+        libraryoptionseditor.embed(dlg.querySelector('.libraryOptions')).then(() => {
             $('#selectCollectionType', dlg).trigger('change');
             onToggleAdvancedChange.call(dlg.querySelector('.chkAdvanced'));
         });
     }
 
-    function editor() {
-        this.show = function (options) {
-            return new Promise(function (resolve, reject) {
-                currentOptions = options;
-                currentResolve = resolve;
-                hasChanges = false;
-                var xhr = new XMLHttpRequest();
-                xhr.open('GET', 'components/mediaLibraryCreator/mediaLibraryCreator.template.html', true);
-
-                xhr.onload = function (e) {
-                    var template = this.response;
-                    var dlg = dialogHelper.createDialog({
-                        size: 'small',
-                        modal: false,
-                        removeOnClose: true,
-                        scrollY: false
-                    });
-                    dlg.classList.add('ui-body-a');
-                    dlg.classList.add('background-theme-a');
-                    dlg.classList.add('dlg-librarycreator');
-                    dlg.classList.add('formDialog');
-                    dlg.innerHTML = globalize.translateDocument(template);
-                    initEditor(dlg, options.collectionTypeOptions);
-                    dlg.addEventListener('close', onDialogClosed);
-                    dialogHelper.open(dlg);
-                    dlg.querySelector('.btnCancel').addEventListener('click', function () {
-                        dialogHelper.close(dlg);
-                    });
-                    pathInfos = [];
-                    renderPaths(dlg);
-                    initLibraryOptions(dlg);
-                };
-
-                xhr.send();
+export class showEditor {
+    constructor(options) {
+        return new Promise((resolve) => {
+            currentOptions = options;
+            currentResolve = resolve;
+            hasChanges = false;
+            import('text!./components/mediaLibraryCreator/mediaLibraryCreator.template.html').then(({default: template}) => {
+                const dlg = dialogHelper.createDialog({
+                    size: 'small',
+                    modal: false,
+                    removeOnClose: true,
+                    scrollY: false
+                });
+                dlg.classList.add('ui-body-a');
+                dlg.classList.add('background-theme-a');
+                dlg.classList.add('dlg-librarycreator');
+                dlg.classList.add('formDialog');
+                dlg.innerHTML = globalize.translateHtml(template);
+                initEditor(dlg, options.collectionTypeOptions);
+                dlg.addEventListener('close', onDialogClosed);
+                dialogHelper.open(dlg);
+                dlg.querySelector('.btnCancel').addEventListener('click', () => {
+                    dialogHelper.close(dlg);
+                });
+                pathInfos = [];
+                renderPaths(dlg);
+                initLibraryOptions(dlg);
             });
-        };
+        });
     }
+}
 
-    var pathInfos = [];
-    var currentResolve;
-    var currentOptions;
-    var hasChanges = false;
-    var isCreating = false;
-    return editor;
-});
+    let pathInfos = [];
+    let currentResolve;
+    let currentOptions;
+    let hasChanges = false;
+    let isCreating = false;
+
+/* eslint-enable indent */
+export default showEditor;
diff --git a/src/components/mediaLibraryEditor/mediaLibraryEditor.js b/src/components/mediaLibraryEditor/mediaLibraryEditor.js
index 554cf4cc0f..1cee6984d9 100644
--- a/src/components/mediaLibraryEditor/mediaLibraryEditor.js
+++ b/src/components/mediaLibraryEditor/mediaLibraryEditor.js
@@ -1,5 +1,22 @@
-define(['jQuery', 'loading', 'dialogHelper', 'dom', 'components/libraryoptionseditor/libraryoptionseditor', 'globalize', 'emby-button', 'listViewStyle', 'paper-icon-button-light', 'formDialogStyle', 'emby-toggle', 'flexStyles'], function (jQuery, loading, dialogHelper, dom, libraryoptionseditor, globalize) {
-    'use strict';
+/* eslint-disable indent */
+
+/**
+ * Module for media library editor.
+ * @module components/mediaLibraryEditor/mediaLibraryEditor
+ */
+
+import jQuery from 'jQuery';
+import loading from 'loading';
+import dialogHelper from 'dialogHelper';
+import dom from 'dom';
+import libraryoptionseditor from 'components/libraryoptionseditor/libraryoptionseditor';
+import globalize from 'globalize';
+import 'emby-button';
+import 'listViewStyle';
+import 'paper-icon-button-light';
+import 'formDialogStyle';
+import 'emby-toggle';
+import 'flexStyles';
 
     function onEditLibrary() {
         if (isCreating) {
@@ -8,15 +25,15 @@ define(['jQuery', 'loading', 'dialogHelper', 'dom', 'components/libraryoptionsed
 
         isCreating = true;
         loading.show();
-        var dlg = dom.parentWithClass(this, 'dlg-libraryeditor');
-        var libraryOptions = libraryoptionseditor.getLibraryOptions(dlg.querySelector('.libraryOptions'));
+        const dlg = dom.parentWithClass(this, 'dlg-libraryeditor');
+        let libraryOptions = libraryoptionseditor.getLibraryOptions(dlg.querySelector('.libraryOptions'));
         libraryOptions = Object.assign(currentOptions.library.LibraryOptions || {}, libraryOptions);
-        ApiClient.updateVirtualFolderOptions(currentOptions.library.ItemId, libraryOptions).then(function () {
+        ApiClient.updateVirtualFolderOptions(currentOptions.library.ItemId, libraryOptions).then(() => {
             hasChanges = true;
             isCreating = false;
             loading.hide();
             dialogHelper.close(dlg);
-        }, function () {
+        }, () => {
             isCreating = false;
             loading.hide();
         });
@@ -24,50 +41,50 @@ define(['jQuery', 'loading', 'dialogHelper', 'dom', 'components/libraryoptionsed
     }
 
     function addMediaLocation(page, path, networkSharePath) {
-        var virtualFolder = currentOptions.library;
-        var refreshAfterChange = currentOptions.refresh;
-        ApiClient.addMediaPath(virtualFolder.Name, path, networkSharePath, refreshAfterChange).then(function () {
+        const virtualFolder = currentOptions.library;
+        const refreshAfterChange = currentOptions.refresh;
+        ApiClient.addMediaPath(virtualFolder.Name, path, networkSharePath, refreshAfterChange).then(() => {
             hasChanges = true;
             refreshLibraryFromServer(page);
-        }, function () {
-            require(['toast'], function (toast) {
+        }, () => {
+            import('toast').then(({default: toast}) => {
                 toast(globalize.translate('ErrorAddingMediaPathToVirtualFolder'));
             });
         });
     }
 
     function updateMediaLocation(page, path, networkSharePath) {
-        var virtualFolder = currentOptions.library;
+        const virtualFolder = currentOptions.library;
         ApiClient.updateMediaPath(virtualFolder.Name, {
             Path: path,
             NetworkPath: networkSharePath
-        }).then(function () {
+        }).then(() => {
             hasChanges = true;
             refreshLibraryFromServer(page);
-        }, function () {
-            require(['toast'], function (toast) {
+        }, () => {
+            import('toast').then(({default: toast}) => {
                 toast(globalize.translate('ErrorAddingMediaPathToVirtualFolder'));
             });
         });
     }
 
     function onRemoveClick(btnRemovePath, location) {
-        var button = btnRemovePath;
-        var virtualFolder = currentOptions.library;
+        const button = btnRemovePath;
+        const virtualFolder = currentOptions.library;
 
-        require(['confirm'], function (confirm) {
+        import('confirm').then(({default: confirm}) => {
             confirm({
                 title: globalize.translate('HeaderRemoveMediaLocation'),
                 text: globalize.translate('MessageConfirmRemoveMediaLocation'),
                 confirmText: globalize.translate('ButtonDelete'),
                 primary: 'delete'
-            }).then(function () {
-                var refreshAfterChange = currentOptions.refresh;
-                ApiClient.removeMediaPath(virtualFolder.Name, location, refreshAfterChange).then(function () {
+            }).then(() => {
+                const refreshAfterChange = currentOptions.refresh;
+                ApiClient.removeMediaPath(virtualFolder.Name, location, refreshAfterChange).then(() => {
                     hasChanges = true;
                     refreshLibraryFromServer(dom.parentWithClass(button, 'dlg-libraryeditor'));
-                }, function () {
-                    require(['toast'], function (toast) {
+                }, () => {
+                    import('toast').then(({default: toast}) => {
                         toast(globalize.translate('DefaultErrorMessage'));
                     });
                 });
@@ -76,14 +93,14 @@ define(['jQuery', 'loading', 'dialogHelper', 'dom', 'components/libraryoptionsed
     }
 
     function onListItemClick(e) {
-        var listItem = dom.parentWithClass(e.target, 'listItem');
+        const listItem = dom.parentWithClass(e.target, 'listItem');
 
         if (listItem) {
-            var index = parseInt(listItem.getAttribute('data-index'));
-            var pathInfos = (currentOptions.library.LibraryOptions || {}).PathInfos || [];
-            var pathInfo = null == index ? {} : pathInfos[index] || {};
-            var originalPath = pathInfo.Path || (null == index ? null : currentOptions.library.Locations[index]);
-            var btnRemovePath = dom.parentWithClass(e.target, 'btnRemovePath');
+            const index = parseInt(listItem.getAttribute('data-index'));
+            const pathInfos = (currentOptions.library.LibraryOptions || {}).PathInfos || [];
+            const pathInfo = null == index ? {} : pathInfos[index] || {};
+            const originalPath = pathInfo.Path || (null == index ? null : currentOptions.library.Locations[index]);
+            const btnRemovePath = dom.parentWithClass(e.target, 'btnRemovePath');
 
             if (btnRemovePath) {
                 onRemoveClick(btnRemovePath, originalPath);
@@ -95,26 +112,26 @@ define(['jQuery', 'loading', 'dialogHelper', 'dom', 'components/libraryoptionsed
     }
 
     function getFolderHtml(pathInfo, index) {
-        var html = '';
-        html += '<div class="listItem listItem-border lnkPath" data-index="' + index + '" style="padding-left:.5em;">';
-        html += '<div class="' + (pathInfo.NetworkPath ? 'listItemBody two-line' : 'listItemBody') + '">';
+        let html = '';
+        html += `<div class="listItem listItem-border lnkPath" data-index="${index}" style="padding-left:.5em;">`;
+        html += `<div class="${pathInfo.NetworkPath ? 'listItemBody two-line' : 'listItemBody'}">`;
         html += '<h3 class="listItemBodyText">';
         html += pathInfo.Path;
         html += '</h3>';
 
         if (pathInfo.NetworkPath) {
-            html += '<div class="listItemBodyText secondary">' + pathInfo.NetworkPath + '</div>';
+            html += `<div class="listItemBodyText secondary">${pathInfo.NetworkPath}</div>`;
         }
 
         html += '</div>';
-        html += '<button type="button" is="paper-icon-button-light" class="listItemButton btnRemovePath" data-index="' + index + '"><span class="material-icons remove_circle"></span></button>';
+        html += `<button type="button" is="paper-icon-button-light" class="listItemButton btnRemovePath" data-index="${index}"><span class="material-icons remove_circle"></span></button>`;
         html += '</div>';
         return html;
     }
 
     function refreshLibraryFromServer(page) {
-        ApiClient.getVirtualFolders().then(function (result) {
-            var library = result.filter(function (f) {
+        ApiClient.getVirtualFolders().then(result => {
+            const library = result.filter(f => {
                 return f.Name === currentOptions.library.Name;
             })[0];
 
@@ -126,10 +143,10 @@ define(['jQuery', 'loading', 'dialogHelper', 'dom', 'components/libraryoptionsed
     }
 
     function renderLibrary(page, options) {
-        var pathInfos = (options.library.LibraryOptions || {}).PathInfos || [];
+        let pathInfos = (options.library.LibraryOptions || {}).PathInfos || [];
 
         if (!pathInfos.length) {
-            pathInfos = options.library.Locations.map(function (p) {
+            pathInfos = options.library.Locations.map(p => {
                 return {
                     Path: p
                 };
@@ -150,8 +167,8 @@ define(['jQuery', 'loading', 'dialogHelper', 'dom', 'components/libraryoptionsed
     }
 
     function showDirectoryBrowser(context, originalPath, networkPath) {
-        require(['directorybrowser'], function (directoryBrowser) {
-            var picker = new directoryBrowser();
+        import('directorybrowser').then(({default: directoryBrowser}) => {
+            const picker = new directoryBrowser();
             picker.show({
                 enableNetworkSharePath: true,
                 pathReadOnly: null != originalPath,
@@ -173,7 +190,7 @@ define(['jQuery', 'loading', 'dialogHelper', 'dom', 'components/libraryoptionsed
     }
 
     function onToggleAdvancedChange() {
-        var dlg = dom.parentWithClass(this, 'dlg-libraryeditor');
+        const dlg = dom.parentWithClass(this, 'dlg-libraryeditor');
         libraryoptionseditor.setAdvancedVisible(dlg.querySelector('.libraryOptions'), this.checked);
     }
 
@@ -183,7 +200,7 @@ define(['jQuery', 'loading', 'dialogHelper', 'dom', 'components/libraryoptionsed
         dlg.querySelector('.folderList').addEventListener('click', onListItemClick);
         dlg.querySelector('.chkAdvanced').addEventListener('change', onToggleAdvancedChange);
         dlg.querySelector('.btnSubmit').addEventListener('click', onEditLibrary);
-        libraryoptionseditor.embed(dlg.querySelector('.libraryOptions'), options.library.CollectionType, options.library.LibraryOptions).then(function () {
+        libraryoptionseditor.embed(dlg.querySelector('.libraryOptions'), options.library.CollectionType, options.library.LibraryOptions).then(() => {
             onToggleAdvancedChange.call(dlg.querySelector('.chkAdvanced'));
         });
     }
@@ -192,46 +209,41 @@ define(['jQuery', 'loading', 'dialogHelper', 'dom', 'components/libraryoptionsed
         currentDeferred.resolveWith(null, [hasChanges]);
     }
 
-    function editor() {
-        this.show = function (options) {
-            var deferred = jQuery.Deferred();
-            currentOptions = options;
-            currentDeferred = deferred;
-            hasChanges = false;
-            var xhr = new XMLHttpRequest();
-            xhr.open('GET', 'components/mediaLibraryEditor/mediaLibraryEditor.template.html', true);
-
-            xhr.onload = function (e) {
-                var template = this.response;
-                var dlg = dialogHelper.createDialog({
-                    size: 'small',
-                    modal: false,
-                    removeOnClose: true,
-                    scrollY: false
-                });
-                dlg.classList.add('dlg-libraryeditor');
-                dlg.classList.add('ui-body-a');
-                dlg.classList.add('background-theme-a');
-                dlg.classList.add('formDialog');
-                dlg.innerHTML = globalize.translateDocument(template);
-                dlg.querySelector('.formDialogHeaderTitle').innerHTML = options.library.Name;
-                initEditor(dlg, options);
-                dlg.addEventListener('close', onDialogClosed);
-                dialogHelper.open(dlg);
-                dlg.querySelector('.btnCancel').addEventListener('click', function () {
-                    dialogHelper.close(dlg);
-                });
-                refreshLibraryFromServer(dlg);
-            };
-
-            xhr.send();
-            return deferred.promise();
-        };
+export class showEditor {
+    constructor(options) {
+        const deferred = jQuery.Deferred();
+        currentOptions = options;
+        currentDeferred = deferred;
+        hasChanges = false;
+        import('text!./components/mediaLibraryEditor/mediaLibraryEditor.template.html').then(({default: template}) => {
+            const dlg = dialogHelper.createDialog({
+                size: 'small',
+                modal: false,
+                removeOnClose: true,
+                scrollY: false
+            });
+            dlg.classList.add('dlg-libraryeditor');
+            dlg.classList.add('ui-body-a');
+            dlg.classList.add('background-theme-a');
+            dlg.classList.add('formDialog');
+            dlg.innerHTML = globalize.translateHtml(template);
+            dlg.querySelector('.formDialogHeaderTitle').innerHTML = options.library.Name;
+            initEditor(dlg, options);
+            dlg.addEventListener('close', onDialogClosed);
+            dialogHelper.open(dlg);
+            dlg.querySelector('.btnCancel').addEventListener('click', () => {
+                dialogHelper.close(dlg);
+            });
+            refreshLibraryFromServer(dlg);
+        });
+        return deferred.promise();
     }
+}
 
-    var currentDeferred;
-    var currentOptions;
-    var hasChanges = false;
-    var isCreating = false;
-    return editor;
-});
+    let currentDeferred;
+    let currentOptions;
+    let hasChanges = false;
+    let isCreating = false;
+
+/* eslint-enable indent */
+export default showEditor;
diff --git a/src/components/mediainfo/mediainfo.css b/src/components/mediainfo/mediainfo.css
index 1883b78726..508c9d96ad 100644
--- a/src/components/mediainfo/mediainfo.css
+++ b/src/components/mediainfo/mediainfo.css
@@ -41,6 +41,8 @@
     width: auto !important;
     height: auto !important;
     font-size: 1.4em;
+    margin-right: 0.125em;
+    color: #f2b01e;
 }
 
 .mediaInfoCriticRating {
diff --git a/src/components/mediainfo/mediainfo.js b/src/components/mediainfo/mediainfo.js
index c569a7c78c..71acc5bbce 100644
--- a/src/components/mediainfo/mediainfo.js
+++ b/src/components/mediainfo/mediainfo.js
@@ -1,9 +1,18 @@
-define(['datetime', 'globalize', 'appRouter', 'itemHelper', 'indicators', 'material-icons', 'css!./mediainfo.css', 'programStyles', 'emby-button'], function (datetime, globalize, appRouter, itemHelper, indicators) {
-    'use strict';
+import datetime from 'datetime';
+import globalize from 'globalize';
+import appRouter from 'appRouter';
+import itemHelper from 'itemHelper';
+import indicators from 'indicators';
+import 'material-icons';
+import 'css!./mediainfo.css';
+import 'programStyles';
+import 'emby-button';
+
+/* eslint-disable indent */
 
     function getTimerIndicator(item) {
 
-        var status;
+        let status;
 
         if (item.Type === 'SeriesTimer') {
             return '<span class="material-icons mediaInfoItem mediaInfoIconItem mediaInfoTimerIcon fiber_smart_record"></span>';
@@ -30,11 +39,11 @@ define(['datetime', 'globalize', 'appRouter', 'itemHelper', 'indicators', 'mater
     }
 
     function getProgramInfoHtml(item, options) {
-        var html = '';
+        let html = '';
 
-        var miscInfo = [];
-        var text;
-        var date;
+        const miscInfo = [];
+        let text;
+        let date;
 
         if (item.StartDate && options.programTime !== false) {
 
@@ -48,35 +57,35 @@ define(['datetime', 'globalize', 'appRouter', 'itemHelper', 'indicators', 'mater
                     text += datetime.toLocaleDateString(date, { weekday: 'short', month: 'short', day: 'numeric' });
                 }
 
-                text += ' ' + datetime.getDisplayTime(date);
+                text += ` ${datetime.getDisplayTime(date)}`;
 
                 if (item.EndDate) {
                     date = datetime.parseISO8601Date(item.EndDate);
-                    text += ' - ' + datetime.getDisplayTime(date);
+                    text += ` - ${datetime.getDisplayTime(date)}`;
                 }
 
                 miscInfo.push(text);
             } catch (e) {
-                console.error('error parsing date: ' + item.StartDate);
+                console.error('error parsing date:', item.StartDate);
             }
         }
 
         if (item.ChannelNumber) {
-            miscInfo.push('CH ' + item.ChannelNumber);
+            miscInfo.push(`CH ${item.ChannelNumber}`);
         }
 
         if (item.ChannelName) {
 
             if (options.interactive && item.ChannelId) {
                 miscInfo.push({
-                    html: '<a is="emby-linkbutton" class="button-flat mediaInfoItem" href="' + appRouter.getRouteUrl({
+                    html: `<a is="emby-linkbutton" class="button-flat mediaInfoItem" href="${appRouter.getRouteUrl({
 
                         ServerId: item.ServerId,
                         Type: 'TvChannel',
                         Name: item.ChannelName,
                         Id: item.ChannelId
 
-                    }) + '">' + item.ChannelName + '</a>'
+                    })}">${item.ChannelName}</a>`
                 });
             } else {
                 miscInfo.push(item.ChannelName);
@@ -84,7 +93,7 @@ define(['datetime', 'globalize', 'appRouter', 'itemHelper', 'indicators', 'mater
         }
 
         if (options.timerIndicator !== false) {
-            var timerHtml = getTimerIndicator(item);
+            const timerHtml = getTimerIndicator(item);
             if (timerHtml) {
                 miscInfo.push({
                     html: timerHtml
@@ -92,24 +101,24 @@ define(['datetime', 'globalize', 'appRouter', 'itemHelper', 'indicators', 'mater
             }
         }
 
-        html += miscInfo.map(function (m) {
+        html += miscInfo.map(m => {
             return getMediaInfoItem(m);
         }).join('');
 
         return html;
     }
 
-    function getMediaInfoHtml(item, options) {
-        var html = '';
+    export function getMediaInfoHtml(item, options) {
+        let html = '';
 
-        var miscInfo = [];
+        const miscInfo = [];
         options = options || {};
-        var text;
-        var date;
-        var minutes;
-        var count;
+        let text;
+        let date;
+        let minutes;
+        let count;
 
-        var showFolderRuntime = item.Type === 'MusicAlbum' || item.MediaType === 'MusicArtist' || item.MediaType === 'Playlist' || item.MediaType === 'MusicGenre';
+        const showFolderRuntime = item.Type === 'MusicAlbum' || item.MediaType === 'MusicArtist' || item.MediaType === 'Playlist' || item.MediaType === 'MusicGenre';
 
         if (showFolderRuntime) {
 
@@ -143,7 +152,7 @@ define(['datetime', 'globalize', 'appRouter', 'itemHelper', 'indicators', 'mater
                     text = datetime.toLocaleDateString(date);
                     miscInfo.push(text);
                 } catch (e) {
-                    console.error('error parsing date: ' + item.PremiereDate);
+                    console.error('error parsing date:', item.PremiereDate);
                 }
             }
         }
@@ -176,7 +185,7 @@ define(['datetime', 'globalize', 'appRouter', 'itemHelper', 'indicators', 'mater
                     miscInfo.push(text);
                 }
             } catch (e) {
-                console.error('error parsing date: ' + item.StartDate);
+                console.error('error parsing date:', item.StartDate);
             }
         }
 
@@ -193,14 +202,14 @@ define(['datetime', 'globalize', 'appRouter', 'itemHelper', 'indicators', 'mater
 
                     try {
 
-                        var endYear = datetime.parseISO8601Date(item.EndDate).getFullYear();
+                        const endYear = datetime.parseISO8601Date(item.EndDate).getFullYear();
 
                         if (endYear !== item.ProductionYear) {
-                            text += '-' + datetime.parseISO8601Date(item.EndDate).getFullYear();
+                            text += `-${datetime.parseISO8601Date(item.EndDate).getFullYear()}`;
                         }
 
                     } catch (e) {
-                        console.error('error parsing date: ' + item.EndDate);
+                        console.error('error parsing date:', item.EndDate);
                     }
                 }
 
@@ -213,19 +222,19 @@ define(['datetime', 'globalize', 'appRouter', 'itemHelper', 'indicators', 'mater
             if (options.programIndicator !== false) {
                 if (item.IsLive) {
                     miscInfo.push({
-                        html: '<div class="mediaInfoProgramAttribute mediaInfoItem liveTvProgram">' + globalize.translate('Live') + '</div>'
+                        html: `<div class="mediaInfoProgramAttribute mediaInfoItem liveTvProgram">${globalize.translate('Live')}</div>`
                     });
                 } else if (item.IsPremiere) {
                     miscInfo.push({
-                        html: '<div class="mediaInfoProgramAttribute mediaInfoItem premiereTvProgram">' + globalize.translate('Premiere') + '</div>'
+                        html: `<div class="mediaInfoProgramAttribute mediaInfoItem premiereTvProgram">${globalize.translate('Premiere')}</div>`
                     });
                 } else if (item.IsSeries && !item.IsRepeat) {
                     miscInfo.push({
-                        html: '<div class="mediaInfoProgramAttribute mediaInfoItem newTvProgram">' + globalize.translate('AttributeNew') + '</div>'
+                        html: `<div class="mediaInfoProgramAttribute mediaInfoItem newTvProgram">${globalize.translate('AttributeNew')}</div>`
                     });
                 } else if (item.IsSeries && item.IsRepeat) {
                     miscInfo.push({
-                        html: '<div class="mediaInfoProgramAttribute mediaInfoItem repeatTvProgram">' + globalize.translate('Repeat') + '</div>'
+                        html: `<div class="mediaInfoProgramAttribute mediaInfoItem repeatTvProgram">${globalize.translate('Repeat')}</div>`
                     });
                 }
             }
@@ -248,7 +257,7 @@ define(['datetime', 'globalize', 'appRouter', 'itemHelper', 'indicators', 'mater
                     text = globalize.translate('OriginalAirDateValue', datetime.toLocaleDateString(date));
                     miscInfo.push(text);
                 } catch (e) {
-                    console.error('error parsing date: ' + item.PremiereDate);
+                    console.error('error parsing date:', item.PremiereDate);
                 }
             } else if (item.ProductionYear) {
                 miscInfo.push(item.ProductionYear);
@@ -267,13 +276,13 @@ define(['datetime', 'globalize', 'appRouter', 'itemHelper', 'indicators', 'mater
                         text = datetime.parseISO8601Date(item.PremiereDate).getFullYear();
                         miscInfo.push(text);
                     } catch (e) {
-                        console.error('error parsing date: ' + item.PremiereDate);
+                        console.error('error parsing date:', item.PremiereDate);
                     }
                 }
             }
         }
 
-        if (item.RunTimeTicks && item.Type !== 'Series' && item.Type !== 'Program' && !showFolderRuntime && options.runtime !== false) {
+        if (item.RunTimeTicks && item.Type !== 'Series' && item.Type !== 'Program' && item.Type !== 'Book' && !showFolderRuntime && options.runtime !== false) {
 
             if (item.Type === 'Audio') {
 
@@ -284,7 +293,7 @@ define(['datetime', 'globalize', 'appRouter', 'itemHelper', 'indicators', 'mater
 
                 minutes = minutes || 1;
 
-                miscInfo.push(Math.round(minutes) + ' mins');
+                miscInfo.push(`${Math.round(minutes)} mins`);
             }
         }
 
@@ -300,14 +309,14 @@ define(['datetime', 'globalize', 'appRouter', 'itemHelper', 'indicators', 'mater
         }
 
         if (item.MediaType === 'Photo' && item.Width && item.Height) {
-            miscInfo.push(item.Width + 'x' + item.Height);
+            miscInfo.push(`${item.Width}x${item.Height}`);
         }
 
         if (options.container !== false && item.Type === 'Audio' && item.Container) {
             miscInfo.push(item.Container);
         }
 
-        html += miscInfo.map(function (m) {
+        html += miscInfo.map(m => {
             return getMediaInfoItem(m);
         }).join('');
 
@@ -320,15 +329,15 @@ define(['datetime', 'globalize', 'appRouter', 'itemHelper', 'indicators', 'mater
         if (item.CriticRating && options.criticRating !== false) {
 
             if (item.CriticRating >= 60) {
-                html += '<div class="mediaInfoItem mediaInfoCriticRating mediaInfoCriticRatingFresh">' + item.CriticRating + '</div>';
+                html += `<div class="mediaInfoItem mediaInfoCriticRating mediaInfoCriticRatingFresh">${item.CriticRating}</div>`;
             } else {
-                html += '<div class="mediaInfoItem mediaInfoCriticRating mediaInfoCriticRatingRotten">' + item.CriticRating + '</div>';
+                html += `<div class="mediaInfoItem mediaInfoCriticRating mediaInfoCriticRatingRotten">${item.CriticRating}</div>`;
             }
         }
 
         if (options.endsAt !== false) {
 
-            var endsAt = getEndsAt(item);
+            const endsAt = getEndsAt(item);
             if (endsAt) {
                 html += getMediaInfoItem(endsAt, 'endsAt');
             }
@@ -339,15 +348,15 @@ define(['datetime', 'globalize', 'appRouter', 'itemHelper', 'indicators', 'mater
         return html;
     }
 
-    function getEndsAt(item) {
+    export function getEndsAt(item) {
 
         if (item.MediaType === 'Video' && item.RunTimeTicks) {
 
             if (!item.StartDate) {
-                var endDate = new Date().getTime() + (item.RunTimeTicks / 10000);
+                let endDate = new Date().getTime() + (item.RunTimeTicks / 10000);
                 endDate = new Date(endDate);
 
-                var displayTime = datetime.getDisplayTime(endDate);
+                const displayTime = datetime.getDisplayTime(endDate);
                 return globalize.translate('EndsAtValue', displayTime);
             }
         }
@@ -355,12 +364,12 @@ define(['datetime', 'globalize', 'appRouter', 'itemHelper', 'indicators', 'mater
         return null;
     }
 
-    function getEndsAtFromPosition(runtimeTicks, positionTicks, includeText) {
+    export function getEndsAtFromPosition(runtimeTicks, positionTicks, includeText) {
 
-        var endDate = new Date().getTime() + ((runtimeTicks - (positionTicks || 0)) / 10000);
+        let endDate = new Date().getTime() + ((runtimeTicks - (positionTicks || 0)) / 10000);
         endDate = new Date(endDate);
 
-        var displayTime = datetime.getDisplayTime(endDate);
+        const displayTime = datetime.getDisplayTime(endDate);
 
         if (includeText === false) {
             return displayTime;
@@ -370,8 +379,8 @@ define(['datetime', 'globalize', 'appRouter', 'itemHelper', 'indicators', 'mater
 
     function getMediaInfoItem(m, cssClass) {
 
-        cssClass = cssClass ? (cssClass + ' mediaInfoItem') : 'mediaInfoItem';
-        var mediaInfoText = m;
+        cssClass = cssClass ? (`${cssClass} mediaInfoItem`) : 'mediaInfoItem';
+        let mediaInfoText = m;
 
         if (typeof (m) !== 'string' && typeof (m) !== 'number') {
 
@@ -379,13 +388,13 @@ define(['datetime', 'globalize', 'appRouter', 'itemHelper', 'indicators', 'mater
                 return m.html;
             }
             mediaInfoText = m.text;
-            cssClass += ' ' + m.cssClass;
+            cssClass += ` ${m.cssClass}`;
         }
-        return '<div class="' + cssClass + '">' + mediaInfoText + '</div>';
+        return `<div class="${cssClass}">${mediaInfoText}</div>`;
     }
 
     function getStarIconsHtml(item) {
-        var html = '';
+        let html = '';
 
         if (item.CommunityRating) {
             html += '<div class="starRatingContainer mediaInfoItem">';
@@ -400,7 +409,7 @@ define(['datetime', 'globalize', 'appRouter', 'itemHelper', 'indicators', 'mater
 
     function dynamicEndTime(elem, item) {
 
-        var interval = setInterval(function () {
+        const interval = setInterval(() => {
 
             if (!document.body.contains(elem)) {
 
@@ -413,15 +422,15 @@ define(['datetime', 'globalize', 'appRouter', 'itemHelper', 'indicators', 'mater
         }, 60000);
     }
 
-    function fillPrimaryMediaInfo(elem, item, options) {
-        var html = getPrimaryMediaInfoHtml(item, options);
+    export function fillPrimaryMediaInfo(elem, item, options) {
+        const html = getPrimaryMediaInfoHtml(item, options);
 
         elem.innerHTML = html;
         afterFill(elem, item, options);
     }
 
-    function fillSecondaryMediaInfo(elem, item, options) {
-        var html = getSecondaryMediaInfoHtml(item, options);
+    export function fillSecondaryMediaInfo(elem, item, options) {
+        const html = getSecondaryMediaInfoHtml(item, options);
 
         elem.innerHTML = html;
         afterFill(elem, item, options);
@@ -430,13 +439,13 @@ define(['datetime', 'globalize', 'appRouter', 'itemHelper', 'indicators', 'mater
     function afterFill(elem, item, options) {
 
         if (options.endsAt !== false) {
-            var endsAtElem = elem.querySelector('.endsAt');
+            const endsAtElem = elem.querySelector('.endsAt');
             if (endsAtElem) {
                 dynamicEndTime(endsAtElem, item);
             }
         }
 
-        var lnkChannel = elem.querySelector('.lnkChannel');
+        const lnkChannel = elem.querySelector('.lnkChannel');
         if (lnkChannel) {
             lnkChannel.addEventListener('click', onChannelLinkClick);
         }
@@ -444,8 +453,8 @@ define(['datetime', 'globalize', 'appRouter', 'itemHelper', 'indicators', 'mater
 
     function onChannelLinkClick(e) {
 
-        var channelId = this.getAttribute('data-id');
-        var serverId = this.getAttribute('data-serverid');
+        const channelId = this.getAttribute('data-id');
+        const serverId = this.getAttribute('data-serverid');
 
         appRouter.showItem(channelId, serverId);
 
@@ -453,7 +462,7 @@ define(['datetime', 'globalize', 'appRouter', 'itemHelper', 'indicators', 'mater
         return false;
     }
 
-    function getPrimaryMediaInfoHtml(item, options) {
+    export function getPrimaryMediaInfoHtml(item, options) {
 
         options = options || {};
         if (options.interactive == null) {
@@ -463,7 +472,7 @@ define(['datetime', 'globalize', 'appRouter', 'itemHelper', 'indicators', 'mater
         return getMediaInfoHtml(item, options);
     }
 
-    function getSecondaryMediaInfoHtml(item, options) {
+    export function getSecondaryMediaInfoHtml(item, options) {
 
         options = options || {};
         if (options.interactive == null) {
@@ -476,10 +485,10 @@ define(['datetime', 'globalize', 'appRouter', 'itemHelper', 'indicators', 'mater
         return '';
     }
 
-    function getResolutionText(i) {
+    export function getResolutionText(i) {
 
-        var width = i.Width;
-        var height = i.Height;
+        const width = i.Width;
+        const height = i.Height;
 
         if (width && height) {
 
@@ -522,28 +531,28 @@ define(['datetime', 'globalize', 'appRouter', 'itemHelper', 'indicators', 'mater
             return null;
         }
 
-        var mediaSource = item.MediaSources[0];
+        const mediaSource = item.MediaSources[0];
         if (!mediaSource) {
             return null;
         }
 
-        return (mediaSource.MediaStreams || []).filter(function (i) {
+        return (mediaSource.MediaStreams || []).filter(i => {
             return i.Type === 'Audio' && (i.Index === mediaSource.DefaultAudioStreamIndex || mediaSource.DefaultAudioStreamIndex == null);
         })[0];
     }
 
-    function getMediaInfoStats(item, options) {
+    export function getMediaInfoStats(item, options) {
 
         options = options || {};
 
-        var list = [];
+        const list = [];
 
-        var mediaSource = (item.MediaSources || [])[0] || {};
+        const mediaSource = (item.MediaSources || [])[0] || {};
 
-        var videoStream = (mediaSource.MediaStreams || []).filter(function (i) {
+        const videoStream = (mediaSource.MediaStreams || []).filter(i => {
             return i.Type === 'Video';
         })[0] || {};
-        var audioStream = getAudioStreamForDisplay(item) || {};
+        const audioStream = getAudioStreamForDisplay(item) || {};
 
         if (item.VideoType === 'Dvd') {
             list.push({
@@ -563,7 +572,7 @@ define(['datetime', 'globalize', 'appRouter', 'itemHelper', 'indicators', 'mater
         //    html += '<div class="mediaInfoIcon mediaInfoText">' + mediaSource.Container + '</div>';
         //}
 
-        var resolutionText = getResolutionText(videoStream);
+        const resolutionText = getResolutionText(videoStream);
         if (resolutionText) {
             list.push({
                 type: 'mediainfo',
@@ -578,8 +587,8 @@ define(['datetime', 'globalize', 'appRouter', 'itemHelper', 'indicators', 'mater
             });
         }
 
-        var channels = audioStream.Channels;
-        var channelText;
+        const channels = audioStream.Channels;
+        let channelText;
 
         if (channels === 8) {
 
@@ -605,7 +614,7 @@ define(['datetime', 'globalize', 'appRouter', 'itemHelper', 'indicators', 'mater
             });
         }
 
-        var audioCodec = (audioStream.Codec || '').toLowerCase();
+        const audioCodec = (audioStream.Codec || '').toLowerCase();
 
         if ((audioCodec === 'dca' || audioCodec === 'dts') && audioStream.Profile) {
             list.push({
@@ -621,27 +630,27 @@ define(['datetime', 'globalize', 'appRouter', 'itemHelper', 'indicators', 'mater
 
         if (item.DateCreated && itemHelper.enableDateAddedDisplay(item)) {
 
-            var dateCreated = datetime.parseISO8601Date(item.DateCreated);
+            const dateCreated = datetime.parseISO8601Date(item.DateCreated);
 
             list.push({
                 type: 'added',
-                text: globalize.translate('AddedOnValue', datetime.toLocaleDateString(dateCreated) + ' ' + datetime.getDisplayTime(dateCreated))
+                text: globalize.translate('AddedOnValue', `${datetime.toLocaleDateString(dateCreated)} ${datetime.getDisplayTime(dateCreated)}`)
             });
         }
 
         return list;
     }
 
-    return {
-        getMediaInfoHtml: getPrimaryMediaInfoHtml,
-        fill: fillPrimaryMediaInfo,
-        getEndsAt: getEndsAt,
-        getEndsAtFromPosition: getEndsAtFromPosition,
-        getPrimaryMediaInfoHtml: getPrimaryMediaInfoHtml,
-        getSecondaryMediaInfoHtml: getSecondaryMediaInfoHtml,
-        fillPrimaryMediaInfo: fillPrimaryMediaInfo,
-        fillSecondaryMediaInfo: fillSecondaryMediaInfo,
-        getMediaInfoStats: getMediaInfoStats,
-        getResolutionText: getResolutionText
-    };
-});
+/* eslint-enable indent */
+
+export default {
+    getMediaInfoHtml: getPrimaryMediaInfoHtml,
+    getEndsAt: getEndsAt,
+    getEndsAtFromPosition: getEndsAtFromPosition,
+    getPrimaryMediaInfoHtml: getPrimaryMediaInfoHtml,
+    getSecondaryMediaInfoHtml: getSecondaryMediaInfoHtml,
+    fillPrimaryMediaInfo: fillPrimaryMediaInfo,
+    fillSecondaryMediaInfo: fillSecondaryMediaInfo,
+    getMediaInfoStats: getMediaInfoStats,
+    getResolutionText: getResolutionText
+};
diff --git a/src/components/metadataEditor/metadataEditor.js b/src/components/metadataEditor/metadataEditor.js
index 52f030cd23..9bf2da2003 100644
--- a/src/components/metadataEditor/metadataEditor.js
+++ b/src/components/metadataEditor/metadataEditor.js
@@ -1,9 +1,30 @@
-define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loading', 'focusManager', 'connectionManager', 'globalize', 'require', 'shell', 'emby-checkbox', 'emby-input', 'emby-select', 'listViewStyle', 'emby-textarea', 'emby-button', 'paper-icon-button-light', 'css!./../formdialog', 'clearButtonStyle', 'flexStyles'], function (itemHelper, dom, layoutManager, dialogHelper, datetime, loading, focusManager, connectionManager, globalize, require, shell) {
-    'use strict';
+import itemHelper from 'itemHelper';
+import dom from 'dom';
+import layoutManager from 'layoutManager';
+import dialogHelper from 'dialogHelper';
+import datetime from 'datetime';
+import loading from 'loading';
+import focusManager from 'focusManager';
+import connectionManager from 'connectionManager';
+import globalize from 'globalize';
+import require from 'require';
+import shell from 'shell';
+import 'emby-checkbox';
+import 'emby-input';
+import 'emby-select';
+import 'listViewStyle';
+import 'emby-textarea';
+import 'emby-button';
+import 'paper-icon-button-light';
+import 'css!./../formdialog';
+import 'clearButtonStyle';
+import 'flexStyles';
 
-    var currentContext;
-    var metadataEditorInfo;
-    var currentItem;
+/* eslint-disable indent */
+
+    let currentContext;
+    let metadataEditorInfo;
+    let currentItem;
 
     function isDialog() {
         return currentContext.classList.contains('dialog');
@@ -28,11 +49,11 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
             closeDialog(true);
         }
 
-        var apiClient = getApiClient();
+        const apiClient = getApiClient();
 
         apiClient.updateItem(item).then(function () {
 
-            var newContentType = form.querySelector('#selectContentType').value || '';
+            const newContentType = form.querySelector('#selectContentType').value || '';
 
             if ((metadataEditorInfo.ContentType || '') !== newContentType) {
 
@@ -56,7 +77,7 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
     }
 
     function getSelectedAirDays(form) {
-        var checkedItems = form.querySelectorAll('.chkAirDay:checked') || [];
+        const checkedItems = form.querySelectorAll('.chkAirDay:checked') || [];
         return Array.prototype.map.call(checkedItems, function (c) {
             return c.getAttribute('data-day');
         });
@@ -92,7 +113,7 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
 
     function getDateValue(form, element, property) {
 
-        var val = form.querySelector(element).value;
+        let val = form.querySelector(element).value;
 
         if (!val) {
             return null;
@@ -100,14 +121,14 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
 
         if (currentItem[property]) {
 
-            var date = datetime.parseISO8601Date(currentItem[property], true);
+            const date = datetime.parseISO8601Date(currentItem[property], true);
 
-            var parts = date.toISOString().split('T');
+            const parts = date.toISOString().split('T');
 
             // If the date is the same, preserve the time
             if (parts[0].indexOf(val) === 0) {
 
-                var iso = parts[1];
+                const iso = parts[1];
 
                 val += 'T' + iso;
             }
@@ -120,9 +141,9 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
 
         loading.show();
 
-        var form = this;
+        const form = this;
 
-        var item = {
+        const item = {
             Id: currentItem.Id,
             Name: form.querySelector('#txtName').value,
             OriginalTitle: form.querySelector('#txtOriginalName').value,
@@ -168,9 +189,9 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
 
         item.ProviderIds = Object.assign({}, currentItem.ProviderIds);
 
-        var idElements = form.querySelectorAll('.txtExternalId');
+        const idElements = form.querySelectorAll('.txtExternalId');
         Array.prototype.map.call(idElements, function (idElem) {
-            var providerKey = idElem.getAttribute('data-providerkey');
+            const providerKey = idElem.getAttribute('data-providerkey');
             item.ProviderIds[providerKey] = idElem.value;
         });
 
@@ -179,7 +200,7 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
 
         if (currentItem.Type === 'Person') {
 
-            var placeOfBirth = form.querySelector('#txtPlaceOfBirth').value;
+            const placeOfBirth = form.querySelector('#txtPlaceOfBirth').value;
 
             item.ProductionLocations = placeOfBirth ? [placeOfBirth] : [];
         }
@@ -187,11 +208,11 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
         if (currentItem.Type === 'Series') {
 
             // 600000000
-            var seriesRuntime = form.querySelector('#txtSeriesRuntime').value;
+            const seriesRuntime = form.querySelector('#txtSeriesRuntime').value;
             item.RunTimeTicks = seriesRuntime ? (seriesRuntime * 600000000) : null;
         }
 
-        var tagline = form.querySelector('#txtTagline').value;
+        const tagline = form.querySelector('#txtTagline').value;
         item.Taglines = tagline ? [tagline] : [];
 
         submitUpdatedItem(form, item);
@@ -210,13 +231,12 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
     }
 
     function addElementToList(source, sortCallback) {
-        require(['prompt'], function (prompt) {
-
+        import('prompt').then(({default: prompt}) => {
             prompt({
                 label: 'Value:'
             }).then(function (text) {
-                var list = dom.parentWithClass(source, 'editableListviewContainer').querySelector('.paperList');
-                var items = getListValues(list);
+                const list = dom.parentWithClass(source, 'editableListviewContainer').querySelector('.paperList');
+                const items = getListValues(list);
                 items.push(text);
                 populateListView(list, items, sortCallback);
             });
@@ -224,7 +244,7 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
     }
 
     function removeElementFromList(source) {
-        var el = dom.parentWithClass(source, 'listItem');
+        const el = dom.parentWithClass(source, 'listItem');
         el.parentNode.removeChild(el);
     }
 
@@ -234,7 +254,7 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
 
             personEditor.show(person).then(function (updatedPerson) {
 
-                var isNew = index === -1;
+                const isNew = index === -1;
 
                 if (isNew) {
                     currentItem.People.push(updatedPerson);
@@ -245,15 +265,52 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
         });
     }
 
+    function afterDeleted(context, item) {
+        var parentId = item.ParentId || item.SeasonId || item.SeriesId;
+
+        if (parentId) {
+            reload(context, parentId, item.ServerId);
+        } else {
+            require(['appRouter'], function (appRouter) {
+                appRouter.goHome();
+            });
+        }
+    }
+
+    function showMoreMenu(context, button, user) {
+        require(['itemContextMenu'], function (itemContextMenu) {
+            var item = currentItem;
+
+            itemContextMenu.show({
+                item: item,
+                positionTo: button,
+                edit: false,
+                editImages: true,
+                editSubtitles: true,
+                sync: false,
+                share: false,
+                play: false,
+                queue: false,
+                user: user
+            }).then(function (result) {
+                if (result.deleted) {
+                    afterDeleted(context, item);
+                } else if (result.updated) {
+                    reload(context, item.Id, item.ServerId);
+                }
+            });
+        });
+    }
+
     function onEditorClick(e) {
 
-        var btnRemoveFromEditorList = dom.parentWithClass(e.target, 'btnRemoveFromEditorList');
+        const btnRemoveFromEditorList = dom.parentWithClass(e.target, 'btnRemoveFromEditorList');
         if (btnRemoveFromEditorList) {
             removeElementFromList(btnRemoveFromEditorList);
             return;
         }
 
-        var btnAddTextItem = dom.parentWithClass(e.target, 'btnAddTextItem');
+        const btnAddTextItem = dom.parentWithClass(e.target, 'btnAddTextItem');
         if (btnAddTextItem) {
             addElementToList(btnAddTextItem);
         }
@@ -264,19 +321,18 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
     }
 
     function bindAll(elems, eventName, fn) {
-        for (var i = 0, length = elems.length; i < length; i++) {
+        for (let i = 0, length = elems.length; i < length; i++) {
             elems[i].addEventListener(eventName, fn);
         }
     }
 
     function init(context, apiClient) {
-
         context.querySelector('.externalIds').addEventListener('click', function (e) {
-            var btnOpenExternalId = dom.parentWithClass(e.target, 'btnOpenExternalId');
+            const btnOpenExternalId = dom.parentWithClass(e.target, 'btnOpenExternalId');
             if (btnOpenExternalId) {
-                var field = context.querySelector('#' + btnOpenExternalId.getAttribute('data-fieldid'));
+                const field = context.querySelector('#' + btnOpenExternalId.getAttribute('data-fieldid'));
 
-                var formatString = field.getAttribute('data-formatstring');
+                const formatString = field.getAttribute('data-formatstring');
 
                 if (field.value) {
                     shell.openUrl(formatString.replace('{0}', field.value));
@@ -294,13 +350,17 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
             closeDialog(false);
         });
 
-        context.querySelector('.btnHeaderSave').addEventListener('click', function (e) {
+        context.querySelector('.btnMore').addEventListener('click', function (e) {
+            getApiClient().getCurrentUser().then(function (user) {
+                showMoreMenu(context, e.target, user);
+            });
+        });
 
+        context.querySelector('.btnHeaderSave').addEventListener('click', function (e) {
             context.querySelector('.btnSave').click();
         });
 
         context.querySelector('#chkLockData').addEventListener('click', function (e) {
-
             if (!e.target.checked) {
                 showElement('.providerSettingsContainer');
             } else {
@@ -308,10 +368,10 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
             }
         });
 
-        context.removeEventListener('submit', onEditorClick);
-        context.addEventListener('submit', onEditorClick);
+        context.removeEventListener('click', onEditorClick);
+        context.addEventListener('click', onEditorClick);
 
-        var form = context.querySelector('form');
+        const form = context.querySelector('form');
         form.removeEventListener('submit', onSubmit);
         form.addEventListener('submit', onSubmit);
 
@@ -322,15 +382,15 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
 
         context.querySelector('#peopleList').addEventListener('click', function (e) {
 
-            var index;
-            var btnDeletePerson = dom.parentWithClass(e.target, 'btnDeletePerson');
+            let index;
+            const btnDeletePerson = dom.parentWithClass(e.target, 'btnDeletePerson');
             if (btnDeletePerson) {
                 index = parseInt(btnDeletePerson.getAttribute('data-index'));
                 currentItem.People.splice(index, 1);
                 populatePeople(context, currentItem.People);
             }
 
-            var btnEditPerson = dom.parentWithClass(e.target, 'btnEditPerson');
+            const btnEditPerson = dom.parentWithClass(e.target, 'btnEditPerson');
             if (btnEditPerson) {
                 index = parseInt(btnEditPerson.getAttribute('data-index'));
                 editPerson(context, currentItem.People[index], index);
@@ -340,7 +400,7 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
 
     function getItem(itemId, serverId) {
 
-        var apiClient = connectionManager.getApiClient(serverId);
+        const apiClient = connectionManager.getApiClient(serverId);
 
         if (itemId) {
             return apiClient.getItem(apiClient.getCurrentUserId(), itemId);
@@ -351,7 +411,7 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
 
     function getEditorConfig(itemId, serverId) {
 
-        var apiClient = connectionManager.getApiClient(serverId);
+        const apiClient = connectionManager.getApiClient(serverId);
 
         if (itemId) {
             return apiClient.getJSON(apiClient.getUrl('Items/' + itemId + '/MetadataEditor'));
@@ -362,13 +422,13 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
 
     function populateCountries(select, allCountries) {
 
-        var html = '';
+        let html = '';
 
         html += "<option value=''></option>";
 
-        for (var i = 0, length = allCountries.length; i < length; i++) {
+        for (let i = 0, length = allCountries.length; i < length; i++) {
 
-            var culture = allCountries[i];
+            const culture = allCountries[i];
 
             html += "<option value='" + culture.TwoLetterISORegionName + "'>" + culture.DisplayName + '</option>';
         }
@@ -378,13 +438,13 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
 
     function populateLanguages(select, languages) {
 
-        var html = '';
+        let html = '';
 
         html += "<option value=''></option>";
 
-        for (var i = 0, length = languages.length; i < length; i++) {
+        for (let i = 0, length = languages.length; i < length; i++) {
 
-            var culture = languages[i];
+            const culture = languages[i];
 
             html += "<option value='" + culture.TwoLetterISOLanguageName + "'>" + culture.DisplayName + '</option>';
         }
@@ -400,41 +460,41 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
             showElement('#fldContentType', context);
         }
 
-        var html = metadataInfo.ContentTypeOptions.map(function (i) {
+        const html = metadataInfo.ContentTypeOptions.map(function (i) {
 
             return '<option value="' + i.Value + '">' + i.Name + '</option>';
 
         }).join('');
 
-        var selectEl = context.querySelector('#selectContentType');
+        const selectEl = context.querySelector('#selectContentType');
         selectEl.innerHTML = html;
         selectEl.value = metadataInfo.ContentType || '';
     }
 
     function loadExternalIds(context, item, externalIds) {
 
-        var html = '';
+        let html = '';
 
-        var providerIds = item.ProviderIds || {};
+        const providerIds = item.ProviderIds || {};
 
-        for (var i = 0, length = externalIds.length; i < length; i++) {
+        for (let i = 0, length = externalIds.length; i < length; i++) {
 
-            var idInfo = externalIds[i];
+            const idInfo = externalIds[i];
 
-            var id = 'txt1' + idInfo.Key;
-            var formatString = idInfo.UrlFormatString || '';
+            const id = 'txt1' + idInfo.Key;
+            const formatString = idInfo.UrlFormatString || '';
 
-            var fullName = idInfo.Name;
+            let fullName = idInfo.Name;
             if (idInfo.Type) {
                 fullName = idInfo.Name + ' ' + globalize.translate(idInfo.Type);
             }
 
-            var labelText = globalize.translate('LabelDynamicExternalId', fullName);
+            const labelText = globalize.translate('LabelDynamicExternalId', fullName);
 
             html += '<div class="inputContainer">';
             html += '<div class="flex align-items-center">';
 
-            var value = providerIds[idInfo.Key] || '';
+            const value = providerIds[idInfo.Key] || '';
 
             html += '<div class="flex-grow">';
             html += '<input is="emby-input" class="txtExternalId" value="' + value + '" data-providerkey="' + idInfo.Key + '" data-formatstring="' + formatString + '" id="' + id + '" label="' + labelText + '"/>';
@@ -448,7 +508,7 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
             html += '</div>';
         }
 
-        var elem = context.querySelector('.externalIds', context);
+        const elem = context.querySelector('.externalIds', context);
         elem.innerHTML = html;
 
         if (externalIds.length) {
@@ -465,7 +525,7 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
         context = context || document;
         if (typeof selector === 'string') {
 
-            var elements = multiple ? context.querySelectorAll(selector) : [context.querySelector(selector)];
+            const elements = multiple ? context.querySelectorAll(selector) : [context.querySelector(selector)];
 
             Array.prototype.forEach.call(elements, function (el) {
                 if (el) {
@@ -484,7 +544,7 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
         context = context || document;
         if (typeof selector === 'string') {
 
-            var elements = multiple ? context.querySelectorAll(selector) : [context.querySelector(selector)];
+            const elements = multiple ? context.querySelectorAll(selector) : [context.querySelector(selector)];
 
             Array.prototype.forEach.call(elements, function (el) {
                 if (el) {
@@ -686,7 +746,7 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
 
     function fillItemInfo(context, item, parentalRatingOptions) {
 
-        var select = context.querySelector('#selectOfficialRating');
+        let select = context.querySelector('#selectOfficialRating');
 
         populateRatings(parentalRatingOptions, select, item.OfficialRating);
 
@@ -698,7 +758,7 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
 
         select.value = item.CustomRating || '';
 
-        var selectStatus = context.querySelector('#selectStatus');
+        const selectStatus = context.querySelector('#selectStatus');
         populateStatus(selectStatus);
         selectStatus.value = item.Status || '';
 
@@ -717,8 +777,8 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
 
         populateListView(context.querySelector('#listTags'), item.Tags);
 
-        var lockData = (item.LockData || false);
-        var chkLockData = context.querySelector('#chkLockData');
+        const lockData = (item.LockData || false);
+        const chkLockData = context.querySelector('#chkLockData');
         chkLockData.checked = lockData;
         if (chkLockData.checked) {
             hideElement('.providerSettingsContainer', context);
@@ -756,7 +816,7 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
             return a.Name;
         }).join(';');
 
-        var date;
+        let date;
 
         if (item.DateCreated) {
             try {
@@ -798,7 +858,7 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
 
         context.querySelector('#txtAirTime').value = item.AirTime || '';
 
-        var placeofBirth = item.ProductionLocations && item.ProductionLocations.length ? item.ProductionLocations[0] : '';
+        const placeofBirth = item.ProductionLocations && item.ProductionLocations.length ? item.ProductionLocations[0] : '';
         context.querySelector('#txtPlaceOfBirth').value = placeofBirth;
 
         context.querySelector('#txtOriginalAspectRatio').value = item.AspectRatio || '';
@@ -808,7 +868,7 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
 
         if (item.RunTimeTicks) {
 
-            var minutes = item.RunTimeTicks / 600000000;
+            const minutes = item.RunTimeTicks / 600000000;
 
             context.querySelector('#txtSeriesRuntime').value = Math.round(minutes);
         } else {
@@ -818,18 +878,16 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
 
     function populateRatings(allParentalRatings, select, currentValue) {
 
-        var html = '';
+        let html = '';
 
         html += "<option value=''></option>";
 
-        var ratings = [];
-        var i;
-        var length;
-        var rating;
+        const ratings = [];
+        let rating;
 
-        var currentValueFound = false;
+        let currentValueFound = false;
 
-        for (i = 0, length = allParentalRatings.length; i < length; i++) {
+        for (let i = 0, length = allParentalRatings.length; i < length; i++) {
 
             rating = allParentalRatings[i];
 
@@ -844,7 +902,7 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
             ratings.push({ Name: currentValue, Value: currentValue });
         }
 
-        for (i = 0, length = ratings.length; i < length; i++) {
+        for (let i = 0, length = ratings.length; i < length; i++) {
 
             rating = ratings[i];
 
@@ -855,7 +913,7 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
     }
 
     function populateStatus(select) {
-        var html = '';
+        let html = '';
 
         html += "<option value=''></option>";
         html += "<option value='Continuing'>" + globalize.translate('Continuing') + '</option>';
@@ -873,8 +931,8 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
         } else {
             items = sortCallback(items);
         }
-        var html = '';
-        for (var i = 0; i < items.length; i++) {
+        let html = '';
+        for (let i = 0; i < items.length; i++) {
             html += '<div class="listItem">';
 
             html += '<span class="material-icons listItemIcon live_tv" style="background-color:#333;"></span>';
@@ -897,14 +955,14 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
 
     function populatePeople(context, people) {
 
-        var lastType = '';
-        var html = '';
+        let lastType = '';
+        let html = '';
 
-        var elem = context.querySelector('#peopleList');
+        const elem = context.querySelector('#peopleList');
 
-        for (var i = 0, length = people.length; i < length; i++) {
+        for (let i = 0, length = people.length; i < length; i++) {
 
-            var person = people[i];
+            const person = people[i];
 
             html += '<div class="listItem">';
 
@@ -934,13 +992,13 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
 
     function getLockedFieldsHtml(fields, currentFields) {
 
-        var html = '';
-        for (var i = 0; i < fields.length; i++) {
+        let html = '';
+        for (let i = 0; i < fields.length; i++) {
 
-            var field = fields[i];
-            var name = field.name;
-            var value = field.value || field.name;
-            var checkedHtml = currentFields.indexOf(value) === -1 ? ' checked' : '';
+            const field = fields[i];
+            const name = field.name;
+            const value = field.value || field.name;
+            const checkedHtml = currentFields.indexOf(value) === -1 ? ' checked' : '';
             html += '<label>';
             html += '<input type="checkbox" is="emby-checkbox" class="selectLockedField" data-value="' + value + '"' + checkedHtml + '/>';
             html += '<span>' + name + '</span>';
@@ -950,10 +1008,10 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
     }
 
     function fillMetadataSettings(context, item, lockedFields) {
-        var container = context.querySelector('.providerSettingsContainer');
+        const container = context.querySelector('.providerSettingsContainer');
         lockedFields = lockedFields || [];
 
-        var lockedFieldsList = [
+        const lockedFieldsList = [
             { name: globalize.translate('Name'), value: 'Name' },
             { name: globalize.translate('Overview'), value: 'Overview' },
             { name: globalize.translate('Genres'), value: 'Genres' },
@@ -974,7 +1032,7 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
         lockedFieldsList.push({ name: globalize.translate('Studios'), value: 'Studios' });
         lockedFieldsList.push({ name: globalize.translate('Tags'), value: 'Tags' });
 
-        var html = '';
+        let html = '';
 
         html += '<h2>' + globalize.translate('HeaderEnabledFields') + '</h2>';
         html += '<p>' + globalize.translate('HeaderEnabledFieldsHelp') + '</p>';
@@ -988,13 +1046,13 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
 
         Promise.all([getItem(itemId, serverId), getEditorConfig(itemId, serverId)]).then(function (responses) {
 
-            var item = responses[0];
+            const item = responses[0];
             metadataEditorInfo = responses[1];
 
             currentItem = item;
 
-            var languages = metadataEditorInfo.Cultures;
-            var countries = metadataEditorInfo.Countries;
+            const languages = metadataEditorInfo.Cultures;
+            const countries = metadataEditorInfo.Countries;
 
             renderContentTypeOptions(context, metadataEditorInfo);
 
@@ -1017,8 +1075,8 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
     }
 
     function centerFocus(elem, horiz, on) {
-        require(['scrollHelper'], function (scrollHelper) {
-            var fn = on ? 'on' : 'off';
+        import('scrollHelper').then(({default: scrollHelper}) => {
+            const fn = on ? 'on' : 'off';
             scrollHelper.centerFocus[fn](elem, horiz);
         });
     }
@@ -1026,9 +1084,8 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
     function show(itemId, serverId, resolve, reject) {
         loading.show();
 
-        require(['text!./metadataEditor.template.html'], function (template) {
-
-            var dialogOptions = {
+        import('text!./metadataEditor.template.html').then(({default: template}) => {
+            const dialogOptions = {
                 removeOnClose: true,
                 scrollY: false
             };
@@ -1039,13 +1096,13 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
                 dialogOptions.size = 'small';
             }
 
-            var dlg = dialogHelper.createDialog(dialogOptions);
+            const dlg = dialogHelper.createDialog(dialogOptions);
 
             dlg.classList.add('formDialog');
 
-            var html = '';
+            let html = '';
 
-            html += globalize.translateDocument(template, 'core');
+            html += globalize.translateHtml(template, 'core');
 
             dlg.innerHTML = html;
 
@@ -1071,7 +1128,7 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
         });
     }
 
-    return {
+    export default {
         show: function (itemId, serverId) {
             return new Promise(function (resolve, reject) {
                 return show(itemId, serverId, resolve, reject);
@@ -1083,11 +1140,11 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
 
                 loading.show();
 
-                require(['text!./metadataEditor.template.html'], function (template) {
-
-                    elem.innerHTML = globalize.translateDocument(template, 'core');
+                import('text!./metadataEditor.template.html').then(({default: template}) => {
+                    elem.innerHTML = globalize.translateHtml(template, 'core');
 
                     elem.querySelector('.formDialogFooter').classList.remove('formDialogFooter');
+                    elem.querySelector('.btnClose').classList.add('hide');
                     elem.querySelector('.btnHeaderSave').classList.remove('hide');
                     elem.querySelector('.btnCancel').classList.add('hide');
 
@@ -1101,4 +1158,5 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
             });
         }
     };
-});
+
+/* eslint-enable indent */
diff --git a/src/components/metadataEditor/metadataEditor.template.html b/src/components/metadataEditor/metadataEditor.template.html
index 4b4e2cf965..aad3557bad 100644
--- a/src/components/metadataEditor/metadataEditor.template.html
+++ b/src/components/metadataEditor/metadataEditor.template.html
@@ -8,6 +8,9 @@
             <span class="material-icons check"></span>
             <span>${Save}</span>
         </button>
+        <button is="paper-icon-button-light" class="btnMore autoSize" tabindex="-1">
+            <span class="material-icons more_vert"></span>
+        </button>
         <button is="paper-icon-button-light" class="btnCancel btnClose autoSize" tabindex="-1">
             <span class="material-icons close"></span>
         </button>
diff --git a/src/components/metadataEditor/personEditor.js b/src/components/metadataEditor/personEditor.js
index fc6a0595f2..2349f40e7b 100644
--- a/src/components/metadataEditor/personEditor.js
+++ b/src/components/metadataEditor/personEditor.js
@@ -1,9 +1,17 @@
-define(['dialogHelper', 'layoutManager', 'globalize', 'require', 'paper-icon-button-light', 'emby-input', 'emby-select', 'css!./../formdialog'], function (dialogHelper, layoutManager, globalize, require) {
-    'use strict';
+import dialogHelper from 'dialogHelper';
+import layoutManager from 'layoutManager';
+import globalize from 'globalize';
+import require from 'require';
+import 'paper-icon-button-light';
+import 'emby-input';
+import 'emby-select';
+import 'css!./../formdialog';
+
+/* eslint-disable indent */
 
     function centerFocus(elem, horiz, on) {
-        require(['scrollHelper'], function (scrollHelper) {
-            var fn = on ? 'on' : 'off';
+        import('scrollHelper').then(({default: scrollHelper}) => {
+            const fn = on ? 'on' : 'off';
             scrollHelper.centerFocus[fn](elem, horiz);
         });
     }
@@ -11,9 +19,9 @@ define(['dialogHelper', 'layoutManager', 'globalize', 'require', 'paper-icon-but
     function show(person) {
         return new Promise(function (resolve, reject) {
 
-            require(['text!./personEditor.template.html'], function (template) {
+            import('text!./personEditor.template.html').then(({default: template}) => {
 
-                var dialogOptions = {
+                const dialogOptions = {
                     removeOnClose: true,
                     scrollY: false
                 };
@@ -24,14 +32,14 @@ define(['dialogHelper', 'layoutManager', 'globalize', 'require', 'paper-icon-but
                     dialogOptions.size = 'small';
                 }
 
-                var dlg = dialogHelper.createDialog(dialogOptions);
+                const dlg = dialogHelper.createDialog(dialogOptions);
 
                 dlg.classList.add('formDialog');
 
-                var html = '';
-                var submitted = false;
+                let html = '';
+                let submitted = false;
 
-                html += globalize.translateDocument(template, 'core');
+                html += globalize.translateHtml(template, 'core');
 
                 dlg.innerHTML = html;
 
@@ -93,7 +101,8 @@ define(['dialogHelper', 'layoutManager', 'globalize', 'require', 'paper-icon-but
         });
     }
 
-    return {
-        show: show
-    };
-});
+export default {
+    show: show
+};
+
+/* eslint-enable indent */
diff --git a/src/components/metadataEditor/personEditor.template.html b/src/components/metadataEditor/personEditor.template.html
index 40b29767fa..d2ad6a78d2 100644
--- a/src/components/metadataEditor/personEditor.template.html
+++ b/src/components/metadataEditor/personEditor.template.html
@@ -7,7 +7,6 @@
 
 <div class="formDialogContent smoothScrollY" style="padding-top:2em;">
     <form class="popupEditPersonForm dialogContentInner dialog-content-centered">
-
         <div class="inputContainer">
             <input type="text" is="emby-input" class="txtPersonName" required="required" label="${LabelName}" />
         </div>
@@ -23,6 +22,7 @@
                 <option value="Writer">${Writer}</option>
             </select>
         </div>
+
         <div class="inputContainer fldRole hide">
             <input is="emby-input" type="text" class="txtPersonRole" label="${LabelPersonRole}" />
             <div class="fieldDescription">${LabelPersonRoleHelp}</div>
@@ -33,6 +33,5 @@
                 <span>${Save}</span>
             </button>
         </div>
-
     </form>
 </div>
diff --git a/src/components/multiSelect/multiSelect.js b/src/components/multiSelect/multiSelect.js
index 83982413ae..87696909af 100644
--- a/src/components/multiSelect/multiSelect.js
+++ b/src/components/multiSelect/multiSelect.js
@@ -1,13 +1,20 @@
-define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'globalize', 'appRouter', 'dom', 'css!./multiSelect'], function (browser, appStorage, appHost, loading, connectionManager, globalize, appRouter, dom) {
-    'use strict';
+import browser from 'browser';
+import appHost from 'apphost';
+import loading from 'loading';
+import connectionManager from 'connectionManager';
+import globalize from 'globalize';
+import dom from 'dom';
+import 'css!./multiSelect';
 
-    var selectedItems = [];
-    var selectedElements = [];
-    var currentSelectionCommandsPanel;
+/* eslint-disable indent */
+
+    let selectedItems = [];
+    let selectedElements = [];
+    let currentSelectionCommandsPanel;
 
     function hideSelections() {
 
-        var selectionCommandsPanel = currentSelectionCommandsPanel;
+        const selectionCommandsPanel = currentSelectionCommandsPanel;
         if (selectionCommandsPanel) {
 
             selectionCommandsPanel.parentNode.removeChild(selectionCommandsPanel);
@@ -15,10 +22,10 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
 
             selectedItems = [];
             selectedElements = [];
-            var elems = document.querySelectorAll('.itemSelectionPanel');
-            for (var i = 0, length = elems.length; i < length; i++) {
+            const elems = document.querySelectorAll('.itemSelectionPanel');
+            for (let i = 0, length = elems.length; i < length; i++) {
 
-                var parent = elems[i].parentNode;
+                const parent = elems[i].parentNode;
                 parent.removeChild(elems[i]);
                 parent.classList.remove('withMultiSelect');
             }
@@ -29,14 +36,14 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
 
         // toggle the checkbox, if it wasn't clicked on
         if (!dom.parentWithClass(e.target, 'chkItemSelect')) {
-            var chkItemSelect = itemSelectionPanel.querySelector('.chkItemSelect');
+            const chkItemSelect = itemSelectionPanel.querySelector('.chkItemSelect');
 
             if (chkItemSelect) {
 
                 if (chkItemSelect.classList.contains('checkedInitial')) {
                     chkItemSelect.classList.remove('checkedInitial');
                 } else {
-                    var newValue = !chkItemSelect.checked;
+                    const newValue = !chkItemSelect.checked;
                     chkItemSelect.checked = newValue;
                     updateItemSelection(chkItemSelect, newValue);
                 }
@@ -50,11 +57,11 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
 
     function updateItemSelection(chkItemSelect, selected) {
 
-        var id = dom.parentWithAttribute(chkItemSelect, 'data-id').getAttribute('data-id');
+        const id = dom.parentWithAttribute(chkItemSelect, 'data-id').getAttribute('data-id');
 
         if (selected) {
 
-            var current = selectedItems.filter(function (i) {
+            const current = selectedItems.filter(i => {
                 return i === id;
             });
 
@@ -64,16 +71,16 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
             }
 
         } else {
-            selectedItems = selectedItems.filter(function (i) {
+            selectedItems = selectedItems.filter(i => {
                 return i !== id;
             });
-            selectedElements = selectedElements.filter(function (i) {
+            selectedElements = selectedElements.filter(i => {
                 return i !== chkItemSelect;
             });
         }
 
         if (selectedItems.length) {
-            var itemSelectionCount = document.querySelector('.itemSelectionCount');
+            const itemSelectionCount = document.querySelector('.itemSelectionCount');
             if (itemSelectionCount) {
                 itemSelectionCount.innerHTML = selectedItems.length;
             }
@@ -88,33 +95,33 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
 
     function showSelection(item, isChecked) {
 
-        var itemSelectionPanel = item.querySelector('.itemSelectionPanel');
+        let itemSelectionPanel = item.querySelector('.itemSelectionPanel');
 
         if (!itemSelectionPanel) {
 
             itemSelectionPanel = document.createElement('div');
             itemSelectionPanel.classList.add('itemSelectionPanel');
 
-            var parent = item.querySelector('.cardBox') || item.querySelector('.cardContent');
+            const parent = item.querySelector('.cardBox') || item.querySelector('.cardContent');
             parent.classList.add('withMultiSelect');
             parent.appendChild(itemSelectionPanel);
 
-            var cssClass = 'chkItemSelect';
+            let cssClass = 'chkItemSelect';
             if (isChecked && !browser.firefox) {
                 // In firefox, the initial tap hold doesnt' get treated as a click
                 // In other browsers it does, so we need to make sure that initial click is ignored
                 cssClass += ' checkedInitial';
             }
-            var checkedAttribute = isChecked ? ' checked' : '';
-            itemSelectionPanel.innerHTML = '<label class="checkboxContainer"><input type="checkbox" is="emby-checkbox" data-outlineclass="multiSelectCheckboxOutline" class="' + cssClass + '"' + checkedAttribute + '/><span></span></label>';
-            var chkItemSelect = itemSelectionPanel.querySelector('.chkItemSelect');
+            const checkedAttribute = isChecked ? ' checked' : '';
+            itemSelectionPanel.innerHTML = `<label class="checkboxContainer"><input type="checkbox" is="emby-checkbox" data-outlineclass="multiSelectCheckboxOutline" class="${cssClass}"${checkedAttribute}/><span></span></label>`;
+            const chkItemSelect = itemSelectionPanel.querySelector('.chkItemSelect');
             chkItemSelect.addEventListener('change', onSelectionChange);
         }
     }
 
     function showSelectionCommands() {
 
-        var selectionCommandsPanel = currentSelectionCommandsPanel;
+        let selectionCommandsPanel = currentSelectionCommandsPanel;
 
         if (!selectionCommandsPanel) {
 
@@ -124,19 +131,19 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
             document.body.appendChild(selectionCommandsPanel);
             currentSelectionCommandsPanel = selectionCommandsPanel;
 
-            var html = '';
+            let html = '';
 
             html += '<button is="paper-icon-button-light" class="btnCloseSelectionPanel autoSize"><span class="material-icons close"></span></button>';
             html += '<h1 class="itemSelectionCount"></h1>';
 
             const moreIcon = 'more_vert';
-            html += '<button is="paper-icon-button-light" class="btnSelectionPanelOptions autoSize" style="margin-left:auto;"><span class="material-icons ' + moreIcon + '"></span></button>';
+            html += `<button is="paper-icon-button-light" class="btnSelectionPanelOptions autoSize" style="margin-left:auto;"><span class="material-icons ${moreIcon}"></span></button>`;
 
             selectionCommandsPanel.innerHTML = html;
 
             selectionCommandsPanel.querySelector('.btnCloseSelectionPanel').addEventListener('click', hideSelections);
 
-            var btnSelectionPanelOptions = selectionCommandsPanel.querySelector('.btnSelectionPanelOptions');
+            const btnSelectionPanelOptions = selectionCommandsPanel.querySelector('.btnSelectionPanelOptions');
 
             dom.addEventListener(btnSelectionPanelOptions, 'click', showMenuForSelectedItems, { passive: true });
         }
@@ -144,9 +151,9 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
 
     function alertText(options) {
 
-        return new Promise(function (resolve, reject) {
+        return new Promise((resolve, reject) => {
 
-            require(['alert'], function (alert) {
+            import('alert').then(({default: alert}) => {
                 alert(options).then(resolve, resolve);
             });
         });
@@ -154,24 +161,24 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
 
     function deleteItems(apiClient, itemIds) {
 
-        return new Promise(function (resolve, reject) {
+        return new Promise((resolve, reject) => {
 
-            var msg = globalize.translate('ConfirmDeleteItem');
-            var title = globalize.translate('HeaderDeleteItem');
+            let msg = globalize.translate('ConfirmDeleteItem');
+            let title = globalize.translate('HeaderDeleteItem');
 
             if (itemIds.length > 1) {
                 msg = globalize.translate('ConfirmDeleteItems');
                 title = globalize.translate('HeaderDeleteItems');
             }
 
-            require(['confirm'], function (confirm) {
+            import('confirm').then(({default: confirm}) => {
 
-                confirm(msg, title).then(function () {
-                    var promises = itemIds.map(function (itemId) {
+                confirm(msg, title).then(() => {
+                    const promises = itemIds.map(itemId => {
                         apiClient.deleteItem(itemId);
                     });
 
-                    Promise.all(promises).then(resolve, function () {
+                    Promise.all(promises).then(resolve, () => {
 
                         alertText(globalize.translate('ErrorDeletingItem')).then(reject, reject);
                     });
@@ -183,11 +190,11 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
 
     function showMenuForSelectedItems(e) {
 
-        var apiClient = connectionManager.currentApiClient();
+        const apiClient = connectionManager.currentApiClient();
 
-        apiClient.getCurrentUser().then(function (user) {
+        apiClient.getCurrentUser().then(user => {
 
-            var menuItems = [];
+            const menuItems = [];
 
             menuItems.push({
                 name: globalize.translate('AddToCollection'),
@@ -244,18 +251,18 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
                 icon: 'refresh'
             });
 
-            require(['actionsheet'], function (actionsheet) {
+            import('actionsheet').then(({default: actionsheet}) => {
                 actionsheet.show({
                     items: menuItems,
                     positionTo: e.target,
                     callback: function (id) {
-                        var items = selectedItems.slice(0);
-                        var serverId = apiClient.serverInfo().Id;
+                        const items = selectedItems.slice(0);
+                        const serverId = apiClient.serverInfo().Id;
 
                         switch (id) {
                             case 'addtocollection':
-                                require(['collectionEditor'], function (collectionEditor) {
-                                    new collectionEditor().show({
+                                import('collectionEditor').then(({default: collectionEditor}) => {
+                                    new collectionEditor({
                                         items: items,
                                         serverId: serverId
                                     });
@@ -264,8 +271,8 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
                                 dispatchNeedsRefresh();
                                 break;
                             case 'playlist':
-                                require(['playlistEditor'], function (playlistEditor) {
-                                    new playlistEditor().show({
+                                import('playlistEditor').then(({default: playlistEditor}) => {
+                                    new playlistEditor({
                                         items: items,
                                         serverId: serverId
                                     });
@@ -282,21 +289,21 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
                                 combineVersions(apiClient, items);
                                 break;
                             case 'markplayed':
-                                items.forEach(function (itemId) {
+                                items.forEach(itemId => {
                                     apiClient.markPlayed(apiClient.getCurrentUserId(), itemId);
                                 });
                                 hideSelections();
                                 dispatchNeedsRefresh();
                                 break;
                             case 'markunplayed':
-                                items.forEach(function (itemId) {
+                                items.forEach(itemId => {
                                     apiClient.markUnplayed(apiClient.getCurrentUserId(), itemId);
                                 });
                                 hideSelections();
                                 dispatchNeedsRefresh();
                                 break;
                             case 'refresh':
-                                require(['refreshDialog'], function (refreshDialog) {
+                                import('refreshDialog').then(({default: refreshDialog}) => {
                                     new refreshDialog({
                                         itemIds: items,
                                         serverId: serverId
@@ -317,18 +324,18 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
 
     function dispatchNeedsRefresh() {
 
-        var elems = [];
+        const elems = [];
 
-        [].forEach.call(selectedElements, function (i) {
+        [].forEach.call(selectedElements, i => {
 
-            var container = dom.parentWithAttribute(i, 'is', 'emby-itemscontainer');
+            const container = dom.parentWithAttribute(i, 'is', 'emby-itemscontainer');
 
-            if (container && elems.indexOf(container) === -1) {
+            if (container && !elems.includes(container)) {
                 elems.push(container);
             }
         });
 
-        for (var i = 0, length = elems.length; i < length; i++) {
+        for (let i = 0, length = elems.length; i < length; i++) {
             elems[i].notifyRefreshNeeded(true);
         }
     }
@@ -337,8 +344,9 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
 
         if (selection.length < 2) {
 
-            require(['alert'], function (alert) {
+            import('alert').then(({default: alert}) => {
                 alert({
+
                     text: globalize.translate('PleaseSelectTwoItems')
                 });
             });
@@ -352,7 +360,7 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
             type: 'POST',
             url: apiClient.getUrl('Videos/MergeVersions', { Ids: selection.join(',') })
 
-        }).then(function () {
+        }).then(() => {
 
             loading.hide();
             hideSelections();
@@ -362,9 +370,9 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
 
     function showSelections(initialCard) {
 
-        require(['emby-checkbox'], function () {
-            var cards = document.querySelectorAll('.card');
-            for (var i = 0, length = cards.length; i < length; i++) {
+        import('emby-checkbox').then(() => {
+            const cards = document.querySelectorAll('.card');
+            for (let i = 0, length = cards.length; i < length; i++) {
                 showSelection(cards[i], initialCard === cards[i]);
             }
 
@@ -375,13 +383,13 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
 
     function onContainerClick(e) {
 
-        var target = e.target;
+        const target = e.target;
 
         if (selectedItems.length) {
 
-            var card = dom.parentWithClass(target, 'card');
+            const card = dom.parentWithClass(target, 'card');
             if (card) {
-                var itemSelectionPanel = card.querySelector('.itemSelectionPanel');
+                const itemSelectionPanel = card.querySelector('.itemSelectionPanel');
                 if (itemSelectionPanel) {
                     return onItemSelectionPanelClick(e, itemSelectionPanel);
                 }
@@ -395,15 +403,15 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
 
     document.addEventListener('viewbeforehide', hideSelections);
 
-    return function (options) {
+    export default function (options) {
 
-        var self = this;
+        const self = this;
 
-        var container = options.container;
+        const container = options.container;
 
         function onTapHold(e) {
 
-            var card = dom.parentWithClass(e.target, 'card');
+            const card = dom.parentWithClass(e.target, 'card');
 
             if (card) {
 
@@ -423,13 +431,13 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
             return e.changedTouches || e.targetTouches || e.touches;
         }
 
-        var touchTarget;
-        var touchStartTimeout;
-        var touchStartX;
-        var touchStartY;
+        let touchTarget;
+        let touchStartTimeout;
+        let touchStartX;
+        let touchStartY;
         function onTouchStart(e) {
 
-            var touch = getTouches(e)[0];
+            const touch = getTouches(e)[0];
             touchTarget = null;
             touchStartX = 0;
             touchStartY = 0;
@@ -437,10 +445,10 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
             if (touch) {
                 touchStartX = touch.clientX;
                 touchStartY = touch.clientY;
-                var element = touch.target;
+                const element = touch.target;
 
                 if (element) {
-                    var card = dom.parentWithClass(element, 'card');
+                    const card = dom.parentWithClass(element, 'card');
 
                     if (card) {
 
@@ -459,13 +467,13 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
         function onTouchMove(e) {
 
             if (touchTarget) {
-                var touch = getTouches(e)[0];
-                var deltaX;
-                var deltaY;
+                const touch = getTouches(e)[0];
+                let deltaX;
+                let deltaY;
 
                 if (touch) {
-                    var touchEndX = touch.clientX || 0;
-                    var touchEndY = touch.clientY || 0;
+                    const touchEndX = touch.clientX || 0;
+                    const touchEndY = touch.clientY || 0;
                     deltaX = Math.abs(touchEndX - (touchStartX || 0));
                     deltaY = Math.abs(touchEndY - (touchStartY || 0));
                 } else {
@@ -509,7 +517,7 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
                 return;
             }
 
-            var card = dom.parentWithClass(touchTarget, 'card');
+            const card = dom.parentWithClass(touchTarget, 'card');
             touchTarget = null;
 
             if (card) {
@@ -556,12 +564,12 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
 
         self.onContainerClick = onContainerClick;
 
-        self.destroy = function () {
+        self.destroy = () => {
 
             container.removeEventListener('click', onContainerClick);
             container.removeEventListener('contextmenu', onTapHold);
 
-            var element = container;
+            const element = container;
 
             dom.removeEventListener(element, 'touchstart', onTouchStart, {
                 passive: true
@@ -586,5 +594,6 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
                 passive: true
             });
         };
-    };
-});
+    }
+
+/* eslint-enable indent */
diff --git a/src/components/notifications/notifications.js b/src/components/notifications/notifications.js
index 3ac891b5e7..c8480e4f15 100644
--- a/src/components/notifications/notifications.js
+++ b/src/components/notifications/notifications.js
@@ -46,7 +46,7 @@ define(['serverNotifications', 'playbackManager', 'events', 'globalize', 'requir
     function showNonPersistentNotification(title, options, timeoutMs) {
 
         try {
-            var notif = new Notification(title, options);
+            var notif = new Notification(title, options); /* eslint-disable-line compat/compat */
 
             if (notif.show) {
                 notif.show();
diff --git a/src/components/nowPlayingBar/nowPlayingBar.css b/src/components/nowPlayingBar/nowPlayingBar.css
index b1e77715ff..a884f65769 100644
--- a/src/components/nowPlayingBar/nowPlayingBar.css
+++ b/src/components/nowPlayingBar/nowPlayingBar.css
@@ -56,8 +56,8 @@
     text-align: left;
     flex-grow: 1;
     font-size: 92%;
-    margin-right: 2.4em;
-    margin-left: 1em;
+    margin-right: 1em;
+    margin-left: 0.5em;
 }
 
 .nowPlayingBarCenter {
@@ -114,8 +114,6 @@
 
 .nowPlayingBarUserDataButtons {
     display: inline-block;
-    margin-left: 1em;
-    margin-right: 1em;
 }
 
 .nowPlayingBarPositionSlider::-webkit-slider-thumb {
@@ -133,33 +131,50 @@
     .toggleRepeatButton {
         display: none !important;
     }
-}
 
-@media all and (max-width: 62em) {
-    .nowPlayingBarCenter .nowPlayingBarCurrentTime {
+    .nowPlayingBar .btnShuffleQueue {
         display: none !important;
     }
 }
 
+@media all and (max-width: 80em) {
+    .nowPlayingBarCenter .nowPlayingBarCurrentTime,
+    .nowPlayingBarCenter .stopButton {
+        display: none !important;
+    }
+
+    .nowPlayingBarInfoContainer {
+        width: 45%;
+    }
+}
+
+.layout-mobile .nowPlayingBarRight button:not(.playPauseButton, .nextTrackButton) {
+    display: none;
+}
+
+.layout-desktop .nowPlayingBarRight .playPauseButton,
+.layout-tv .nowPlayingBarRight .playPauseButton {
+    display: none;
+}
+
+.layout-mobile .nowPlayingBarRight input,
+.layout-mobile .nowPlayingBarRight div {
+    display: none;
+}
+
 @media all and (max-width: 56em) {
     .nowPlayingBarCenter {
         display: none !important;
     }
 }
 
-@media all and (min-width: 56em) {
-    .nowPlayingBarRight .playPauseButton {
-        display: none;
-    }
-}
-
-@media all and (max-width: 36em) {
+@media all and (max-width: 60em) {
     .nowPlayingBarRight .nowPlayingBarVolumeSliderContainer {
         display: none !important;
     }
 
     .nowPlayingBarInfoContainer {
-        width: 70%;
+        width: 100%;
     }
 }
 
diff --git a/src/components/nowPlayingBar/nowPlayingBar.js b/src/components/nowPlayingBar/nowPlayingBar.js
index bc9c3c1a88..ed46131292 100644
--- a/src/components/nowPlayingBar/nowPlayingBar.js
+++ b/src/components/nowPlayingBar/nowPlayingBar.js
@@ -1,31 +1,46 @@
-define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader', 'layoutManager', 'playbackManager', 'nowPlayingHelper', 'apphost', 'dom', 'connectionManager', 'itemContextMenu', 'paper-icon-button-light', 'emby-ratingbutton'], function (require, datetime, itemHelper, events, browser, imageLoader, layoutManager, playbackManager, nowPlayingHelper, appHost, dom, connectionManager, itemContextMenu) {
-    'use strict';
+import require from 'require';
+import datetime from 'datetime';
+import itemHelper from 'itemHelper';
+import events from 'events';
+import browser from 'browser';
+import imageLoader from 'imageLoader';
+import layoutManager from 'layoutManager';
+import playbackManager from 'playbackManager';
+import nowPlayingHelper from 'nowPlayingHelper';
+import appHost from 'apphost';
+import dom from 'dom';
+import connectionManager from 'connectionManager';
+import itemContextMenu from 'itemContextMenu';
+import 'paper-icon-button-light';
+import 'emby-ratingbutton';
 
-    var currentPlayer;
-    var currentPlayerSupportedCommands = [];
+/* eslint-disable indent */
 
-    var currentTimeElement;
-    var nowPlayingImageElement;
-    var nowPlayingTextElement;
-    var nowPlayingUserData;
-    var muteButton;
-    var volumeSlider;
-    var volumeSliderContainer;
-    var playPauseButtons;
-    var positionSlider;
-    var toggleRepeatButton;
-    var toggleRepeatButtonIcon;
+    let currentPlayer;
+    let currentPlayerSupportedCommands = [];
 
-    var lastUpdateTime = 0;
-    var lastPlayerState = {};
-    var isEnabled;
-    var currentRuntimeTicks = 0;
+    let currentTimeElement;
+    let nowPlayingImageElement;
+    let nowPlayingTextElement;
+    let nowPlayingUserData;
+    let muteButton;
+    let volumeSlider;
+    let volumeSliderContainer;
+    let playPauseButtons;
+    let positionSlider;
+    let toggleRepeatButton;
+    let toggleRepeatButtonIcon;
 
-    var isVisibilityAllowed = true;
+    let lastUpdateTime = 0;
+    let lastPlayerState = {};
+    let isEnabled;
+    let currentRuntimeTicks = 0;
+
+    let isVisibilityAllowed = true;
 
     function getNowPlayingBarHtml() {
 
-        var html = '';
+        let html = '';
 
         html += '<div class="nowPlayingBar hide nowPlayingBar-hidden">';
 
@@ -47,7 +62,9 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader',
         html += '<button is="paper-icon-button-light" class="playPauseButton mediaButton"><span class="material-icons pause"></span></button>';
 
         html += '<button is="paper-icon-button-light" class="stopButton mediaButton"><span class="material-icons stop"></span></button>';
-        html += '<button is="paper-icon-button-light" class="nextTrackButton mediaButton"><span class="material-icons skip_next"></span></button>';
+        if (!layoutManager.mobile) {
+            html += '<button is="paper-icon-button-light" class="nextTrackButton mediaButton"><span class="material-icons skip_next"></span></button>';
+        }
 
         html += '<div class="nowPlayingBarCurrentTime"></div>';
         html += '</div>';
@@ -61,12 +78,17 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader',
         html += '</div>';
 
         html += '<button is="paper-icon-button-light" class="toggleRepeatButton mediaButton"><span class="material-icons repeat"></span></button>';
+        html += '<button is="paper-icon-button-light" class="btnShuffleQueue mediaButton"><span class="material-icons shuffle"></span></button>';
 
         html += '<div class="nowPlayingBarUserDataButtons">';
         html += '</div>';
 
         html += '<button is="paper-icon-button-light" class="playPauseButton mediaButton"><span class="material-icons pause"></span></button>';
-        html += '<button is="paper-icon-button-light" class="btnToggleContextMenu"><span class="material-icons more_vert"></span></button>';
+        if (layoutManager.mobile) {
+            html += '<button is="paper-icon-button-light" class="nextTrackButton mediaButton"><span class="material-icons skip_next"></span></button>';
+        } else {
+            html += '<button is="paper-icon-button-light" class="btnToggleContextMenu mediaButton"><span class="material-icons more_vert"></span></button>';
+        }
 
         html += '</div>';
         html += '</div>';
@@ -117,8 +139,13 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader',
         nowPlayingImageElement = elem.querySelector('.nowPlayingImage');
         nowPlayingTextElement = elem.querySelector('.nowPlayingBarText');
         nowPlayingUserData = elem.querySelector('.nowPlayingBarUserDataButtons');
-
+        positionSlider = elem.querySelector('.nowPlayingBarPositionSlider');
         muteButton = elem.querySelector('.muteButton');
+        playPauseButtons = elem.querySelectorAll('.playPauseButton');
+        toggleRepeatButton = elem.querySelector('.toggleRepeatButton');
+        volumeSlider = elem.querySelector('.nowPlayingBarVolumeSlider');
+        volumeSliderContainer = elem.querySelector('.nowPlayingBarVolumeSliderContainer');
+
         muteButton.addEventListener('click', function () {
 
             if (currentPlayer) {
@@ -134,7 +161,6 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader',
             }
         });
 
-        playPauseButtons = elem.querySelectorAll('.playPauseButton');
         playPauseButtons.forEach((button) => {
             button.addEventListener('click', onPlayPauseClick);
         });
@@ -146,59 +172,64 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader',
             }
         });
 
-        elem.querySelector('.previousTrackButton').addEventListener('click', function () {
+        elem.querySelector('.previousTrackButton').addEventListener('click', function (e) {
+            if (currentPlayer) {
+                if (lastPlayerState.NowPlayingItem.MediaType === 'Audio' && (currentPlayer._currentTime >= 5 || !playbackManager.previousTrack(currentPlayer))) {
+                    // Cancel this event if doubleclick is fired
+                    if (e.detail > 1 && playbackManager.previousTrack(currentPlayer)) {
+                        return;
+                    }
+                    playbackManager.seekPercent(0, currentPlayer);
+                    // This is done automatically by playbackManager, however, setting this here gives instant visual feedback.
+                    // TODO: Check why seekPercentage doesn't reflect the changes inmmediately, so we can remove this workaround.
+                    positionSlider.value = 0;
+                } else {
+                    playbackManager.previousTrack(currentPlayer);
+                }
+            }
+        });
 
+        elem.querySelector('.previousTrackButton').addEventListener('dblclick', function () {
             if (currentPlayer) {
                 playbackManager.previousTrack(currentPlayer);
             }
         });
 
+        elem.querySelector('.btnShuffleQueue').addEventListener('click', function () {
+            if (currentPlayer) {
+                playbackManager.toggleQueueShuffleMode();
+            }
+        });
+
         toggleRepeatButton = elem.querySelector('.toggleRepeatButton');
         toggleRepeatButton.addEventListener('click', function () {
-
-            if (currentPlayer) {
-
-                switch (playbackManager.getRepeatMode(currentPlayer)) {
-                    case 'RepeatAll':
-                        playbackManager.setRepeatMode('RepeatOne', currentPlayer);
-                        break;
-                    case 'RepeatOne':
-                        playbackManager.setRepeatMode('RepeatNone', currentPlayer);
-                        break;
-                    default:
-                        playbackManager.setRepeatMode('RepeatAll', currentPlayer);
-                        break;
-                }
+            switch (playbackManager.getRepeatMode()) {
+                case 'RepeatAll':
+                    playbackManager.setRepeatMode('RepeatOne');
+                    break;
+                case 'RepeatOne':
+                    playbackManager.setRepeatMode('RepeatNone');
+                    break;
+                case 'RepeatNone':
+                    playbackManager.setRepeatMode('RepeatAll');
             }
         });
 
         toggleRepeatButtonIcon = toggleRepeatButton.querySelector('.material-icons');
 
-        volumeSlider = elem.querySelector('.nowPlayingBarVolumeSlider');
-        volumeSliderContainer = elem.querySelector('.nowPlayingBarVolumeSliderContainer');
+        volumeSliderContainer.classList.toggle('hide', appHost.supports('physicalvolumecontrol'));
 
-        if (appHost.supports('physicalvolumecontrol')) {
-            volumeSliderContainer.classList.add('hide');
-        } else {
-            volumeSliderContainer.classList.remove('hide');
-        }
-
-        function setVolume() {
+        volumeSlider.addEventListener('input', (e) => {
             if (currentPlayer) {
-                currentPlayer.setVolume(this.value);
+                currentPlayer.setVolume(e.target.value);
             }
-        }
+        });
 
-        volumeSlider.addEventListener('change', setVolume);
-        volumeSlider.addEventListener('mousemove', setVolume);
-        volumeSlider.addEventListener('touchmove', setVolume);
-
-        positionSlider = elem.querySelector('.nowPlayingBarPositionSlider');
         positionSlider.addEventListener('change', function () {
 
             if (currentPlayer) {
 
-                var newPercent = parseFloat(this.value);
+                const newPercent = parseFloat(this.value);
 
                 playbackManager.seekPercent(newPercent, currentPlayer);
             }
@@ -207,13 +238,13 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader',
 
         positionSlider.getBubbleText = function (value) {
 
-            var state = lastPlayerState;
+            const state = lastPlayerState;
 
             if (!state || !state.NowPlayingItem || !currentRuntimeTicks) {
                 return '--:--';
             }
 
-            var ticks = currentRuntimeTicks;
+            let ticks = currentRuntimeTicks;
             ticks /= 100;
             ticks *= value;
 
@@ -230,12 +261,12 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader',
 
     function showRemoteControl() {
 
-        require(['appRouter'], function (appRouter) {
+        import('appRouter').then(({default: appRouter}) => {
             appRouter.showNowPlaying();
         });
     }
 
-    var nowPlayingBarElement;
+    let nowPlayingBarElement;
     function getNowPlayingBar() {
 
         if (nowPlayingBarElement) {
@@ -243,10 +274,14 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader',
         }
 
         return new Promise(function (resolve, reject) {
-
-            require(['appFooter-shared', 'itemShortcuts', 'css!./nowPlayingBar.css', 'emby-slider'], function (appfooter, itemShortcuts) {
-
-                var parentContainer = appfooter.element;
+            Promise.all([
+                import('appFooter-shared'),
+                import('itemShortcuts'),
+                import('css!./nowPlayingBar.css'),
+                import('emby-slider')
+            ])
+            .then(([appfooter, itemShortcuts]) => {
+                const parentContainer = appfooter.element;
                 nowPlayingBarElement = parentContainer.querySelector('.nowPlayingBar');
 
                 if (nowPlayingBarElement) {
@@ -257,6 +292,11 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader',
                 parentContainer.insertAdjacentHTML('afterbegin', getNowPlayingBarHtml());
                 nowPlayingBarElement = parentContainer.querySelector('.nowPlayingBar');
 
+                if (layoutManager.mobile) {
+                    hideButton(nowPlayingBarElement.querySelector('.btnShuffleQueue'));
+                    hideButton(nowPlayingBarElement.querySelector('.nowPlayingBarCenter'));
+                }
+
                 if (browser.safari && browser.slow) {
                     // Not handled well here. The wrong elements receive events, bar doesn't update quickly enough, etc.
                     nowPlayingBarElement.classList.add('noMediaProgress');
@@ -294,13 +334,13 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader',
 
         lastPlayerState = state;
 
-        var playerInfo = playbackManager.getPlayerInfo();
+        const playerInfo = playbackManager.getPlayerInfo();
 
-        var playState = state.PlayState || {};
+        const playState = state.PlayState || {};
 
         updatePlayPauseState(playState.IsPaused);
 
-        var supportedCommands = playerInfo.supportedCommands;
+        const supportedCommands = playerInfo.supportedCommands;
         currentPlayerSupportedCommands = supportedCommands;
 
         if (supportedCommands.indexOf('SetRepeatMode') === -1) {
@@ -309,7 +349,8 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader',
             toggleRepeatButton.classList.remove('hide');
         }
 
-        updateRepeatModeDisplay(playState.RepeatMode);
+        updateRepeatModeDisplay(playbackManager.getRepeatMode());
+        onQueueShuffleModeChange();
 
         updatePlayerVolumeState(playState.IsMuted, playState.VolumeLevel);
 
@@ -317,11 +358,11 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader',
             positionSlider.disabled = !playState.CanSeek;
 
             // determines if both forward and backward buffer progress will be visible
-            var isProgressClear = state.MediaSource && state.MediaSource.RunTimeTicks == null;
+            const isProgressClear = state.MediaSource && state.MediaSource.RunTimeTicks == null;
             positionSlider.setIsClear(isProgressClear);
         }
 
-        var nowPlayingItem = state.NowPlayingItem || {};
+        const nowPlayingItem = state.NowPlayingItem || {};
         updateTimeDisplay(playState.PositionTicks, nowPlayingItem.RunTimeTicks, playbackManager.getBufferedRanges(player));
 
         updateNowPlayingInfo(state);
@@ -329,32 +370,34 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader',
 
     function updateRepeatModeDisplay(repeatMode) {
         toggleRepeatButtonIcon.classList.remove('repeat', 'repeat_one');
+        const cssClass = 'buttonActive';
 
-        if (repeatMode === 'RepeatAll') {
-            toggleRepeatButtonIcon.classList.add('repeat');
-            toggleRepeatButton.classList.add('repeatButton-active');
-        } else if (repeatMode === 'RepeatOne') {
-            toggleRepeatButtonIcon.classList.add('repeat_one');
-            toggleRepeatButton.classList.add('repeatButton-active');
-        } else {
-            toggleRepeatButtonIcon.classList.add('repeat');
-            toggleRepeatButton.classList.remove('repeatButton-active');
+        switch (repeatMode) {
+            case 'RepeatAll':
+                toggleRepeatButtonIcon.classList.add('repeat');
+                toggleRepeatButton.classList.add(cssClass);
+                break;
+            case 'RepeatOne':
+                toggleRepeatButtonIcon.classList.add('repeat_one');
+                toggleRepeatButton.classList.add(cssClass);
+                break;
+            case 'RepeatNone':
+            default:
+                toggleRepeatButtonIcon.classList.add('repeat');
+                toggleRepeatButton.classList.remove(cssClass);
+                break;
         }
     }
 
     function updateTimeDisplay(positionTicks, runtimeTicks, bufferedRanges) {
-
         // See bindEvents for why this is necessary
         if (positionSlider && !positionSlider.dragging) {
             if (runtimeTicks) {
-
-                var pct = positionTicks / runtimeTicks;
+                let pct = positionTicks / runtimeTicks;
                 pct *= 100;
 
                 positionSlider.value = pct;
-
             } else {
-
                 positionSlider.value = 0;
             }
         }
@@ -364,9 +407,7 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader',
         }
 
         if (currentTimeElement) {
-
-            var timeText = positionTicks == null ? '--:--' : datetime.getDisplayRunningTime(positionTicks);
-
+            let timeText = positionTicks == null ? '--:--' : datetime.getDisplayRunningTime(positionTicks);
             if (runtimeTicks) {
                 timeText += ' / ' + datetime.getDisplayRunningTime(runtimeTicks);
             }
@@ -377,10 +418,10 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader',
 
     function updatePlayerVolumeState(isMuted, volumeLevel) {
 
-        var supportedCommands = currentPlayerSupportedCommands;
+        const supportedCommands = currentPlayerSupportedCommands;
 
-        var showMuteButton = true;
-        var showVolumeSlider = true;
+        let showMuteButton = true;
+        let showVolumeSlider = true;
 
         if (supportedCommands.indexOf('ToggleMute') === -1) {
             showMuteButton = false;
@@ -408,11 +449,7 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader',
         // See bindEvents for why this is necessary
         if (volumeSlider) {
 
-            if (showVolumeSlider) {
-                volumeSliderContainer.classList.remove('hide');
-            } else {
-                volumeSliderContainer.classList.add('hide');
-            }
+            volumeSliderContainer.classList.toggle('hide', !showVolumeSlider);
 
             if (!volumeSlider.dragging) {
                 volumeSlider.value = volumeLevel || 0;
@@ -420,15 +457,6 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader',
         }
     }
 
-    function getTextActionButton(item, text) {
-
-        if (!text) {
-            text = itemHelper.getDisplayName(item);
-        }
-
-        return `<a>${text}</a>`;
-    }
-
     function seriesImageUrl(item, options) {
 
         if (!item) {
@@ -495,37 +523,44 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader',
         return null;
     }
 
-    var currentImgUrl;
+    let currentImgUrl;
     function updateNowPlayingInfo(state) {
 
-        var nowPlayingItem = state.NowPlayingItem;
+        const nowPlayingItem = state.NowPlayingItem;
 
-        var textLines = nowPlayingItem ? nowPlayingHelper.getNowPlayingNames(nowPlayingItem) : [];
-        if (textLines.length > 1) {
-            textLines[1].secondary = true;
-        }
-        nowPlayingTextElement.innerHTML = textLines.map(function (nowPlayingName) {
-
-            var cssClass = nowPlayingName.secondary ? ' class="nowPlayingBarSecondaryText"' : '';
-
-            if (nowPlayingName.item) {
-                var nowPlayingText = getTextActionButton(nowPlayingName.item, nowPlayingName.text);
-                return `<div ${cssClass}>${nowPlayingText}</div>`;
+        const textLines = nowPlayingItem ? nowPlayingHelper.getNowPlayingNames(nowPlayingItem) : [];
+        nowPlayingTextElement.innerHTML = '';
+        if (textLines) {
+            let itemText = document.createElement('div');
+            let secondaryText = document.createElement('div');
+            secondaryText.classList.add('nowPlayingBarSecondaryText');
+            if (textLines.length > 1) {
+                textLines[1].secondary = true;
+                if (textLines[1].text) {
+                    let text = document.createElement('a');
+                    text.innerHTML = textLines[1].text;
+                    secondaryText.appendChild(text);
+                }
             }
 
-            return `<div ${cssClass}>${nowPlayingText}</div>`;
+            if (textLines[0].text) {
+                let text = document.createElement('a');
+                text.innerHTML = textLines[0].text;
+                itemText.appendChild(text);
+            }
+            nowPlayingTextElement.appendChild(itemText);
+            nowPlayingTextElement.appendChild(secondaryText);
+        }
 
-        }).join('');
+        const imgHeight = 70;
 
-        var imgHeight = 70;
-
-        var url = nowPlayingItem ? (seriesImageUrl(nowPlayingItem, {
+        const url = nowPlayingItem ? (seriesImageUrl(nowPlayingItem, {
             height: imgHeight
         }) || imageUrl(nowPlayingItem, {
             height: imgHeight
         })) : null;
 
-        var isRefreshing = false;
+        let isRefreshing = false;
 
         if (url !== currentImgUrl) {
             currentImgUrl = url;
@@ -533,33 +568,44 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader',
 
             if (url) {
                 imageLoader.lazyImage(nowPlayingImageElement, url);
+                nowPlayingImageElement.style.display = null;
+                nowPlayingTextElement.style.marginLeft = null;
             } else {
                 nowPlayingImageElement.style.backgroundImage = '';
+                nowPlayingImageElement.style.display = 'none';
+                nowPlayingTextElement.style.marginLeft = '1em';
             }
         }
 
         if (nowPlayingItem.Id) {
             if (isRefreshing) {
 
-                var apiClient = connectionManager.getApiClient(nowPlayingItem.ServerId);
+                const apiClient = connectionManager.getApiClient(nowPlayingItem.ServerId);
                 apiClient.getItem(apiClient.getCurrentUserId(), nowPlayingItem.Id).then(function (item) {
-                    var userData = item.UserData || {};
-                    var likes = userData.Likes == null ? '' : userData.Likes;
-                    var contextButton = document.querySelector('.btnToggleContextMenu');
-                    var options = {
-                        play: false,
-                        queue: false,
-                        positionTo: contextButton
-                    };
-                    nowPlayingUserData.innerHTML = '<button is="emby-ratingbutton" type="button" class="listItemButton mediaButton paper-icon-button-light" data-id="' + item.Id + '" data-serverid="' + item.ServerId + '" data-itemtype="' + item.Type + '" data-likes="' + likes + '" data-isfavorite="' + (userData.IsFavorite) + '"><span class="material-icons favorite"></span></button>';
-                    apiClient.getCurrentUser().then(function(user) {
-                        contextButton.addEventListener('click', function () {
-                            itemContextMenu.show(Object.assign({
-                                item: item,
-                                user: user
-                            }, options ));
+                    const userData = item.UserData || {};
+                    const likes = userData.Likes == null ? '' : userData.Likes;
+                    if (!layoutManager.mobile) {
+                        let contextButton = nowPlayingBarElement.querySelector('.btnToggleContextMenu');
+                        // We remove the previous event listener by replacing the item in each update event
+                        let contextButtonClone = contextButton.cloneNode(true);
+                        contextButton.parentNode.replaceChild(contextButtonClone, contextButton);
+                        contextButton = nowPlayingBarElement.querySelector('.btnToggleContextMenu');
+                        let options = {
+                            play: false,
+                            queue: false,
+                            clearQueue: true,
+                            positionTo: contextButton
+                        };
+                        apiClient.getCurrentUser().then(function (user) {
+                            contextButton.addEventListener('click', function () {
+                                itemContextMenu.show(Object.assign({
+                                    item: item,
+                                    user: user
+                                }, options));
+                            });
                         });
-                    });
+                    }
+                    nowPlayingUserData.innerHTML = '<button is="emby-ratingbutton" type="button" class="listItemButton mediaButton paper-icon-button-light" data-id="' + item.Id + '" data-serverid="' + item.ServerId + '" data-itemtype="' + item.Type + '" data-likes="' + likes + '" data-isfavorite="' + (userData.IsFavorite) + '"><span class="material-icons favorite"></span></button>';
                 });
             }
         } else {
@@ -569,25 +615,39 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader',
 
     function onPlaybackStart(e, state) {
         console.debug('nowplaying event: ' + e.type);
-
         var player = this;
-
         onStateChanged.call(player, e, state);
     }
 
-    function onRepeatModeChange(e) {
-
+    function onRepeatModeChange() {
         if (!isEnabled) {
             return;
         }
 
-        var player = this;
+        updateRepeatModeDisplay(playbackManager.getRepeatMode());
+    }
 
-        updateRepeatModeDisplay(playbackManager.getRepeatMode(player));
+    function onQueueShuffleModeChange() {
+        if (!isEnabled) {
+            return;
+        }
+
+        let shuffleMode = playbackManager.getQueueShuffleMode();
+        let context = nowPlayingBarElement;
+        const cssClass = 'buttonActive';
+        let toggleShuffleButton = context.querySelector('.btnShuffleQueue');
+        switch (shuffleMode) {
+            case 'Shuffle':
+                toggleShuffleButton.classList.add(cssClass);
+                break;
+            case 'Sorted':
+            default:
+                toggleShuffleButton.classList.remove(cssClass);
+                break;
+        }
     }
 
     function showNowPlayingBar() {
-
         if (!isVisibilityAllowed) {
             hideNowPlayingBar();
             return;
@@ -604,7 +664,7 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader',
         // in the event of a stop->play command
 
         // Don't call getNowPlayingBar here because we don't want to end up creating it just to hide it
-        var elem = document.getElementsByClassName('nowPlayingBar')[0];
+        const elem = document.getElementsByClassName('nowPlayingBar')[0];
         if (elem) {
 
             slideDown(elem);
@@ -614,7 +674,7 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader',
     function onPlaybackStopped(e, state) {
 
         console.debug('nowplaying event: ' + e.type);
-        var player = this;
+        const player = this;
 
         if (player.isLocalPlayer) {
             if (state.NextMediaType !== 'Audio') {
@@ -633,14 +693,14 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader',
             return;
         }
 
-        var player = this;
+        const player = this;
         updatePlayPauseState(player.paused());
     }
 
     function onStateChanged(event, state) {
 
         console.debug('nowplaying event: ' + event.type);
-        var player = this;
+        const player = this;
 
         if (!state.NowPlayingItem || layoutManager.tv) {
             hideNowPlayingBar();
@@ -671,26 +731,27 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader',
         }
 
         // Try to avoid hammering the document with changes
-        var now = new Date().getTime();
+        const now = new Date().getTime();
         if ((now - lastUpdateTime) < 700) {
 
             return;
         }
         lastUpdateTime = now;
 
-        var player = this;
+        const player = this;
         currentRuntimeTicks = playbackManager.duration(player);
         updateTimeDisplay(playbackManager.currentTime(player), currentRuntimeTicks, playbackManager.getBufferedRanges(player));
     }
 
     function releaseCurrentPlayer() {
 
-        var player = currentPlayer;
+        const player = currentPlayer;
 
         if (player) {
             events.off(player, 'playbackstart', onPlaybackStart);
             events.off(player, 'statechange', onPlaybackStart);
             events.off(player, 'repeatmodechange', onRepeatModeChange);
+            events.off(player, 'shufflequeuemodechange', onQueueShuffleModeChange);
             events.off(player, 'playbackstop', onPlaybackStopped);
             events.off(player, 'volumechange', onVolumeChanged);
             events.off(player, 'pause', onPlayPauseStateChanged);
@@ -708,14 +769,14 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader',
             return;
         }
 
-        var player = this;
+        const player = this;
 
         updatePlayerVolumeState(player.isMuted(), player.getVolume());
     }
 
     function refreshFromPlayer(player) {
 
-        var state = playbackManager.getPlayerState(player);
+        const state = playbackManager.getPlayerState(player);
 
         onStateChanged.call(player, { type: 'init' }, state);
     }
@@ -739,6 +800,7 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader',
         events.on(player, 'playbackstart', onPlaybackStart);
         events.on(player, 'statechange', onPlaybackStart);
         events.on(player, 'repeatmodechange', onRepeatModeChange);
+        events.on(player, 'shufflequeuemodechange', onQueueShuffleModeChange);
         events.on(player, 'playbackstop', onPlaybackStopped);
         events.on(player, 'volumechange', onVolumeChanged);
         events.on(player, 'pause', onPlayPauseStateChanged);
@@ -771,4 +833,5 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader',
             }
         }
     });
-});
+
+/* eslint-enable indent */
diff --git a/src/components/packagemanager.js b/src/components/packageManager.js
similarity index 100%
rename from src/components/packagemanager.js
rename to src/components/packageManager.js
diff --git a/src/components/playback/brightnessosd.js b/src/components/playback/brightnessosd.js
index 5ed2b8f81f..5f3becd64b 100644
--- a/src/components/playback/brightnessosd.js
+++ b/src/components/playback/brightnessosd.js
@@ -1,171 +1,171 @@
-define(['events', 'playbackManager', 'dom', 'browser', 'css!./iconosd', 'material-icons'], function (events, playbackManager, dom, browser) {
-    'use strict';
+import events from 'events';
+import playbackManager from 'playbackManager';
+import dom from 'dom';
+import browser from 'browser';
+import 'css!./iconosd';
+import 'material-icons';
 
-    var currentPlayer;
-    var osdElement;
-    var iconElement;
-    var progressElement;
+var currentPlayer;
+var osdElement;
+var iconElement;
+var progressElement;
 
-    var enableAnimation;
+var enableAnimation;
 
-    function getOsdElementHtml() {
-        var html = '';
+function getOsdElementHtml() {
+    var html = '';
 
-        html += '<span class="material-icons iconOsdIcon brightness_high"></span>';
+    html += '<span class="material-icons iconOsdIcon brightness_high"></span>';
 
-        html += '<div class="iconOsdProgressOuter"><div class="iconOsdProgressInner brightnessOsdProgressInner"></div></div>';
+    html += '<div class="iconOsdProgressOuter"><div class="iconOsdProgressInner brightnessOsdProgressInner"></div></div>';
 
-        return html;
+    return html;
+}
+
+function ensureOsdElement() {
+
+    var elem = osdElement;
+    if (!elem) {
+
+        enableAnimation = browser.supportsCssAnimation();
+
+        elem = document.createElement('div');
+        elem.classList.add('hide');
+        elem.classList.add('iconOsd');
+        elem.classList.add('iconOsd-hidden');
+        elem.classList.add('brightnessOsd');
+        elem.innerHTML = getOsdElementHtml();
+
+        iconElement = elem.querySelector('.material-icons');
+        progressElement = elem.querySelector('.iconOsdProgressInner');
+
+        document.body.appendChild(elem);
+        osdElement = elem;
     }
+}
 
-    function ensureOsdElement() {
+function onHideComplete() {
+    this.classList.add('hide');
+}
 
-        var elem = osdElement;
-        if (!elem) {
+var hideTimeout;
+function showOsd() {
 
-            enableAnimation = browser.supportsCssAnimation();
+    clearHideTimeout();
 
-            elem = document.createElement('div');
-            elem.classList.add('hide');
-            elem.classList.add('iconOsd');
-            elem.classList.add('iconOsd-hidden');
-            elem.classList.add('brightnessOsd');
-            elem.innerHTML = getOsdElementHtml();
+    var elem = osdElement;
 
-            iconElement = elem.querySelector('.material-icons');
-            progressElement = elem.querySelector('.iconOsdProgressInner');
-
-            document.body.appendChild(elem);
-            osdElement = elem;
-        }
-    }
-
-    function onHideComplete() {
-        this.classList.add('hide');
-    }
-
-    var hideTimeout;
-    function showOsd() {
-
-        clearHideTimeout();
-
-        var elem = osdElement;
-
-        dom.removeEventListener(elem, dom.whichTransitionEvent(), onHideComplete, {
-            once: true
-        });
-
-        elem.classList.remove('hide');
-
-        // trigger reflow
-        void elem.offsetWidth;
-
-        requestAnimationFrame(function () {
-            elem.classList.remove('iconOsd-hidden');
-
-            hideTimeout = setTimeout(hideOsd, 3000);
-        });
-    }
-
-    function clearHideTimeout() {
-        if (hideTimeout) {
-            clearTimeout(hideTimeout);
-            hideTimeout = null;
-        }
-    }
-
-    function hideOsd() {
-
-        clearHideTimeout();
-
-        var elem = osdElement;
-        if (elem) {
-
-            if (enableAnimation) {
-                // trigger reflow
-                void elem.offsetWidth;
-
-                requestAnimationFrame(function () {
-                    elem.classList.add('iconOsd-hidden');
-
-                    dom.addEventListener(elem, dom.whichTransitionEvent(), onHideComplete, {
-                        once: true
-                    });
-                });
-            } else {
-                onHideComplete.call(elem);
-            }
-        }
-    }
-
-    function setIcon(iconElement, icon) {
-        iconElement.classList.remove('brightness_high');
-        iconElement.classList.remove('brightness_medium');
-        iconElement.classList.remove('brightness_low');
-        iconElement.classList.add(icon);
-    }
-
-    function updateElementsFromPlayer(brightness) {
-
-        if (iconElement) {
-            if (brightness >= 80) {
-                setIcon(iconElement, 'brightness_high');
-            } else if (brightness >= 20) {
-                setIcon(iconElement, 'brightness_medium');
-            } else {
-                setIcon(iconElement, 'brightness_low');
-            }
-        }
-        if (progressElement) {
-            progressElement.style.width = (brightness || 0) + '%';
-        }
-    }
-
-    function releaseCurrentPlayer() {
-
-        var player = currentPlayer;
-
-        if (player) {
-            events.off(player, 'brightnesschange', onBrightnessChanged);
-            events.off(player, 'playbackstop', hideOsd);
-            currentPlayer = null;
-        }
-    }
-
-    function onBrightnessChanged(e) {
-
-        var player = this;
-
-        ensureOsdElement();
-
-        updateElementsFromPlayer(playbackManager.getBrightness(player));
-
-        showOsd();
-    }
-
-    function bindToPlayer(player) {
-
-        if (player === currentPlayer) {
-            return;
-        }
-
-        releaseCurrentPlayer();
-
-        currentPlayer = player;
-
-        if (!player) {
-            return;
-        }
-
-        hideOsd();
-        events.on(player, 'brightnesschange', onBrightnessChanged);
-        events.on(player, 'playbackstop', hideOsd);
-    }
-
-    events.on(playbackManager, 'playerchange', function () {
-        bindToPlayer(playbackManager.getCurrentPlayer());
+    dom.removeEventListener(elem, dom.whichTransitionEvent(), onHideComplete, {
+        once: true
     });
 
-    bindToPlayer(playbackManager.getCurrentPlayer());
+    elem.classList.remove('hide');
 
+    // trigger reflow
+    void elem.offsetWidth;
+
+    requestAnimationFrame(function () {
+        elem.classList.remove('iconOsd-hidden');
+
+        hideTimeout = setTimeout(hideOsd, 3000);
+    });
+}
+
+function clearHideTimeout() {
+    if (hideTimeout) {
+        clearTimeout(hideTimeout);
+        hideTimeout = null;
+    }
+}
+
+function hideOsd() {
+
+    clearHideTimeout();
+
+    var elem = osdElement;
+    if (elem) {
+
+        if (enableAnimation) {
+            // trigger reflow
+            void elem.offsetWidth;
+
+            requestAnimationFrame(function () {
+                elem.classList.add('iconOsd-hidden');
+
+                dom.addEventListener(elem, dom.whichTransitionEvent(), onHideComplete, {
+                    once: true
+                });
+            });
+        } else {
+            onHideComplete.call(elem);
+        }
+    }
+}
+
+function setIcon(iconElement, icon) {
+    iconElement.classList.remove('brightness_high', 'brightness_medium', 'brightness_low');
+    iconElement.classList.add(icon);
+}
+
+function updateElementsFromPlayer(brightness) {
+
+    if (iconElement) {
+        if (brightness >= 80) {
+            setIcon(iconElement, 'brightness_high');
+        } else if (brightness >= 20) {
+            setIcon(iconElement, 'brightness_medium');
+        } else {
+            setIcon(iconElement, 'brightness_low');
+        }
+    }
+    if (progressElement) {
+        progressElement.style.width = (brightness || 0) + '%';
+    }
+}
+
+function releaseCurrentPlayer() {
+
+    var player = currentPlayer;
+
+    if (player) {
+        events.off(player, 'brightnesschange', onBrightnessChanged);
+        events.off(player, 'playbackstop', hideOsd);
+        currentPlayer = null;
+    }
+}
+
+function onBrightnessChanged(e) {
+
+    var player = this;
+
+    ensureOsdElement();
+
+    updateElementsFromPlayer(playbackManager.getBrightness(player));
+
+    showOsd();
+}
+
+function bindToPlayer(player) {
+
+    if (player === currentPlayer) {
+        return;
+    }
+
+    releaseCurrentPlayer();
+
+    currentPlayer = player;
+
+    if (!player) {
+        return;
+    }
+
+    hideOsd();
+    events.on(player, 'brightnesschange', onBrightnessChanged);
+    events.on(player, 'playbackstop', hideOsd);
+}
+
+events.on(playbackManager, 'playerchange', function () {
+    bindToPlayer(playbackManager.getCurrentPlayer());
 });
+
+bindToPlayer(playbackManager.getCurrentPlayer());
diff --git a/src/components/playback/mediasession.js b/src/components/playback/mediasession.js
index 2dd10b3484..0f275c88f7 100644
--- a/src/components/playback/mediasession.js
+++ b/src/components/playback/mediasession.js
@@ -119,6 +119,7 @@ import connectionManager from 'connectionManager';
         const canSeek = playState.CanSeek || false;
 
         if ('mediaSession' in navigator) {
+             /* eslint-disable-next-line compat/compat */
             navigator.mediaSession.metadata = new MediaMetadata({
                 title: title,
                 artist: artist,
@@ -179,6 +180,7 @@ import connectionManager from 'connectionManager';
 
     function hideMediaControls() {
         if ('mediaSession' in navigator) {
+             /* eslint-disable-next-line compat/compat */
             navigator.mediaSession.metadata = null;
         } else {
             window.NativeShell.hideMediaSession();
@@ -210,29 +212,44 @@ import connectionManager from 'connectionManager';
     }
 
     if ('mediaSession' in navigator) {
+        /* eslint-disable-next-line compat/compat */
         navigator.mediaSession.setActionHandler('previoustrack', function () {
             execute('previousTrack');
         });
 
+        /* eslint-disable-next-line compat/compat */
         navigator.mediaSession.setActionHandler('nexttrack', function () {
             execute('nextTrack');
         });
 
+        /* eslint-disable-next-line compat/compat */
         navigator.mediaSession.setActionHandler('play', function () {
             execute('unpause');
         });
 
+        /* eslint-disable-next-line compat/compat */
         navigator.mediaSession.setActionHandler('pause', function () {
             execute('pause');
         });
 
+        /* eslint-disable-next-line compat/compat */
         navigator.mediaSession.setActionHandler('seekbackward', function () {
             execute('rewind');
         });
 
+        /* eslint-disable-next-line compat/compat */
         navigator.mediaSession.setActionHandler('seekforward', function () {
             execute('fastForward');
         });
+
+        /* eslint-disable-next-line compat/compat */
+        navigator.mediaSession.setActionHandler('seekto', function (object) {
+            let item = playbackManager.getPlayerState(currentPlayer).NowPlayingItem;
+            // Convert to ms
+            let duration = parseInt(item.RunTimeTicks ? (item.RunTimeTicks / 10000) : 0);
+            let wantedTime = object.seekTime * 1000;
+            playbackManager.seekPercent(wantedTime / duration * 100, currentPlayer);
+        });
     }
 
     events.on(playbackManager, 'playerchange', function () {
diff --git a/src/components/playback/nowplayinghelper.js b/src/components/playback/nowplayinghelper.js
index 9bba23c294..310edc03c3 100644
--- a/src/components/playback/nowplayinghelper.js
+++ b/src/components/playback/nowplayinghelper.js
@@ -1,86 +1,82 @@
-define([], function () {
-    'use strict';
+export function getNowPlayingNames(nowPlayingItem, includeNonNameInfo) {
 
-    function getNowPlayingNames(nowPlayingItem, includeNonNameInfo) {
+    var topItem = nowPlayingItem;
+    var bottomItem = null;
+    var topText = nowPlayingItem.Name;
 
-        var topItem = nowPlayingItem;
-        var bottomItem = null;
-        var topText = nowPlayingItem.Name;
-
-        if (nowPlayingItem.AlbumId && nowPlayingItem.MediaType === 'Audio') {
-            topItem = {
-                Id: nowPlayingItem.AlbumId,
-                Name: nowPlayingItem.Album,
-                Type: 'MusicAlbum',
-                IsFolder: true
-            };
-        }
-
-        if (nowPlayingItem.MediaType === 'Video') {
-            if (nowPlayingItem.IndexNumber != null) {
-                topText = nowPlayingItem.IndexNumber + ' - ' + topText;
-            }
-            if (nowPlayingItem.ParentIndexNumber != null) {
-                topText = nowPlayingItem.ParentIndexNumber + '.' + topText;
-            }
-        }
-
-        var bottomText = '';
-
-        if (nowPlayingItem.ArtistItems && nowPlayingItem.ArtistItems.length) {
-
-            bottomItem = {
-                Id: nowPlayingItem.ArtistItems[0].Id,
-                Name: nowPlayingItem.ArtistItems[0].Name,
-                Type: 'MusicArtist',
-                IsFolder: true
-            };
-
-            bottomText = nowPlayingItem.ArtistItems.map(function (a) {
-                return a.Name;
-            }).join(', ');
-
-        } else if (nowPlayingItem.Artists && nowPlayingItem.Artists.length) {
-
-            bottomText = nowPlayingItem.Artists.join(', ');
-        } else if (nowPlayingItem.SeriesName || nowPlayingItem.Album) {
-            bottomText = topText;
-            topText = nowPlayingItem.SeriesName || nowPlayingItem.Album;
-
-            bottomItem = topItem;
-
-            if (nowPlayingItem.SeriesId) {
-                topItem = {
-                    Id: nowPlayingItem.SeriesId,
-                    Name: nowPlayingItem.SeriesName,
-                    Type: 'Series',
-                    IsFolder: true
-                };
-            } else {
-                topItem = null;
-            }
-        } else if (nowPlayingItem.ProductionYear && includeNonNameInfo !== false) {
-            bottomText = nowPlayingItem.ProductionYear;
-        }
-
-        var list = [];
-
-        list.push({
-            text: topText,
-            item: topItem
-        });
-
-        if (bottomText) {
-            list.push({
-                text: bottomText,
-                item: bottomItem
-            });
-        }
-
-        return list;
+    if (nowPlayingItem.AlbumId && nowPlayingItem.MediaType === 'Audio') {
+        topItem = {
+            Id: nowPlayingItem.AlbumId,
+            Name: nowPlayingItem.Album,
+            Type: 'MusicAlbum',
+            IsFolder: true
+        };
     }
 
-    return {
-        getNowPlayingNames: getNowPlayingNames
-    };
-});
+    if (nowPlayingItem.MediaType === 'Video') {
+        if (nowPlayingItem.IndexNumber != null) {
+            topText = nowPlayingItem.IndexNumber + ' - ' + topText;
+        }
+        if (nowPlayingItem.ParentIndexNumber != null) {
+            topText = nowPlayingItem.ParentIndexNumber + '.' + topText;
+        }
+    }
+
+    var bottomText = '';
+
+    if (nowPlayingItem.ArtistItems && nowPlayingItem.ArtistItems.length) {
+
+        bottomItem = {
+            Id: nowPlayingItem.ArtistItems[0].Id,
+            Name: nowPlayingItem.ArtistItems[0].Name,
+            Type: 'MusicArtist',
+            IsFolder: true
+        };
+
+        bottomText = nowPlayingItem.ArtistItems.map(function (a) {
+            return a.Name;
+        }).join(', ');
+
+    } else if (nowPlayingItem.Artists && nowPlayingItem.Artists.length) {
+
+        bottomText = nowPlayingItem.Artists.join(', ');
+    } else if (nowPlayingItem.SeriesName || nowPlayingItem.Album) {
+        bottomText = topText;
+        topText = nowPlayingItem.SeriesName || nowPlayingItem.Album;
+
+        bottomItem = topItem;
+
+        if (nowPlayingItem.SeriesId) {
+            topItem = {
+                Id: nowPlayingItem.SeriesId,
+                Name: nowPlayingItem.SeriesName,
+                Type: 'Series',
+                IsFolder: true
+            };
+        } else {
+            topItem = null;
+        }
+    } else if (nowPlayingItem.ProductionYear && includeNonNameInfo !== false) {
+        bottomText = nowPlayingItem.ProductionYear;
+    }
+
+    var list = [];
+
+    list.push({
+        text: topText,
+        item: topItem
+    });
+
+    if (bottomText) {
+        list.push({
+            text: bottomText,
+            item: bottomItem
+        });
+    }
+
+    return list;
+}
+
+export default {
+    getNowPlayingNames: getNowPlayingNames
+};
diff --git a/src/components/playback/playbackmanager.js b/src/components/playback/playbackmanager.js
index 59108cf72e..fe3ff11250 100644
--- a/src/components/playback/playbackmanager.js
+++ b/src/components/playback/playbackmanager.js
@@ -1,9 +1,6 @@
 define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'playQueueManager', 'userSettings', 'globalize', 'connectionManager', 'loading', 'apphost', 'screenfull'], function (events, datetime, appSettings, itemHelper, pluginManager, PlayQueueManager, userSettings, globalize, connectionManager, loading, apphost, screenfull) {
     'use strict';
 
-    /** Delay time in ms for reportPlayback logging */
-    const reportPlaybackLogDelay = 1e3;
-
     function enableLocalPlaylistManagement(player) {
 
         if (player.getPlaylist) {
@@ -43,12 +40,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         events.trigger(playbackManagerInstance, 'playerchange', [newPlayer, newTarget, previousPlayer]);
     }
 
-    /** Last invoked method */
-    let reportPlaybackLastMethod;
-
-    /** Last invoke time of method */
-    let reportPlaybackLastTime;
-
     function reportPlayback(playbackManagerInstance, state, player, reportPlaylist, serverId, method, progressEventName) {
 
         if (!serverId) {
@@ -69,14 +60,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
             addPlaylistToPlaybackReport(playbackManagerInstance, info, player, serverId);
         }
 
-        const now = (new Date).getTime();
-
-        if (method !== reportPlaybackLastMethod || now - (reportPlaybackLastTime || 0) >= reportPlaybackLogDelay) {
-            console.debug(method + '-' + JSON.stringify(info));
-            reportPlaybackLastMethod = method;
-            reportPlaybackLastTime = now;
-        }
-
         var apiClient = connectionManager.getApiClient(serverId);
         var reportPlaybackPromise = apiClient[method](info);
         // Notify that report has been sent
@@ -709,7 +692,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
     function showPlaybackInfoErrorMessage(instance, errorCode, playNextTrack) {
 
         require(['alert'], function (alert) {
-            alert({
+            alert.default({
                 text: globalize.translate('PlaybackError' + errorCode),
                 title: globalize.translate('HeaderPlaybackError')
             }).then(function () {
@@ -1129,7 +1112,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         }
 
         self.canPlay = function (item) {
-
             var itemType = item.Type;
 
             if (itemType === 'PhotoAlbum' || itemType === 'MusicGenre' || itemType === 'Season' || itemType === 'Series' || itemType === 'BoxSet' || itemType === 'MusicAlbum' || itemType === 'MusicArtist' || itemType === 'Playlist') {
@@ -1143,7 +1125,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
             }
 
             if (itemType === 'Program') {
-
                 if (!item.EndDate || !item.StartDate) {
                     return false;
                 }
@@ -1909,11 +1890,8 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
                     // Setting this to true may cause some incorrect sorting
                     Recursive: false,
                     SortBy: options.shuffle ? 'Random' : 'SortName',
-                    MediaTypes: 'Photo,Video',
-                    Limit: 500
-
+                    MediaTypes: 'Photo,Video'
                 }).then(function (result) {
-
                     var items = result.Items;
 
                     var index = items.map(function (i) {
@@ -2102,6 +2080,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
                 state.PlayState.IsMuted = player.isMuted();
                 state.PlayState.IsPaused = player.paused();
                 state.PlayState.RepeatMode = self.getRepeatMode(player);
+                state.PlayState.ShuffleMode = self.getQueueShuffleMode(player);
                 state.PlayState.MaxStreamingBitrate = self.getMaxStreamingBitrate(player);
 
                 state.PlayState.PositionTicks = getCurrentTicks(player);
@@ -2187,7 +2166,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         // Only used internally
         self.getCurrentTicks = getCurrentTicks;
 
-        function playPhotos(items, options, user) {
+        function playOther(items, options, user) {
 
             var playStartIndex = options.startIndex || 0;
             var player = getPlayer(items[playStartIndex], options);
@@ -2216,9 +2195,9 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
                 return Promise.reject();
             }
 
-            if (firstItem.MediaType === 'Photo') {
+            if (firstItem.MediaType === 'Photo' || firstItem.MediaType === 'Book') {
 
-                return playPhotos(items, options, user);
+                return playOther(items, options, user);
             }
 
             var apiClient = connectionManager.getApiClient(firstItem.ServerId);
@@ -2882,11 +2861,11 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
             }
         };
 
-        self.queue = function (options, player) {
+        self.queue = function (options, player = this._currentPlayer) {
             queue(options, '', player);
         };
 
-        self.queueNext = function (options, player) {
+        self.queueNext = function (options, player = this._currentPlayer) {
             queue(options, 'next', player);
         };
 
@@ -2974,6 +2953,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
             } else {
                 self._playQueueManager.queue(items);
             }
+            events.trigger(player, 'playlistitemadd');
         }
 
         function onPlayerProgressInterval() {
@@ -3309,6 +3289,11 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
             sendProgressUpdate(player, 'repeatmodechange');
         }
 
+        function onShuffleQueueModeChange() {
+            var player = this;
+            sendProgressUpdate(player, 'shufflequeuemodechange');
+        }
+
         function onPlaylistItemMove(e) {
             var player = this;
             sendProgressUpdate(player, 'playlistitemmove', true);
@@ -3363,6 +3348,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
                 events.on(player, 'unpause', onPlaybackUnpause);
                 events.on(player, 'volumechange', onPlaybackVolumeChange);
                 events.on(player, 'repeatmodechange', onRepeatModeChange);
+                events.on(player, 'shufflequeuemodechange', onShuffleQueueModeChange);
                 events.on(player, 'playlistitemmove', onPlaylistItemMove);
                 events.on(player, 'playlistitemremove', onPlaylistItemRemove);
                 events.on(player, 'playlistitemadd', onPlaylistItemAdd);
@@ -3375,6 +3361,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
                 events.on(player, 'unpause', onPlaybackUnpause);
                 events.on(player, 'volumechange', onPlaybackVolumeChange);
                 events.on(player, 'repeatmodechange', onRepeatModeChange);
+                events.on(player, 'shufflequeuemodechange', onShuffleQueueModeChange);
                 events.on(player, 'playlistitemmove', onPlaylistItemMove);
                 events.on(player, 'playlistitemremove', onPlaylistItemRemove);
                 events.on(player, 'playlistitemadd', onPlaylistItemAdd);
@@ -3660,6 +3647,14 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         this.seek(parseInt(ticks), player);
     };
 
+    PlaybackManager.prototype.seekMs = function (ms, player) {
+
+        player = player || this._currentPlayer;
+
+        var ticks = ms * 10000;
+        this.seek(ticks, player);
+    };
+
     PlaybackManager.prototype.playTrailers = function (item) {
 
         var player = this._currentPlayer;
@@ -3707,7 +3702,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
     };
 
     PlaybackManager.prototype.stop = function (player) {
-
         player = player || this._currentPlayer;
 
         if (player) {
@@ -3816,7 +3810,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         });
     };
 
-    PlaybackManager.prototype.shuffle = function (shuffleItem, player, queryOptions) {
+    PlaybackManager.prototype.shuffle = function (shuffleItem, player) {
 
         player = player || this._currentPlayer;
         if (player && player.shuffle) {
@@ -3883,6 +3877,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
                 'GoToSearch',
                 'DisplayMessage',
                 'SetRepeatMode',
+                'SetShuffleQueue',
                 'PlayMediaSource',
                 'PlayTrailers'
             ];
@@ -3916,9 +3911,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         return info ? info.supportedCommands : [];
     };
 
-    PlaybackManager.prototype.setRepeatMode = function (value, player) {
-
-        player = player || this._currentPlayer;
+    PlaybackManager.prototype.setRepeatMode = function (value, player = this._currentPlayer) {
         if (player && !enableLocalPlaylistManagement(player)) {
             return player.setRepeatMode(value);
         }
@@ -3927,9 +3920,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         events.trigger(player, 'repeatmodechange');
     };
 
-    PlaybackManager.prototype.getRepeatMode = function (player) {
-
-        player = player || this._currentPlayer;
+    PlaybackManager.prototype.getRepeatMode = function (player = this._currentPlayer) {
         if (player && !enableLocalPlaylistManagement(player)) {
             return player.getRepeatMode();
         }
@@ -3937,6 +3928,52 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         return this._playQueueManager.getRepeatMode();
     };
 
+    PlaybackManager.prototype.setQueueShuffleMode = function (value, player = this._currentPlayer) {
+        if (player && !enableLocalPlaylistManagement(player)) {
+            return player.setQueueShuffleMode(value);
+        }
+
+        this._playQueueManager.setShuffleMode(value);
+        events.trigger(player, 'shufflequeuemodechange');
+    };
+
+    PlaybackManager.prototype.getQueueShuffleMode = function (player = this._currentPlayer) {
+        if (player && !enableLocalPlaylistManagement(player)) {
+            return player.getQueueShuffleMode();
+        }
+
+        return this._playQueueManager.getShuffleMode();
+    };
+
+    PlaybackManager.prototype.toggleQueueShuffleMode = function (player = this._currentPlayer) {
+        let currentvalue;
+        if (player && !enableLocalPlaylistManagement(player)) {
+            currentvalue = player.getQueueShuffleMode();
+            switch (currentvalue) {
+                case 'Shuffle':
+                    player.setQueueShuffleMode('Sorted');
+                    break;
+                case 'Sorted':
+                    player.setQueueShuffleMode('Shuffle');
+                    break;
+                default:
+                    throw new TypeError('current value for shufflequeue is invalid');
+            }
+        } else {
+            this._playQueueManager.toggleShuffleMode();
+        }
+        events.trigger(player, 'shufflequeuemodechange');
+    };
+
+    PlaybackManager.prototype.clearQueue = function (clearCurrentItem = false, player = this._currentPlayer) {
+        if (player && !enableLocalPlaylistManagement(player)) {
+            return player.clearQueue(clearCurrentItem);
+        }
+
+        this._playQueueManager.clearPlaylist(clearCurrentItem);
+        events.trigger(player, 'playlistitemremove');
+    };
+
     PlaybackManager.prototype.trySetActiveDeviceName = function (name) {
 
         name = normalizeName(name);
@@ -4005,6 +4042,9 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
             case 'SetRepeatMode':
                 this.setRepeatMode(cmd.Arguments.RepeatMode, player);
                 break;
+            case 'SetShuffleQueue':
+                this.setQueueShuffleMode(cmd.Arguments.ShuffleMode, player);
+                break;
             case 'VolumeUp':
                 this.volumeUp(player);
                 break;
diff --git a/src/components/playback/playbackorientation.js b/src/components/playback/playbackorientation.js
index 654ac29848..2078c6f6a8 100644
--- a/src/components/playback/playbackorientation.js
+++ b/src/components/playback/playbackorientation.js
@@ -1,57 +1,57 @@
-define(['playbackManager', 'layoutManager', 'events'], function (playbackManager, layoutManager, events) {
-    'use strict';
+import playbackManager from 'playbackManager';
+import layoutManager from 'layoutManager';
+import events from 'events';
 
-    var orientationLocked;
+var orientationLocked;
 
-    function onOrientationChangeSuccess() {
-        orientationLocked = true;
-    }
+function onOrientationChangeSuccess() {
+    orientationLocked = true;
+}
 
-    function onOrientationChangeError(err) {
-        orientationLocked = false;
-        console.error('error locking orientation: ' + err);
-    }
+function onOrientationChangeError(err) {
+    orientationLocked = false;
+    console.error('error locking orientation: ' + err);
+}
 
-    events.on(playbackManager, 'playbackstart', function (e, player, state) {
+events.on(playbackManager, 'playbackstart', function (e, player, state) {
 
-        var isLocalVideo = player.isLocalPlayer && !player.isExternalPlayer && playbackManager.isPlayingVideo(player);
+    var isLocalVideo = player.isLocalPlayer && !player.isExternalPlayer && playbackManager.isPlayingVideo(player);
 
-        if (isLocalVideo && layoutManager.mobile) {
-            /* eslint-disable-next-line compat/compat */
-            var lockOrientation = screen.lockOrientation || screen.mozLockOrientation || screen.msLockOrientation || (screen.orientation && screen.orientation.lock);
+    if (isLocalVideo && layoutManager.mobile) {
+        /* eslint-disable-next-line compat/compat */
+        var lockOrientation = screen.lockOrientation || screen.mozLockOrientation || screen.msLockOrientation || (screen.orientation && screen.orientation.lock);
 
-            if (lockOrientation) {
+        if (lockOrientation) {
 
-                try {
-                    var promise = lockOrientation('landscape');
-                    if (promise.then) {
-                        promise.then(onOrientationChangeSuccess, onOrientationChangeError);
-                    } else {
-                        // returns a boolean
-                        orientationLocked = promise;
-                    }
-                } catch (err) {
-                    onOrientationChangeError(err);
+            try {
+                var promise = lockOrientation('landscape');
+                if (promise.then) {
+                    promise.then(onOrientationChangeSuccess, onOrientationChangeError);
+                } else {
+                    // returns a boolean
+                    orientationLocked = promise;
                 }
+            } catch (err) {
+                onOrientationChangeError(err);
             }
         }
-    });
-
-    events.on(playbackManager, 'playbackstop', function (e, playbackStopInfo) {
-
-        if (orientationLocked && !playbackStopInfo.nextMediaType) {
-
-            /* eslint-disable-next-line compat/compat */
-            var unlockOrientation = screen.unlockOrientation || screen.mozUnlockOrientation || screen.msUnlockOrientation || (screen.orientation && screen.orientation.unlock);
-
-            if (unlockOrientation) {
-                try {
-                    unlockOrientation();
-                } catch (err) {
-                    console.error('error unlocking orientation: ' + err);
-                }
-                orientationLocked = false;
-            }
-        }
-    });
+    }
+});
+
+events.on(playbackManager, 'playbackstop', function (e, playbackStopInfo) {
+
+    if (orientationLocked && !playbackStopInfo.nextMediaType) {
+
+        /* eslint-disable-next-line compat/compat */
+        var unlockOrientation = screen.unlockOrientation || screen.mozUnlockOrientation || screen.msUnlockOrientation || (screen.orientation && screen.orientation.unlock);
+
+        if (unlockOrientation) {
+            try {
+                unlockOrientation();
+            } catch (err) {
+                console.error('error unlocking orientation: ' + err);
+            }
+            orientationLocked = false;
+        }
+    }
 });
diff --git a/src/components/playback/playerSelectionMenu.js b/src/components/playback/playerSelectionMenu.js
index 329cc11f92..298ae0b07e 100644
--- a/src/components/playback/playerSelectionMenu.js
+++ b/src/components/playback/playerSelectionMenu.js
@@ -1,320 +1,329 @@
-define(['appSettings', 'events', 'browser', 'loading', 'playbackManager', 'appRouter', 'globalize', 'apphost'], function (appSettings, events, browser, loading, playbackManager, appRouter, globalize, appHost) {
-    'use strict';
+import appSettings from 'appSettings';
+import events from 'events';
+import browser from 'browser';
+import loading from 'loading';
+import playbackManager from 'playbackManager';
+import appRouter from 'appRouter';
+import globalize from 'globalize';
+import appHost from 'apphost';
 
-    function mirrorItem(info, player) {
+function mirrorItem(info, player) {
 
-        var item = info.item;
+    var item = info.item;
 
-        playbackManager.displayContent({
+    playbackManager.displayContent({
 
-            ItemName: item.Name,
-            ItemId: item.Id,
-            ItemType: item.Type,
-            Context: info.context
-        }, player);
-    }
+        ItemName: item.Name,
+        ItemId: item.Id,
+        ItemType: item.Type,
+        Context: info.context
+    }, player);
+}
 
-    function mirrorIfEnabled(info) {
+function mirrorIfEnabled(info) {
 
-        if (info && playbackManager.enableDisplayMirroring()) {
+    if (info && playbackManager.enableDisplayMirroring()) {
 
-            var getPlayerInfo = playbackManager.getPlayerInfo();
+        var getPlayerInfo = playbackManager.getPlayerInfo();
 
-            if (getPlayerInfo) {
-                if (!getPlayerInfo.isLocalPlayer && getPlayerInfo.supportedCommands.indexOf('DisplayContent') !== -1) {
-                    mirrorItem(info, playbackManager.getCurrentPlayer());
-                }
+        if (getPlayerInfo) {
+            if (!getPlayerInfo.isLocalPlayer && getPlayerInfo.supportedCommands.indexOf('DisplayContent') !== -1) {
+                mirrorItem(info, playbackManager.getCurrentPlayer());
             }
         }
     }
+}
 
-    function emptyCallback() {
-        // avoid console logs about uncaught promises
+function emptyCallback() {
+    // avoid console logs about uncaught promises
+}
+
+function getTargetSecondaryText(target) {
+
+    if (target.user) {
+
+        return target.user.Name;
     }
 
-    function getTargetSecondaryText(target) {
+    return null;
+}
 
-        if (target.user) {
+function getIcon(target) {
 
-            return target.user.Name;
-        }
+    var deviceType = target.deviceType;
 
-        return null;
-    }
-
-    function getIcon(target) {
-
-        var deviceType = target.deviceType;
-
-        if (!deviceType && target.isLocalPlayer) {
-            if (browser.tv) {
-                deviceType = 'tv';
-            } else if (browser.mobile) {
-                deviceType = 'smartphone';
-            } else {
-                deviceType = 'desktop';
-            }
-        }
-
-        if (!deviceType) {
+    if (!deviceType && target.isLocalPlayer) {
+        if (browser.tv) {
             deviceType = 'tv';
-        }
-
-        switch (deviceType) {
-
-            case 'smartphone':
-                return 'smartphone';
-            case 'tablet':
-                return 'tablet';
-            case 'tv':
-                return 'tv';
-            case 'cast':
-                return 'cast';
-            case 'desktop':
-                return 'computer';
-            default:
-                return 'tv';
-        }
-    }
-
-    function showPlayerSelection(button) {
-
-        var currentPlayerInfo = playbackManager.getPlayerInfo();
-
-        if (currentPlayerInfo) {
-            if (!currentPlayerInfo.isLocalPlayer) {
-                showActivePlayerMenu(currentPlayerInfo);
-                return;
-            }
-        }
-
-        var currentPlayerId = currentPlayerInfo ? currentPlayerInfo.id : null;
-
-        loading.show();
-
-        playbackManager.getTargets().then(function (targets) {
-
-            var menuItems = targets.map(function (t) {
-
-                var name = t.name;
-
-                if (t.appName && t.appName !== t.name) {
-                    name += ' - ' + t.appName;
-                }
-
-                return {
-                    name: name,
-                    id: t.id,
-                    selected: currentPlayerId === t.id,
-                    secondaryText: getTargetSecondaryText(t),
-                    icon: getIcon(t)
-                };
-
-            });
-
-            require(['actionsheet'], function (actionsheet) {
-
-                loading.hide();
-
-                var menuOptions = {
-                    title: globalize.translate('HeaderPlayOn'),
-                    items: menuItems,
-                    positionTo: button,
-
-                    resolveOnClick: true,
-                    border: true
-                };
-
-                // Unfortunately we can't allow the url to change or chromecast will throw a security error
-                // Might be able to solve this in the future by moving the dialogs to hashbangs
-                if (!(!browser.chrome || appHost.supports('castmenuhashchange'))) {
-                    menuOptions.enableHistory = false;
-                }
-
-                actionsheet.show(menuOptions).then(function (id) {
-
-                    var target = targets.filter(function (t) {
-                        return t.id === id;
-                    })[0];
-
-                    playbackManager.trySetActivePlayer(target.playerName, target);
-
-                    mirrorIfEnabled();
-
-                }, emptyCallback);
-            });
-        });
-    }
-
-    function showActivePlayerMenu(playerInfo) {
-
-        require(['dialogHelper', 'dialog', 'emby-checkbox', 'emby-button'], function (dialogHelper) {
-            showActivePlayerMenuInternal(dialogHelper, playerInfo);
-        });
-    }
-
-    function disconnectFromPlayer(currentDeviceName) {
-
-        if (playbackManager.getSupportedCommands().indexOf('EndSession') !== -1) {
-
-            require(['dialog'], function (dialog) {
-
-                var menuItems = [];
-
-                menuItems.push({
-                    name: globalize.translate('Yes'),
-                    id: 'yes'
-                });
-                menuItems.push({
-                    name: globalize.translate('No'),
-                    id: 'no'
-                });
-
-                dialog({
-                    buttons: menuItems,
-                    //positionTo: positionTo,
-                    text: globalize.translate('ConfirmEndPlayerSession', currentDeviceName)
-
-                }).then(function (id) {
-                    switch (id) {
-
-                        case 'yes':
-                            playbackManager.getCurrentPlayer().endSession();
-                            playbackManager.setDefaultPlayerActive();
-                            break;
-                        case 'no':
-                            playbackManager.setDefaultPlayerActive();
-                            break;
-                        default:
-                            break;
-                    }
-                });
-
-            });
-
+        } else if (browser.mobile) {
+            deviceType = 'smartphone';
         } else {
-
-            playbackManager.setDefaultPlayerActive();
+            deviceType = 'desktop';
         }
     }
 
-    function showActivePlayerMenuInternal(dialogHelper, playerInfo) {
-
-        var html = '';
-
-        var dialogOptions = {
-            removeOnClose: true
-        };
-
-        dialogOptions.modal = false;
-        dialogOptions.entryAnimationDuration = 160;
-        dialogOptions.exitAnimationDuration = 160;
-        dialogOptions.autoFocus = false;
-
-        var dlg = dialogHelper.createDialog(dialogOptions);
-
-        dlg.classList.add('promptDialog');
-
-        var currentDeviceName = (playerInfo.deviceName || playerInfo.name);
-
-        html += '<div class="promptDialogContent" style="padding:1.5em;">';
-        html += '<h2 style="margin-top:.5em;">';
-        html += currentDeviceName;
-        html += '</h2>';
-
-        html += '<div>';
-
-        if (playerInfo.supportedCommands.indexOf('DisplayContent') !== -1) {
-
-            html += '<label class="checkboxContainer">';
-            var checkedHtml = playbackManager.enableDisplayMirroring() ? ' checked' : '';
-            html += '<input type="checkbox" is="emby-checkbox" class="chkMirror"' + checkedHtml + '/>';
-            html += '<span>' + globalize.translate('EnableDisplayMirroring') + '</span>';
-            html += '</label>';
-        }
-
-        html += '</div>';
-
-        html += '<div style="margin-top:1em;display:flex;justify-content: flex-end;">';
-
-        html += '<button is="emby-button" type="button" class="button-flat btnRemoteControl promptDialogButton">' + globalize.translate('HeaderRemoteControl') + '</button>';
-        html += '<button is="emby-button" type="button" class="button-flat btnDisconnect promptDialogButton ">' + globalize.translate('Disconnect') + '</button>';
-        html += '<button is="emby-button" type="button" class="button-flat btnCancel promptDialogButton">' + globalize.translate('ButtonCancel') + '</button>';
-        html += '</div>';
-
-        html += '</div>';
-        dlg.innerHTML = html;
-
-        var chkMirror = dlg.querySelector('.chkMirror');
-
-        if (chkMirror) {
-            chkMirror.addEventListener('change', onMirrorChange);
-        }
-
-        var destination = '';
-
-        var btnRemoteControl = dlg.querySelector('.btnRemoteControl');
-        if (btnRemoteControl) {
-            btnRemoteControl.addEventListener('click', function () {
-                destination = 'nowplaying';
-                dialogHelper.close(dlg);
-            });
-        }
-
-        dlg.querySelector('.btnDisconnect').addEventListener('click', function () {
-            destination = 'disconnectFromPlayer';
-            dialogHelper.close(dlg);
-        });
-
-        dlg.querySelector('.btnCancel').addEventListener('click', function () {
-            dialogHelper.close(dlg);
-        });
-
-        dialogHelper.open(dlg).then(function () {
-            if (destination === 'nowplaying') {
-                appRouter.showNowPlaying();
-            } else if (destination === 'disconnectFromPlayer') {
-                disconnectFromPlayer(currentDeviceName);
-            }
-        }, emptyCallback);
+    if (!deviceType) {
+        deviceType = 'tv';
     }
 
-    function onMirrorChange() {
-        playbackManager.enableDisplayMirroring(this.checked);
+    switch (deviceType) {
+
+        case 'smartphone':
+            return 'smartphone';
+        case 'tablet':
+            return 'tablet';
+        case 'tv':
+            return 'tv';
+        case 'cast':
+            return 'cast';
+        case 'desktop':
+            return 'computer';
+        default:
+            return 'tv';
     }
+}
 
-    document.addEventListener('viewshow', function (e) {
+export function show(button) {
 
-        var state = e.detail.state || {};
-        var item = state.item;
+    var currentPlayerInfo = playbackManager.getPlayerInfo();
 
-        if (item && item.ServerId) {
-            mirrorIfEnabled({
-                item: item
-            });
+    if (currentPlayerInfo) {
+        if (!currentPlayerInfo.isLocalPlayer) {
+            showActivePlayerMenu(currentPlayerInfo);
             return;
         }
-    });
+    }
 
-    events.on(appSettings, 'change', function (e, name) {
-        if (name === 'displaymirror') {
-            mirrorIfEnabled();
-        }
-    });
+    var currentPlayerId = currentPlayerInfo ? currentPlayerInfo.id : null;
 
-    events.on(playbackManager, 'pairing', function (e) {
-        loading.show();
-    });
+    loading.show();
 
-    events.on(playbackManager, 'paired', function (e) {
-        loading.hide();
-    });
+    playbackManager.getTargets().then(function (targets) {
 
-    events.on(playbackManager, 'pairerror', function (e) {
-        loading.hide();
-    });
+        var menuItems = targets.map(function (t) {
 
-    return {
-        show: showPlayerSelection
+            var name = t.name;
+
+            if (t.appName && t.appName !== t.name) {
+                name += ' - ' + t.appName;
+            }
+
+            return {
+                name: name,
+                id: t.id,
+                selected: currentPlayerId === t.id,
+                secondaryText: getTargetSecondaryText(t),
+                icon: getIcon(t)
+            };
+
+        });
+
+        import('actionsheet').then(({default: actionsheet}) => {
+
+            loading.hide();
+
+            var menuOptions = {
+                title: globalize.translate('HeaderPlayOn'),
+                items: menuItems,
+                positionTo: button,
+
+                resolveOnClick: true,
+                border: true
+            };
+
+            // Unfortunately we can't allow the url to change or chromecast will throw a security error
+            // Might be able to solve this in the future by moving the dialogs to hashbangs
+            if (!(!browser.chrome || appHost.supports('castmenuhashchange'))) {
+                menuOptions.enableHistory = false;
+            }
+
+            actionsheet.show(menuOptions).then(function (id) {
+
+                var target = targets.filter(function (t) {
+                    return t.id === id;
+                })[0];
+
+                playbackManager.trySetActivePlayer(target.playerName, target);
+
+                mirrorIfEnabled();
+
+            }, emptyCallback);
+        });
+    });
+}
+
+function showActivePlayerMenu(playerInfo) {
+    Promise.all([
+        import('dialogHelper'),
+        import('dialog'),
+        import('emby-checkbox'),
+        import('emby-button')
+    ]).then(([dialogHelper]) => {
+        showActivePlayerMenuInternal(dialogHelper, playerInfo);
+    });
+}
+
+function disconnectFromPlayer(currentDeviceName) {
+
+    if (playbackManager.getSupportedCommands().indexOf('EndSession') !== -1) {
+
+        import('dialog').then(({default: dialog}) => {
+
+            var menuItems = [];
+
+            menuItems.push({
+                name: globalize.translate('Yes'),
+                id: 'yes'
+            });
+            menuItems.push({
+                name: globalize.translate('No'),
+                id: 'no'
+            });
+
+            dialog({
+                buttons: menuItems,
+                //positionTo: positionTo,
+                text: globalize.translate('ConfirmEndPlayerSession', currentDeviceName)
+
+            }).then(function (id) {
+                switch (id) {
+
+                    case 'yes':
+                        playbackManager.getCurrentPlayer().endSession();
+                        playbackManager.setDefaultPlayerActive();
+                        break;
+                    case 'no':
+                        playbackManager.setDefaultPlayerActive();
+                        break;
+                    default:
+                        break;
+                }
+            });
+
+        });
+
+    } else {
+
+        playbackManager.setDefaultPlayerActive();
+    }
+}
+
+function showActivePlayerMenuInternal(dialogHelper, playerInfo) {
+
+    var html = '';
+
+    var dialogOptions = {
+        removeOnClose: true
     };
+
+    dialogOptions.modal = false;
+    dialogOptions.entryAnimationDuration = 160;
+    dialogOptions.exitAnimationDuration = 160;
+    dialogOptions.autoFocus = false;
+
+    var dlg = dialogHelper.createDialog(dialogOptions);
+
+    dlg.classList.add('promptDialog');
+
+    var currentDeviceName = (playerInfo.deviceName || playerInfo.name);
+
+    html += '<div class="promptDialogContent" style="padding:1.5em;">';
+    html += '<h2 style="margin-top:.5em;">';
+    html += currentDeviceName;
+    html += '</h2>';
+
+    html += '<div>';
+
+    if (playerInfo.supportedCommands.indexOf('DisplayContent') !== -1) {
+
+        html += '<label class="checkboxContainer">';
+        var checkedHtml = playbackManager.enableDisplayMirroring() ? ' checked' : '';
+        html += '<input type="checkbox" is="emby-checkbox" class="chkMirror"' + checkedHtml + '/>';
+        html += '<span>' + globalize.translate('EnableDisplayMirroring') + '</span>';
+        html += '</label>';
+    }
+
+    html += '</div>';
+
+    html += '<div style="margin-top:1em;display:flex;justify-content: flex-end;">';
+
+    html += '<button is="emby-button" type="button" class="button-flat btnRemoteControl promptDialogButton">' + globalize.translate('HeaderRemoteControl') + '</button>';
+    html += '<button is="emby-button" type="button" class="button-flat btnDisconnect promptDialogButton ">' + globalize.translate('Disconnect') + '</button>';
+    html += '<button is="emby-button" type="button" class="button-flat btnCancel promptDialogButton">' + globalize.translate('ButtonCancel') + '</button>';
+    html += '</div>';
+
+    html += '</div>';
+    dlg.innerHTML = html;
+
+    var chkMirror = dlg.querySelector('.chkMirror');
+
+    if (chkMirror) {
+        chkMirror.addEventListener('change', onMirrorChange);
+    }
+
+    var destination = '';
+
+    var btnRemoteControl = dlg.querySelector('.btnRemoteControl');
+    if (btnRemoteControl) {
+        btnRemoteControl.addEventListener('click', function () {
+            destination = 'nowplaying';
+            dialogHelper.close(dlg);
+        });
+    }
+
+    dlg.querySelector('.btnDisconnect').addEventListener('click', function () {
+        destination = 'disconnectFromPlayer';
+        dialogHelper.close(dlg);
+    });
+
+    dlg.querySelector('.btnCancel').addEventListener('click', function () {
+        dialogHelper.close(dlg);
+    });
+
+    dialogHelper.open(dlg).then(function () {
+        if (destination === 'nowplaying') {
+            appRouter.showNowPlaying();
+        } else if (destination === 'disconnectFromPlayer') {
+            disconnectFromPlayer(currentDeviceName);
+        }
+    }, emptyCallback);
+}
+
+function onMirrorChange() {
+    playbackManager.enableDisplayMirroring(this.checked);
+}
+
+document.addEventListener('viewshow', function (e) {
+
+    var state = e.detail.state || {};
+    var item = state.item;
+
+    if (item && item.ServerId) {
+        mirrorIfEnabled({
+            item: item
+        });
+        return;
+    }
 });
+
+events.on(appSettings, 'change', function (e, name) {
+    if (name === 'displaymirror') {
+        mirrorIfEnabled();
+    }
+});
+
+events.on(playbackManager, 'pairing', function (e) {
+    loading.show();
+});
+
+events.on(playbackManager, 'paired', function (e) {
+    loading.hide();
+});
+
+events.on(playbackManager, 'pairerror', function (e) {
+    loading.hide();
+});
+
+export default {
+    show: show
+};
diff --git a/src/components/playback/playersettingsmenu.js b/src/components/playback/playersettingsmenu.js
index dd67b667e6..33d252c52a 100644
--- a/src/components/playback/playersettingsmenu.js
+++ b/src/components/playback/playersettingsmenu.js
@@ -1,270 +1,272 @@
-define(['connectionManager', 'actionsheet', 'datetime', 'playbackManager', 'globalize', 'appSettings', 'qualityoptions'], function (connectionManager, actionsheet, datetime, playbackManager, globalize, appSettings, qualityoptions) {
-    'use strict';
+import connectionManager from 'connectionManager';
+import actionsheet from 'actionsheet';
+import playbackManager from 'playbackManager';
+import globalize from 'globalize';
+import qualityoptions from 'qualityoptions';
 
-    function showQualityMenu(player, btn) {
+function showQualityMenu(player, btn) {
 
-        var videoStream = playbackManager.currentMediaSource(player).MediaStreams.filter(function (stream) {
-            return stream.Type === 'Video';
-        })[0];
-        var videoWidth = videoStream ? videoStream.Width : null;
-        var videoHeight = videoStream ? videoStream.Height : null;
+    var videoStream = playbackManager.currentMediaSource(player).MediaStreams.filter(function (stream) {
+        return stream.Type === 'Video';
+    })[0];
+    var videoWidth = videoStream ? videoStream.Width : null;
+    var videoHeight = videoStream ? videoStream.Height : null;
 
-        var options = qualityoptions.getVideoQualityOptions({
-            currentMaxBitrate: playbackManager.getMaxStreamingBitrate(player),
-            isAutomaticBitrateEnabled: playbackManager.enableAutomaticBitrateDetection(player),
-            videoWidth: videoWidth,
-            videoHeight: videoHeight,
-            enableAuto: true
-        });
+    var options = qualityoptions.getVideoQualityOptions({
+        currentMaxBitrate: playbackManager.getMaxStreamingBitrate(player),
+        isAutomaticBitrateEnabled: playbackManager.enableAutomaticBitrateDetection(player),
+        videoWidth: videoWidth,
+        videoHeight: videoHeight,
+        enableAuto: true
+    });
 
-        var menuItems = options.map(function (o) {
-            var opt = {
-                name: o.name,
-                id: o.bitrate,
-                asideText: o.secondaryText
-            };
+    var menuItems = options.map(function (o) {
+        var opt = {
+            name: o.name,
+            id: o.bitrate,
+            asideText: o.secondaryText
+        };
 
-            if (o.selected) {
-                opt.selected = true;
-            }
+        if (o.selected) {
+            opt.selected = true;
+        }
 
-            return opt;
-        });
+        return opt;
+    });
 
-        var selectedId = options.filter(function (o) {
-            return o.selected;
-        });
+    var selectedId = options.filter(function (o) {
+        return o.selected;
+    });
 
-        selectedId = selectedId.length ? selectedId[0].bitrate : null;
+    selectedId = selectedId.length ? selectedId[0].bitrate : null;
 
-        return actionsheet.show({
-            items: menuItems,
-            positionTo: btn
-        }).then(function (id) {
-            var bitrate = parseInt(id);
-            if (bitrate !== selectedId) {
-                playbackManager.setMaxStreamingBitrate({
-                    enableAutomaticBitrateDetection: bitrate ? false : true,
-                    maxBitrate: bitrate
-                }, player);
-            }
-        });
+    return actionsheet.show({
+        items: menuItems,
+        positionTo: btn
+    }).then(function (id) {
+        var bitrate = parseInt(id);
+        if (bitrate !== selectedId) {
+            playbackManager.setMaxStreamingBitrate({
+                enableAutomaticBitrateDetection: bitrate ? false : true,
+                maxBitrate: bitrate
+            }, player);
+        }
+    });
+}
+
+function showRepeatModeMenu(player, btn) {
+    var menuItems = [];
+    var currentValue = playbackManager.getRepeatMode(player);
+
+    menuItems.push({
+        name: globalize.translate('RepeatAll'),
+        id: 'RepeatAll',
+        selected: currentValue === 'RepeatAll'
+    });
+
+    menuItems.push({
+        name: globalize.translate('RepeatOne'),
+        id: 'RepeatOne',
+        selected: currentValue === 'RepeatOne'
+    });
+
+    menuItems.push({
+        name: globalize.translate('None'),
+        id: 'RepeatNone',
+        selected: currentValue === 'RepeatNone'
+    });
+
+    return actionsheet.show({
+        items: menuItems,
+        positionTo: btn
+    }).then(function (mode) {
+        if (mode) {
+            playbackManager.setRepeatMode(mode, player);
+        }
+    });
+}
+
+function getQualitySecondaryText(player) {
+    var state = playbackManager.getPlayerState(player);
+    var isAutoEnabled = playbackManager.enableAutomaticBitrateDetection(player);
+    var currentMaxBitrate = playbackManager.getMaxStreamingBitrate(player);
+
+    var videoStream = playbackManager.currentMediaSource(player).MediaStreams.filter(function (stream) {
+        return stream.Type === 'Video';
+    })[0];
+
+    var videoWidth = videoStream ? videoStream.Width : null;
+    var videoHeight = videoStream ? videoStream.Height : null;
+
+    var options = qualityoptions.getVideoQualityOptions({
+        currentMaxBitrate: playbackManager.getMaxStreamingBitrate(player),
+        isAutomaticBitrateEnabled: playbackManager.enableAutomaticBitrateDetection(player),
+        videoWidth: videoWidth,
+        videoHeight: videoHeight,
+        enableAuto: true
+    });
+
+    var menuItems = options.map(function (o) {
+        var opt = {
+            name: o.name,
+            id: o.bitrate,
+            asideText: o.secondaryText
+        };
+
+        if (o.selected) {
+            opt.selected = true;
+        }
+
+        return opt;
+    });
+
+    var selectedOption = options.filter(function (o) {
+        return o.selected;
+    });
+
+    if (!selectedOption.length) {
+        return null;
     }
 
-    function showRepeatModeMenu(player, btn) {
-        var menuItems = [];
-        var currentValue = playbackManager.getRepeatMode(player);
+    selectedOption = selectedOption[0];
+    var text = selectedOption.name;
 
-        menuItems.push({
-            name: globalize.translate('RepeatAll'),
-            id: 'RepeatAll',
-            selected: currentValue === 'RepeatAll'
-        });
-
-        menuItems.push({
-            name: globalize.translate('RepeatOne'),
-            id: 'RepeatOne',
-            selected: currentValue === 'RepeatOne'
-        });
-
-        menuItems.push({
-            name: globalize.translate('None'),
-            id: 'RepeatNone',
-            selected: currentValue === 'RepeatNone'
-        });
-
-        return actionsheet.show({
-            items: menuItems,
-            positionTo: btn
-        }).then(function (mode) {
-            if (mode) {
-                playbackManager.setRepeatMode(mode, player);
-            }
-        });
+    if (selectedOption.autoText) {
+        if (state.PlayState && state.PlayState.PlayMethod !== 'Transcode') {
+            text += ' - Direct';
+        } else {
+            text += ' ' + selectedOption.autoText;
+        }
     }
 
-    function getQualitySecondaryText(player) {
-        var state = playbackManager.getPlayerState(player);
-        var isAutoEnabled = playbackManager.enableAutomaticBitrateDetection(player);
-        var currentMaxBitrate = playbackManager.getMaxStreamingBitrate(player);
+    return text;
+}
 
-        var videoStream = playbackManager.currentMediaSource(player).MediaStreams.filter(function (stream) {
-            return stream.Type === 'Video';
-        })[0];
+function showAspectRatioMenu(player, btn) {
+    // each has a name and id
+    var currentId = playbackManager.getAspectRatio(player);
+    var menuItems = playbackManager.getSupportedAspectRatios(player).map(function (i) {
+        return {
+            id: i.id,
+            name: i.name,
+            selected: i.id === currentId
+        };
+    });
 
-        var videoWidth = videoStream ? videoStream.Width : null;
-        var videoHeight = videoStream ? videoStream.Height : null;
-
-        var options = qualityoptions.getVideoQualityOptions({
-            currentMaxBitrate: playbackManager.getMaxStreamingBitrate(player),
-            isAutomaticBitrateEnabled: playbackManager.enableAutomaticBitrateDetection(player),
-            videoWidth: videoWidth,
-            videoHeight: videoHeight,
-            enableAuto: true
-        });
-
-        var menuItems = options.map(function (o) {
-            var opt = {
-                name: o.name,
-                id: o.bitrate,
-                asideText: o.secondaryText
-            };
-
-            if (o.selected) {
-                opt.selected = true;
-            }
-
-            return opt;
-        });
-
-        var selectedOption = options.filter(function (o) {
-            return o.selected;
-        });
-
-        if (!selectedOption.length) {
-            return null;
-        }
-
-        selectedOption = selectedOption[0];
-        var text = selectedOption.name;
-
-        if (selectedOption.autoText) {
-            if (state.PlayState && state.PlayState.PlayMethod !== 'Transcode') {
-                text += ' - Direct';
-            } else {
-                text += ' ' + selectedOption.autoText;
-            }
-        }
-
-        return text;
-    }
-
-    function showAspectRatioMenu(player, btn) {
-        // each has a name and id
-        var currentId = playbackManager.getAspectRatio(player);
-        var menuItems = playbackManager.getSupportedAspectRatios(player).map(function (i) {
-            return {
-                id: i.id,
-                name: i.name,
-                selected: i.id === currentId
-            };
-        });
-
-        return actionsheet.show({
-            items: menuItems,
-            positionTo: btn
-        }).then(function (id) {
-            if (id) {
-                playbackManager.setAspectRatio(id, player);
-                return Promise.resolve();
-            }
-
-            return Promise.reject();
-        });
-    }
-
-    function showWithUser(options, player, user) {
-        var supportedCommands = playbackManager.getSupportedCommands(player);
-        var mediaType = options.mediaType;
-
-        var menuItems = [];
-        if (supportedCommands.indexOf('SetAspectRatio') !== -1) {
-            var currentAspectRatioId = playbackManager.getAspectRatio(player);
-            var currentAspectRatio = playbackManager.getSupportedAspectRatios(player).filter(function (i) {
-                return i.id === currentAspectRatioId;
-            })[0];
-
-            menuItems.push({
-                name: globalize.translate('AspectRatio'),
-                id: 'aspectratio',
-                asideText: currentAspectRatio ? currentAspectRatio.name : null
-            });
-        }
-
-        if (user && user.Policy.EnableVideoPlaybackTranscoding) {
-            var secondaryQualityText = getQualitySecondaryText(player);
-
-            menuItems.push({
-                name: globalize.translate('Quality'),
-                id: 'quality',
-                asideText: secondaryQualityText
-            });
-        }
-
-        var repeatMode = playbackManager.getRepeatMode(player);
-
-        if (supportedCommands.indexOf('SetRepeatMode') !== -1 && playbackManager.currentMediaSource(player).RunTimeTicks) {
-            menuItems.push({
-                name: globalize.translate('RepeatMode'),
-                id: 'repeatmode',
-                asideText: repeatMode === 'RepeatNone' ? globalize.translate('None') : globalize.translate('' + repeatMode)
-            });
-        }
-
-        if (options.suboffset) {
-            menuItems.push({
-                name: globalize.translate('SubtitleOffset'),
-                id: 'suboffset',
-                asideText: null
-            });
-        }
-
-        if (options.stats) {
-            menuItems.push({
-                name: globalize.translate('PlaybackData'),
-                id: 'stats',
-                asideText: null
-            });
-        }
-
-        return actionsheet.show({
-            items: menuItems,
-            positionTo: options.positionTo
-        }).then(function (id) {
-            return handleSelectedOption(id, options, player);
-        });
-    }
-
-    function show(options) {
-        var player = options.player;
-        var currentItem = playbackManager.currentItem(player);
-
-        if (!currentItem || !currentItem.ServerId) {
-            return showWithUser(options, player, null);
-        }
-
-        var apiClient = connectionManager.getApiClient(currentItem.ServerId);
-        return apiClient.getCurrentUser().then(function (user) {
-            return showWithUser(options, player, user);
-        });
-    }
-
-    function handleSelectedOption(id, options, player) {
-        switch (id) {
-            case 'quality':
-                return showQualityMenu(player, options.positionTo);
-            case 'aspectratio':
-                return showAspectRatioMenu(player, options.positionTo);
-            case 'repeatmode':
-                return showRepeatModeMenu(player, options.positionTo);
-            case 'stats':
-                if (options.onOption) {
-                    options.onOption('stats');
-                }
-                return Promise.resolve();
-            case 'suboffset':
-                if (options.onOption) {
-                    options.onOption('suboffset');
-                }
-                return Promise.resolve();
-            default:
-                break;
+    return actionsheet.show({
+        items: menuItems,
+        positionTo: btn
+    }).then(function (id) {
+        if (id) {
+            playbackManager.setAspectRatio(id, player);
+            return Promise.resolve();
         }
 
         return Promise.reject();
+    });
+}
+
+function showWithUser(options, player, user) {
+    var supportedCommands = playbackManager.getSupportedCommands(player);
+    var mediaType = options.mediaType;
+
+    var menuItems = [];
+    if (supportedCommands.indexOf('SetAspectRatio') !== -1) {
+        var currentAspectRatioId = playbackManager.getAspectRatio(player);
+        var currentAspectRatio = playbackManager.getSupportedAspectRatios(player).filter(function (i) {
+            return i.id === currentAspectRatioId;
+        })[0];
+
+        menuItems.push({
+            name: globalize.translate('AspectRatio'),
+            id: 'aspectratio',
+            asideText: currentAspectRatio ? currentAspectRatio.name : null
+        });
     }
 
-    return {
-        show: show
-    };
-});
+    if (user && user.Policy.EnableVideoPlaybackTranscoding) {
+        var secondaryQualityText = getQualitySecondaryText(player);
+
+        menuItems.push({
+            name: globalize.translate('Quality'),
+            id: 'quality',
+            asideText: secondaryQualityText
+        });
+    }
+
+    var repeatMode = playbackManager.getRepeatMode(player);
+
+    if (supportedCommands.indexOf('SetRepeatMode') !== -1 && playbackManager.currentMediaSource(player).RunTimeTicks) {
+        menuItems.push({
+            name: globalize.translate('RepeatMode'),
+            id: 'repeatmode',
+            asideText: repeatMode === 'RepeatNone' ? globalize.translate('None') : globalize.translate('' + repeatMode)
+        });
+    }
+
+    if (options.suboffset) {
+        menuItems.push({
+            name: globalize.translate('SubtitleOffset'),
+            id: 'suboffset',
+            asideText: null
+        });
+    }
+
+    if (options.stats) {
+        menuItems.push({
+            name: globalize.translate('PlaybackData'),
+            id: 'stats',
+            asideText: null
+        });
+    }
+
+    return actionsheet.show({
+        items: menuItems,
+        positionTo: options.positionTo
+    }).then(function (id) {
+        return handleSelectedOption(id, options, player);
+    });
+}
+
+export function show(options) {
+    var player = options.player;
+    var currentItem = playbackManager.currentItem(player);
+
+    if (!currentItem || !currentItem.ServerId) {
+        return showWithUser(options, player, null);
+    }
+
+    var apiClient = connectionManager.getApiClient(currentItem.ServerId);
+    return apiClient.getCurrentUser().then(function (user) {
+        return showWithUser(options, player, user);
+    });
+}
+
+function handleSelectedOption(id, options, player) {
+    switch (id) {
+        case 'quality':
+            return showQualityMenu(player, options.positionTo);
+        case 'aspectratio':
+            return showAspectRatioMenu(player, options.positionTo);
+        case 'repeatmode':
+            return showRepeatModeMenu(player, options.positionTo);
+        case 'stats':
+            if (options.onOption) {
+                options.onOption('stats');
+            }
+            return Promise.resolve();
+        case 'suboffset':
+            if (options.onOption) {
+                options.onOption('suboffset');
+            }
+            return Promise.resolve();
+        default:
+            break;
+    }
+
+    return Promise.reject();
+}
+
+export default {
+    show: show
+};
diff --git a/src/components/playback/playmethodhelper.js b/src/components/playback/playmethodhelper.js
index 75af04035c..62793b9a33 100644
--- a/src/components/playback/playmethodhelper.js
+++ b/src/components/playback/playmethodhelper.js
@@ -1,24 +1,20 @@
-define([], function () {
-    'use strict';
+export function getDisplayPlayMethod(session) {
 
-    function getDisplayPlayMethod(session) {
-
-        if (!session.NowPlayingItem) {
-            return null;
-        }
-
-        if (session.TranscodingInfo && session.TranscodingInfo.IsVideoDirect) {
-            return 'DirectStream';
-        } else if (session.PlayState.PlayMethod === 'Transcode') {
-            return 'Transcode';
-        } else if (session.PlayState.PlayMethod === 'DirectStream') {
-            return 'DirectPlay';
-        } else if (session.PlayState.PlayMethod === 'DirectPlay') {
-            return 'DirectPlay';
-        }
+    if (!session.NowPlayingItem) {
+        return null;
     }
 
-    return {
-        getDisplayPlayMethod: getDisplayPlayMethod
-    };
-});
+    if (session.TranscodingInfo && session.TranscodingInfo.IsVideoDirect) {
+        return 'DirectStream';
+    } else if (session.PlayState.PlayMethod === 'Transcode') {
+        return 'Transcode';
+    } else if (session.PlayState.PlayMethod === 'DirectStream') {
+        return 'DirectPlay';
+    } else if (session.PlayState.PlayMethod === 'DirectPlay') {
+        return 'DirectPlay';
+    }
+}
+
+export default {
+    getDisplayPlayMethod: getDisplayPlayMethod
+};
diff --git a/src/components/playback/playqueuemanager.js b/src/components/playback/playqueuemanager.js
index 565cb6993e..2f411091c6 100644
--- a/src/components/playback/playqueuemanager.js
+++ b/src/components/playback/playqueuemanager.js
@@ -24,8 +24,10 @@ define([], function () {
 
     function PlayQueueManager() {
 
+        this._sortedPlaylist = [];
         this._playlist = [];
         this._repeatMode = 'RepeatNone';
+        this._shuffleMode = 'Sorted';
     }
 
     PlayQueueManager.prototype.getPlaylist = function () {
@@ -56,6 +58,40 @@ define([], function () {
         }
     };
 
+    PlayQueueManager.prototype.shufflePlaylist = function () {
+        this._sortedPlaylist = [];
+        for (const item of this._playlist) {
+            this._sortedPlaylist.push(item);
+        }
+        const currentPlaylistItem = this._playlist.splice(this.getCurrentPlaylistIndex(), 1)[0];
+
+        for (let i = this._playlist.length - 1; i > 0; i--) {
+            const j = Math.floor(Math.random() * i);
+            const temp = this._playlist[i];
+            this._playlist[i] = this._playlist[j];
+            this._playlist[j] = temp;
+        }
+        this._playlist.unshift(currentPlaylistItem);
+        this._shuffleMode = 'Shuffle';
+    };
+
+    PlayQueueManager.prototype.sortShuffledPlaylist = function () {
+        this._playlist = [];
+        for (let item of this._sortedPlaylist) {
+            this._playlist.push(item);
+        }
+        this._sortedPlaylist = [];
+        this._shuffleMode = 'Sorted';
+    };
+
+    PlayQueueManager.prototype.clearPlaylist = function (clearCurrentItem = false) {
+        const currentPlaylistItem = this._playlist.splice(this.getCurrentPlaylistIndex(), 1)[0];
+        this._playlist = [];
+        if (!clearCurrentItem) {
+            this._playlist.push(currentPlaylistItem);
+        }
+    };
+
     function arrayInsertAt(destArray, pos, arrayToInsert) {
         var args = [];
         args.push(pos); // where to insert
@@ -116,9 +152,7 @@ define([], function () {
 
     PlayQueueManager.prototype.removeFromPlaylist = function (playlistItemIds) {
 
-        var playlist = this.getPlaylist();
-
-        if (playlist.length <= playlistItemIds.length) {
+        if (this._playlist.length <= playlistItemIds.length) {
             return {
                 result: 'empty'
             };
@@ -127,8 +161,12 @@ define([], function () {
         var currentPlaylistItemId = this.getCurrentPlaylistItemId();
         var isCurrentIndex = playlistItemIds.indexOf(currentPlaylistItemId) !== -1;
 
-        this._playlist = playlist.filter(function (item) {
-            return playlistItemIds.indexOf(item.PlaylistItemId) === -1;
+        this._sortedPlaylist = this._sortedPlaylist.filter(function (item) {
+            return !playlistItemIds.includes(item.PlaylistItemId);
+        });
+
+        this._playlist = this._playlist.filter(function (item) {
+            return !playlistItemIds.includes(item.PlaylistItemId);
         });
 
         return {
@@ -176,21 +214,56 @@ define([], function () {
 
     PlayQueueManager.prototype.reset = function () {
 
+        this._sortedPlaylist = [];
         this._playlist = [];
         this._currentPlaylistItemId = null;
         this._repeatMode = 'RepeatNone';
+        this._shuffleMode = 'Sorted';
     };
 
     PlayQueueManager.prototype.setRepeatMode = function (value) {
-
-        this._repeatMode = value;
+        const repeatModes = ['RepeatOne', 'RepeatAll', 'RepeatNone'];
+        if (repeatModes.includes(value)) {
+            this._repeatMode = value;
+        } else {
+            throw new TypeError('invalid value provided for setRepeatMode');
+        }
     };
 
     PlayQueueManager.prototype.getRepeatMode = function () {
-
         return this._repeatMode;
     };
 
+    PlayQueueManager.prototype.setShuffleMode = function (value) {
+        switch (value) {
+            case 'Shuffle':
+                this.shufflePlaylist();
+                break;
+            case 'Sorted':
+                this.sortShuffledPlaylist();
+                break;
+            default:
+                throw new TypeError('invalid value provided to setShuffleMode');
+        }
+    };
+
+    PlayQueueManager.prototype.toggleShuffleMode = function () {
+        switch (this._shuffleMode) {
+            case 'Shuffle':
+                this.setShuffleMode('Sorted');
+                break;
+            case 'Sorted':
+                this.setShuffleMode('Shuffle');
+                break;
+            default:
+                throw new TypeError('current value for shufflequeue is invalid');
+        }
+    };
+
+    PlayQueueManager.prototype.getShuffleMode = function () {
+        return this._shuffleMode;
+    };
+
     PlayQueueManager.prototype.getNextItemInfo = function () {
 
         var newIndex;
diff --git a/src/components/playback/remotecontrolautoplay.js b/src/components/playback/remotecontrolautoplay.js
index 90a872cc6e..c0adb57a45 100644
--- a/src/components/playback/remotecontrolautoplay.js
+++ b/src/components/playback/remotecontrolautoplay.js
@@ -1,47 +1,45 @@
-define(['events', 'playbackManager'], function (events, playbackManager) {
-    'use strict';
+import events from 'events';
+import playbackManager from 'playbackManager';
 
-    function transferPlayback(oldPlayer, newPlayer) {
+function transferPlayback(oldPlayer, newPlayer) {
+    const state = playbackManager.getPlayerState(oldPlayer);
+    const item = state.NowPlayingItem;
 
-        var state = playbackManager.getPlayerState(oldPlayer);
-
-        var item = state.NowPlayingItem;
-
-        if (!item) {
-            return;
-        }
-
-        var playState = state.PlayState || {};
-        var resumePositionTicks = playState.PositionTicks || 0;
-
-        playbackManager.stop(oldPlayer).then(function () {
-
-            playbackManager.play({
-                ids: [item.Id],
-                serverId: item.ServerId,
-                startPositionTicks: resumePositionTicks
-
-            }, newPlayer);
-        });
+    if (!item) {
+        return;
     }
 
-    events.on(playbackManager, 'playerchange', function (e, newPlayer, newTarget, oldPlayer) {
+    playbackManager.getPlaylist(oldPlayer).then(playlist => {
+        const playlistIds = playlist.map(x => x.Id);
+        const playState = state.PlayState || {};
+        const resumePositionTicks = playState.PositionTicks || 0;
+        const playlistIndex = playlistIds.indexOf(item.Id) || 0;
 
-        if (!oldPlayer || !newPlayer) {
-            return;
-        }
-
-        if (!oldPlayer.isLocalPlayer) {
-            console.debug('Skipping remote control autoplay because oldPlayer is not a local player');
-            return;
-        }
-
-        if (newPlayer.isLocalPlayer) {
-            console.debug('Skipping remote control autoplay because newPlayer is a local player');
-            return;
-        }
-
-        transferPlayback(oldPlayer, newPlayer);
+        playbackManager.stop(oldPlayer).then(() => {
+            playbackManager.play({
+                ids: playlistIds,
+                serverId: item.ServerId,
+                startPositionTicks: resumePositionTicks,
+                startIndex: playlistIndex
+            }, newPlayer);
+        });
     });
+}
 
+events.on(playbackManager, 'playerchange', (e, newPlayer, newTarget, oldPlayer) => {
+    if (!oldPlayer || !newPlayer) {
+        return;
+    }
+
+    if (!oldPlayer.isLocalPlayer) {
+        console.debug('Skipping remote control autoplay because oldPlayer is not a local player');
+        return;
+    }
+
+    if (newPlayer.isLocalPlayer) {
+        console.debug('Skipping remote control autoplay because newPlayer is a local player');
+        return;
+    }
+
+    transferPlayback(oldPlayer, newPlayer);
 });
diff --git a/src/components/playback/volumeosd.js b/src/components/playback/volumeosd.js
index 95a13d769d..c2f6761f53 100644
--- a/src/components/playback/volumeosd.js
+++ b/src/components/playback/volumeosd.js
@@ -1,159 +1,161 @@
-define(['events', 'playbackManager', 'dom', 'browser', 'css!./iconosd', 'material-icons'], function (events, playbackManager, dom, browser) {
-    'use strict';
+import events from 'events';
+import playbackManager from 'playbackManager';
+import dom from 'dom';
+import browser from 'browser';
+import 'css!./iconosd';
+import 'material-icons';
 
-    var currentPlayer;
-    var osdElement;
-    var iconElement;
-    var progressElement;
+var currentPlayer;
+var osdElement;
+var iconElement;
+var progressElement;
 
-    var enableAnimation;
+var enableAnimation;
 
-    function getOsdElementHtml() {
-        var html = '';
+function getOsdElementHtml() {
+    var html = '';
 
-        html += '<span class="material-icons iconOsdIcon volume_up"></span>';
+    html += '<span class="material-icons iconOsdIcon volume_up"></span>';
 
-        html += '<div class="iconOsdProgressOuter"><div class="iconOsdProgressInner"></div></div>';
+    html += '<div class="iconOsdProgressOuter"><div class="iconOsdProgressInner"></div></div>';
 
-        return html;
+    return html;
+}
+
+function ensureOsdElement() {
+
+    var elem = osdElement;
+    if (!elem) {
+
+        enableAnimation = browser.supportsCssAnimation();
+
+        elem = document.createElement('div');
+        elem.classList.add('hide');
+        elem.classList.add('iconOsd');
+        elem.classList.add('iconOsd-hidden');
+        elem.classList.add('volumeOsd');
+        elem.innerHTML = getOsdElementHtml();
+
+        iconElement = elem.querySelector('.material-icons');
+        progressElement = elem.querySelector('.iconOsdProgressInner');
+
+        document.body.appendChild(elem);
+        osdElement = elem;
     }
+}
 
-    function ensureOsdElement() {
+function onHideComplete() {
+    this.classList.add('hide');
+}
 
-        var elem = osdElement;
-        if (!elem) {
+var hideTimeout;
+function showOsd() {
 
-            enableAnimation = browser.supportsCssAnimation();
+    clearHideTimeout();
 
-            elem = document.createElement('div');
-            elem.classList.add('hide');
-            elem.classList.add('iconOsd');
-            elem.classList.add('iconOsd-hidden');
-            elem.classList.add('volumeOsd');
-            elem.innerHTML = getOsdElementHtml();
+    var elem = osdElement;
 
-            iconElement = elem.querySelector('.material-icons');
-            progressElement = elem.querySelector('.iconOsdProgressInner');
-
-            document.body.appendChild(elem);
-            osdElement = elem;
-        }
-    }
-
-    function onHideComplete() {
-        this.classList.add('hide');
-    }
-
-    var hideTimeout;
-    function showOsd() {
-
-        clearHideTimeout();
-
-        var elem = osdElement;
-
-        dom.removeEventListener(elem, dom.whichTransitionEvent(), onHideComplete, {
-            once: true
-        });
-
-        elem.classList.remove('hide');
-
-        // trigger reflow
-        void elem.offsetWidth;
-
-        requestAnimationFrame(function () {
-            elem.classList.remove('iconOsd-hidden');
-
-            hideTimeout = setTimeout(hideOsd, 3000);
-        });
-    }
-
-    function clearHideTimeout() {
-        if (hideTimeout) {
-            clearTimeout(hideTimeout);
-            hideTimeout = null;
-        }
-    }
-
-    function hideOsd() {
-
-        clearHideTimeout();
-
-        var elem = osdElement;
-        if (elem) {
-
-            if (enableAnimation) {
-                // trigger reflow
-                void elem.offsetWidth;
-
-                requestAnimationFrame(function () {
-                    elem.classList.add('iconOsd-hidden');
-
-                    dom.addEventListener(elem, dom.whichTransitionEvent(), onHideComplete, {
-                        once: true
-                    });
-                });
-            } else {
-                onHideComplete.call(elem);
-            }
-        }
-    }
-
-    function updatePlayerVolumeState(isMuted, volume) {
-
-        if (iconElement) {
-            iconElement.classList.remove('volume_off', 'volume_up');
-            iconElement.classList.add(isMuted ? 'volume_off' : 'volume_up');
-        }
-        if (progressElement) {
-            progressElement.style.width = (volume || 0) + '%';
-        }
-    }
-
-    function releaseCurrentPlayer() {
-
-        var player = currentPlayer;
-
-        if (player) {
-            events.off(player, 'volumechange', onVolumeChanged);
-            events.off(player, 'playbackstop', hideOsd);
-            currentPlayer = null;
-        }
-    }
-
-    function onVolumeChanged(e) {
-
-        var player = this;
-
-        ensureOsdElement();
-
-        updatePlayerVolumeState(player.isMuted(), player.getVolume());
-
-        showOsd();
-    }
-
-    function bindToPlayer(player) {
-
-        if (player === currentPlayer) {
-            return;
-        }
-
-        releaseCurrentPlayer();
-
-        currentPlayer = player;
-
-        if (!player) {
-            return;
-        }
-
-        hideOsd();
-        events.on(player, 'volumechange', onVolumeChanged);
-        events.on(player, 'playbackstop', hideOsd);
-    }
-
-    events.on(playbackManager, 'playerchange', function () {
-        bindToPlayer(playbackManager.getCurrentPlayer());
+    dom.removeEventListener(elem, dom.whichTransitionEvent(), onHideComplete, {
+        once: true
     });
 
-    bindToPlayer(playbackManager.getCurrentPlayer());
+    elem.classList.remove('hide');
 
+    // trigger reflow
+    void elem.offsetWidth;
+
+    requestAnimationFrame(function () {
+        elem.classList.remove('iconOsd-hidden');
+
+        hideTimeout = setTimeout(hideOsd, 3000);
+    });
+}
+
+function clearHideTimeout() {
+    if (hideTimeout) {
+        clearTimeout(hideTimeout);
+        hideTimeout = null;
+    }
+}
+
+function hideOsd() {
+
+    clearHideTimeout();
+
+    var elem = osdElement;
+    if (elem) {
+
+        if (enableAnimation) {
+            // trigger reflow
+            void elem.offsetWidth;
+
+            requestAnimationFrame(function () {
+                elem.classList.add('iconOsd-hidden');
+
+                dom.addEventListener(elem, dom.whichTransitionEvent(), onHideComplete, {
+                    once: true
+                });
+            });
+        } else {
+            onHideComplete.call(elem);
+        }
+    }
+}
+
+function updatePlayerVolumeState(isMuted, volume) {
+
+    if (iconElement) {
+        iconElement.classList.remove('volume_off', 'volume_up');
+        iconElement.classList.add(isMuted ? 'volume_off' : 'volume_up');
+    }
+    if (progressElement) {
+        progressElement.style.width = (volume || 0) + '%';
+    }
+}
+
+function releaseCurrentPlayer() {
+
+    var player = currentPlayer;
+
+    if (player) {
+        events.off(player, 'volumechange', onVolumeChanged);
+        events.off(player, 'playbackstop', hideOsd);
+        currentPlayer = null;
+    }
+}
+
+function onVolumeChanged(e) {
+
+    var player = this;
+
+    ensureOsdElement();
+
+    updatePlayerVolumeState(player.isMuted(), player.getVolume());
+
+    showOsd();
+}
+
+function bindToPlayer(player) {
+
+    if (player === currentPlayer) {
+        return;
+    }
+
+    releaseCurrentPlayer();
+
+    currentPlayer = player;
+
+    if (!player) {
+        return;
+    }
+
+    hideOsd();
+    events.on(player, 'volumechange', onVolumeChanged);
+    events.on(player, 'playbackstop', hideOsd);
+}
+
+events.on(playbackManager, 'playerchange', function () {
+    bindToPlayer(playbackManager.getCurrentPlayer());
 });
+
+bindToPlayer(playbackManager.getCurrentPlayer());
diff --git a/src/components/playbackSettings/playbackSettings.js b/src/components/playbackSettings/playbackSettings.js
index 06d2e38d2c..9c7e20f9e1 100644
--- a/src/components/playbackSettings/playbackSettings.js
+++ b/src/components/playbackSettings/playbackSettings.js
@@ -1,31 +1,42 @@
-define(['require', 'browser', 'appSettings', 'apphost', 'focusManager', 'qualityoptions', 'globalize', 'loading', 'connectionManager', 'dom', 'events', 'emby-select', 'emby-checkbox'], function (require, browser, appSettings, appHost, focusManager, qualityoptions, globalize, loading, connectionManager, dom, events) {
-    'use strict';
+import browser from 'browser';
+import appSettings from 'appSettings';
+import appHost from 'apphost';
+import focusManager from 'focusManager';
+import qualityoptions from 'qualityoptions';
+import globalize from 'globalize';
+import loading from 'loading';
+import connectionManager from 'connectionManager';
+import events from 'events';
+import 'emby-select';
+import 'emby-checkbox';
+
+/* eslint-disable indent */
 
     function fillSkipLengths(select) {
 
-        var options = [5, 10, 15, 20, 25, 30];
+        const options = [5, 10, 15, 20, 25, 30];
 
-        select.innerHTML = options.map(function (option) {
+        select.innerHTML = options.map(option => {
             return {
                 name: globalize.translate('ValueSeconds', option),
                 value: option * 1000
             };
-        }).map(function (o) {
-            return '<option value="' + o.value + '">' + o.name + '</option>';
+        }).map(o => {
+            return `<option value="${o.value}">${o.name}</option>`;
         }).join('');
     }
 
     function populateLanguages(select, languages) {
 
-        var html = '';
+        let html = '';
 
-        html += "<option value=''>" + globalize.translate('AnyLanguage') + '</option>';
+        html += `<option value=''>${globalize.translate('AnyLanguage')}</option>`;
 
-        for (var i = 0, length = languages.length; i < length; i++) {
+        for (let i = 0, length = languages.length; i < length; i++) {
 
-            var culture = languages[i];
+            const culture = languages[i];
 
-            html += "<option value='" + culture.ThreeLetterISOLanguageName + "'>" + culture.DisplayName + '</option>';
+            html += `<option value='${culture.ThreeLetterISOLanguageName}'>${culture.DisplayName}</option>`;
         }
 
         select.innerHTML = html;
@@ -33,7 +44,7 @@ define(['require', 'browser', 'appSettings', 'apphost', 'focusManager', 'quality
 
     function setMaxBitrateIntoField(select, isInNetwork, mediatype) {
 
-        var options = mediatype === 'Audio' ? qualityoptions.getAudioQualityOptions({
+        const options = mediatype === 'Audio' ? qualityoptions.getAudioQualityOptions({
 
             currentMaxBitrate: appSettings.maxStreamingBitrate(isInNetwork, mediatype),
             isAutomaticBitrateEnabled: appSettings.enableAutomaticBitrateDetection(isInNetwork, mediatype),
@@ -47,10 +58,10 @@ define(['require', 'browser', 'appSettings', 'apphost', 'focusManager', 'quality
 
         });
 
-        select.innerHTML = options.map(function (i) {
+        select.innerHTML = options.map(i => {
 
             // render empty string instead of 0 for the auto option
-            return '<option value="' + (i.bitrate || '') + '">' + i.name + '</option>';
+            return `<option value="${i.bitrate || ''}">${i.name}</option>`;
         }).join('');
 
         if (appSettings.enableAutomaticBitrateDetection(isInNetwork, mediatype)) {
@@ -62,23 +73,23 @@ define(['require', 'browser', 'appSettings', 'apphost', 'focusManager', 'quality
 
     function fillChromecastQuality(select) {
 
-        var options = qualityoptions.getVideoQualityOptions({
+        const options = qualityoptions.getVideoQualityOptions({
 
             currentMaxBitrate: appSettings.maxChromecastBitrate(),
             isAutomaticBitrateEnabled: !appSettings.maxChromecastBitrate(),
             enableAuto: true
         });
 
-        select.innerHTML = options.map(function (i) {
+        select.innerHTML = options.map(i => {
 
             // render empty string instead of 0 for the auto option
-            return '<option value="' + (i.bitrate || '') + '">' + i.name + '</option>';
+            return `<option value="${i.bitrate || ''}">${i.name}</option>`;
         }).join('');
 
         select.value = appSettings.maxChromecastBitrate() || '';
     }
 
-    function setMaxBitrateFromField(select, isInNetwork, mediatype, value) {
+    function setMaxBitrateFromField(select, isInNetwork, mediatype) {
 
         if (select.value) {
             appSettings.maxStreamingBitrate(isInNetwork, mediatype, select.value);
@@ -110,7 +121,7 @@ define(['require', 'browser', 'appSettings', 'apphost', 'focusManager', 'quality
             return;
         }
 
-        apiClient.getEndpointInfo().then(function (endpointInfo) {
+        apiClient.getEndpointInfo().then(endpointInfo => {
 
             if (endpointInfo.IsInNetwork) {
 
@@ -133,7 +144,7 @@ define(['require', 'browser', 'appSettings', 'apphost', 'focusManager', 'quality
         });
     }
 
-    function showOrHideEpisodesField(context, user, apiClient) {
+    function showOrHideEpisodesField(context) {
 
         if (browser.tizen || browser.web0s) {
             context.querySelector('.fldEpisodeAutoPlay').classList.add('hide');
@@ -145,12 +156,12 @@ define(['require', 'browser', 'appSettings', 'apphost', 'focusManager', 'quality
 
     function loadForm(context, user, userSettings, apiClient) {
 
-        var loggedInUserId = apiClient.getCurrentUserId();
-        var userId = user.Id;
+        const loggedInUserId = apiClient.getCurrentUserId();
+        const userId = user.Id;
 
         showHideQualityFields(context, user, apiClient);
 
-        apiClient.getCultures().then(function (allCultures) {
+        apiClient.getCultures().then(allCultures => {
 
             populateLanguages(context.querySelector('#selectAudioLanguage'), allCultures);
 
@@ -159,7 +170,7 @@ define(['require', 'browser', 'appSettings', 'apphost', 'focusManager', 'quality
         });
 
         // hide cinema mode options if disabled at server level
-        apiClient.getNamedConfiguration('cinemamode').then(function (cinemaConfig) {
+        apiClient.getNamedConfiguration('cinemamode').then(cinemaConfig => {
 
             if (cinemaConfig.EnableIntrosForMovies || cinemaConfig.EnableIntrosForEpisodes) {
                 context.querySelector('.cinemaModeOptions').classList.remove('hide');
@@ -204,18 +215,18 @@ define(['require', 'browser', 'appSettings', 'apphost', 'focusManager', 'quality
 
         fillChromecastQuality(context.querySelector('.selectChromecastVideoQuality'));
 
-        var selectChromecastVersion = context.querySelector('.selectChromecastVersion');
+        const selectChromecastVersion = context.querySelector('.selectChromecastVersion');
         selectChromecastVersion.value = userSettings.chromecastVersion();
 
-        var selectSkipForwardLength = context.querySelector('.selectSkipForwardLength');
+        const selectSkipForwardLength = context.querySelector('.selectSkipForwardLength');
         fillSkipLengths(selectSkipForwardLength);
         selectSkipForwardLength.value = userSettings.skipForwardLength();
 
-        var selectSkipBackLength = context.querySelector('.selectSkipBackLength');
+        const selectSkipBackLength = context.querySelector('.selectSkipBackLength');
         fillSkipLengths(selectSkipBackLength);
         selectSkipBackLength.value = userSettings.skipBackLength();
 
-        showOrHideEpisodesField(context, user, apiClient);
+        showOrHideEpisodesField(context);
 
         loading.hide();
     }
@@ -248,20 +259,20 @@ define(['require', 'browser', 'appSettings', 'apphost', 'focusManager', 'quality
 
         loading.show();
 
-        apiClient.getUser(userId).then(function (user) {
+        apiClient.getUser(userId).then(user => {
 
-            saveUser(context, user, userSettings, apiClient).then(function () {
+            saveUser(context, user, userSettings, apiClient).then(() => {
 
                 loading.hide();
                 if (enableSaveConfirmation) {
-                    require(['toast'], function (toast) {
+                    import('toast').then(({default: toast}) => {
                         toast(globalize.translate('SettingsSaved'));
                     });
                 }
 
                 events.trigger(instance, 'saved');
 
-            }, function () {
+            }, () => {
                 loading.hide();
             });
         });
@@ -269,14 +280,14 @@ define(['require', 'browser', 'appSettings', 'apphost', 'focusManager', 'quality
 
     function onSubmit(e) {
 
-        var self = this;
-        var apiClient = connectionManager.getApiClient(self.options.serverId);
-        var userId = self.options.userId;
-        var userSettings = self.options.userSettings;
+        const self = this;
+        const apiClient = connectionManager.getApiClient(self.options.serverId);
+        const userId = self.options.userId;
+        const userSettings = self.options.userSettings;
 
-        userSettings.setUserInfo(userId, apiClient).then(function () {
+        userSettings.setUserInfo(userId, apiClient).then(() => {
 
-            var enableSaveConfirmation = self.options.enableSaveConfirmation;
+            const enableSaveConfirmation = self.options.enableSaveConfirmation;
             save(self, self.options.element, userId, userSettings, apiClient, enableSaveConfirmation);
         });
 
@@ -289,9 +300,9 @@ define(['require', 'browser', 'appSettings', 'apphost', 'focusManager', 'quality
 
     function embed(options, self) {
 
-        require(['text!./playbackSettings.template.html'], function (template) {
+        return import('text!./playbackSettings.template.html').then(({default: template}) => {
 
-            options.element.innerHTML = globalize.translateDocument(template, 'core');
+            options.element.innerHTML = globalize.translateHtml(template, 'core');
 
             options.element.querySelector('form').addEventListener('submit', onSubmit.bind(self));
 
@@ -307,43 +318,43 @@ define(['require', 'browser', 'appSettings', 'apphost', 'focusManager', 'quality
         });
     }
 
-    function PlaybackSettings(options) {
+    class PlaybackSettings {
+        constructor(options) {
+            this.options = options;
+            embed(options, this);
+        }
 
-        this.options = options;
+        loadData() {
 
-        embed(options, this);
+            const self = this;
+            const context = self.options.element;
+
+            loading.show();
+
+            const userId = self.options.userId;
+            const apiClient = connectionManager.getApiClient(self.options.serverId);
+            const userSettings = self.options.userSettings;
+
+            apiClient.getUser(userId).then(user => {
+
+                userSettings.setUserInfo(userId, apiClient).then(() => {
+
+                    self.dataLoaded = true;
+
+                    loadForm(context, user, userSettings, apiClient);
+                });
+            });
+        }
+
+        submit() {
+            onSubmit.call(this);
+        }
+
+        destroy() {
+
+            this.options = null;
+        }
     }
 
-    PlaybackSettings.prototype.loadData = function () {
-
-        var self = this;
-        var context = self.options.element;
-
-        loading.show();
-
-        var userId = self.options.userId;
-        var apiClient = connectionManager.getApiClient(self.options.serverId);
-        var userSettings = self.options.userSettings;
-
-        apiClient.getUser(userId).then(function (user) {
-
-            userSettings.setUserInfo(userId, apiClient).then(function () {
-
-                self.dataLoaded = true;
-
-                loadForm(context, user, userSettings, apiClient);
-            });
-        });
-    };
-
-    PlaybackSettings.prototype.submit = function () {
-        onSubmit.call(this);
-    };
-
-    PlaybackSettings.prototype.destroy = function () {
-
-        this.options = null;
-    };
-
-    return PlaybackSettings;
-});
+/* eslint-enable indent */
+export default PlaybackSettings;
diff --git a/src/components/playerstats/playerstats.js b/src/components/playerstats/playerstats.js
index a65baf3553..fce37c1507 100644
--- a/src/components/playerstats/playerstats.js
+++ b/src/components/playerstats/playerstats.js
@@ -1,9 +1,19 @@
-define(['events', 'globalize', 'playbackManager', 'connectionManager', 'syncPlayManager', 'playMethodHelper', 'layoutManager', 'serverNotifications', 'paper-icon-button-light', 'css!./playerstats'], function (events, globalize, playbackManager, connectionManager, syncPlayManager, playMethodHelper, layoutManager, serverNotifications) {
-    'use strict';
+import events from 'events';
+import globalize from 'globalize';
+import playbackManager from 'playbackManager';
+import connectionManager from 'connectionManager';
+import syncPlayManager from 'syncPlayManager';
+import playMethodHelper from 'playMethodHelper';
+import layoutManager from 'layoutManager';
+import serverNotifications from 'serverNotifications';
+import 'paper-icon-button-light';
+import 'css!./playerstats';
+
+/* eslint-disable indent */
 
     function init(instance) {
 
-        var parent = document.createElement('div');
+        const parent = document.createElement('div');
 
         parent.classList.add('playerStats');
 
@@ -13,7 +23,7 @@ define(['events', 'globalize', 'playbackManager', 'connectionManager', 'syncPlay
 
         parent.classList.add('hide');
 
-        var button;
+        let button;
 
         if (layoutManager.tv) {
             button = '';
@@ -21,7 +31,7 @@ define(['events', 'globalize', 'playbackManager', 'connectionManager', 'syncPlay
             button = '<button type="button" is="paper-icon-button-light" class="playerStats-closeButton"><span class="material-icons close"></span></button>';
         }
 
-        var contentClass = layoutManager.tv ? 'playerStats-content playerStats-content-tv' : 'playerStats-content';
+        const contentClass = layoutManager.tv ? 'playerStats-content playerStats-content-tv' : 'playerStats-content';
 
         parent.innerHTML = '<div class="' + contentClass + '">' + button + '<div class="playerStats-stats"></div></div>';
 
@@ -44,9 +54,9 @@ define(['events', 'globalize', 'playbackManager', 'connectionManager', 'syncPlay
 
         elem.querySelector('.playerStats-stats').innerHTML = categories.map(function (category) {
 
-            var categoryHtml = '';
+            let categoryHtml = '';
 
-            var stats = category.stats;
+            const stats = category.stats;
 
             if (stats.length && category.name) {
                 categoryHtml += '<div class="playerStats-stat playerStats-stat-header">';
@@ -62,11 +72,11 @@ define(['events', 'globalize', 'playbackManager', 'connectionManager', 'syncPlay
                 categoryHtml += '</div>';
             }
 
-            for (var i = 0, length = stats.length; i < length; i++) {
+            for (let i = 0, length = stats.length; i < length; i++) {
 
                 categoryHtml += '<div class="playerStats-stat">';
 
-                var stat = stats[i];
+                const stat = stats[i];
 
                 categoryHtml += '<div class="playerStats-stat-label">';
                 categoryHtml += stat.label;
@@ -86,13 +96,13 @@ define(['events', 'globalize', 'playbackManager', 'connectionManager', 'syncPlay
 
     function getSession(instance, player) {
 
-        var now = new Date().getTime();
+        const now = new Date().getTime();
 
         if ((now - (instance.lastSessionTime || 0)) < 10000) {
             return Promise.resolve(instance.lastSession);
         }
 
-        var apiClient = connectionManager.getApiClient(playbackManager.currentItem(player).ServerId);
+        const apiClient = connectionManager.getApiClient(playbackManager.currentItem(player).ServerId);
 
         return apiClient.getSessions({
             deviceId: apiClient.deviceId()
@@ -114,12 +124,12 @@ define(['events', 'globalize', 'playbackManager', 'connectionManager', 'syncPlay
     }
 
     function getTranscodingStats(session, player, displayPlayMethod) {
-        var sessionStats = [];
+        const sessionStats = [];
 
-        var videoCodec;
-        var audioCodec;
-        var totalBitrate;
-        var audioChannels;
+        let videoCodec;
+        let audioCodec;
+        let totalBitrate;
+        let audioChannels;
 
         if (session.TranscodingInfo) {
 
@@ -208,11 +218,11 @@ define(['events', 'globalize', 'playbackManager', 'connectionManager', 'syncPlay
 
     function getMediaSourceStats(session, player, displayPlayMethod) {
 
-        var sessionStats = [];
+        const sessionStats = [];
 
-        var mediaSource = playbackManager.currentMediaSource(player) || {};
-        var totalBitrate = mediaSource.Bitrate;
-        var mediaFileSize = mediaSource.Size;
+        const mediaSource = playbackManager.currentMediaSource(player) || {};
+        const totalBitrate = mediaSource.Bitrate;
+        const mediaFileSize = mediaSource.Size;
 
         if (mediaSource.Container) {
             sessionStats.push({
@@ -236,26 +246,26 @@ define(['events', 'globalize', 'playbackManager', 'connectionManager', 'syncPlay
             });
         }
 
-        var mediaStreams = mediaSource.MediaStreams || [];
-        var videoStream = mediaStreams.filter(function (s) {
+        const mediaStreams = mediaSource.MediaStreams || [];
+        const videoStream = mediaStreams.filter(function (s) {
 
             return s.Type === 'Video';
 
         })[0] || {};
 
-        var videoCodec = videoStream.Codec;
+        const videoCodec = videoStream.Codec;
 
-        var audioStreamIndex = playbackManager.getAudioStreamIndex(player);
-        var audioStream = playbackManager.audioTracks(player).filter(function (s) {
+        const audioStreamIndex = playbackManager.getAudioStreamIndex(player);
+        const audioStream = playbackManager.audioTracks(player).filter(function (s) {
 
             return s.Type === 'Audio' && s.Index === audioStreamIndex;
 
         })[0] || {};
 
-        var audioCodec = audioStream.Codec;
-        var audioChannels = audioStream.Channels;
+        const audioCodec = audioStream.Codec;
+        const audioChannels = audioStream.Channels;
 
-        var videoInfos = [];
+        const videoInfos = [];
 
         if (videoCodec) {
             videoInfos.push(videoCodec.toUpperCase());
@@ -279,7 +289,7 @@ define(['events', 'globalize', 'playbackManager', 'connectionManager', 'syncPlay
             });
         }
 
-        var audioInfos = [];
+        const audioInfos = [];
 
         if (audioCodec) {
             audioInfos.push(audioCodec.toUpperCase());
@@ -328,8 +338,8 @@ define(['events', 'globalize', 'playbackManager', 'connectionManager', 'syncPlay
     }
 
     function getSyncPlayStats() {
-        var syncStats = [];
-        var stats = syncPlayManager.getStats();
+        const syncStats = [];
+        const stats = syncPlayManager.getStats();
 
         syncStats.push({
             label: globalize.translate('LabelSyncPlayTimeOffset'),
@@ -351,18 +361,18 @@ define(['events', 'globalize', 'playbackManager', 'connectionManager', 'syncPlay
 
     function getStats(instance, player) {
 
-        var statsPromise = player.getStats ? player.getStats() : Promise.resolve({});
-        var sessionPromise = getSession(instance, player);
+        const statsPromise = player.getStats ? player.getStats() : Promise.resolve({});
+        const sessionPromise = getSession(instance, player);
 
         return Promise.all([statsPromise, sessionPromise]).then(function (responses) {
 
-            var playerStatsResult = responses[0];
-            var playerStats = playerStatsResult.categories || [];
-            var session = responses[1];
+            const playerStatsResult = responses[0];
+            const playerStats = playerStatsResult.categories || [];
+            const session = responses[1];
 
-            var displayPlayMethod = playMethodHelper.getDisplayPlayMethod(session);
+            const displayPlayMethod = playMethodHelper.getDisplayPlayMethod(session);
 
-            var baseCategory = {
+            const baseCategory = {
                 stats: [],
                 name: 'Playback Info'
             };
@@ -377,13 +387,13 @@ define(['events', 'globalize', 'playbackManager', 'connectionManager', 'syncPlay
                 value: player.name
             });
 
-            var categories = [];
+            const categories = [];
 
             categories.push(baseCategory);
 
-            for (var i = 0, length = playerStats.length; i < length; i++) {
+            for (let i = 0, length = playerStats.length; i < length; i++) {
 
-                var category = playerStats[i];
+                const category = playerStats[i];
                 if (category.type === 'audio') {
                     category.name = 'Audio Info';
                 } else if (category.type === 'video') {
@@ -405,7 +415,8 @@ define(['events', 'globalize', 'playbackManager', 'connectionManager', 'syncPlay
                 name: 'Original Media Info'
             });
 
-            if (syncPlayManager.isSyncPlayEnabled()) {
+            var apiClient = connectionManager.getApiClient(playbackManager.currentItem(player).ServerId);
+            if (syncPlayManager.isSyncPlayEnabled() && apiClient.isMinServerVersion('10.6.0')) {
                 categories.push({
                     stats: getSyncPlayStats(),
                     name: 'SyncPlay Info'
@@ -418,7 +429,7 @@ define(['events', 'globalize', 'playbackManager', 'connectionManager', 'syncPlay
 
     function renderPlayerStats(instance, player) {
 
-        var now = new Date().getTime();
+        const now = new Date().getTime();
 
         if ((now - (instance.lastRender || 0)) < 700) {
             return;
@@ -428,7 +439,7 @@ define(['events', 'globalize', 'playbackManager', 'connectionManager', 'syncPlay
 
         getStats(instance, player).then(function (stats) {
 
-            var elem = instance.element;
+            const elem = instance.element;
             if (!elem) {
                 return;
             }
@@ -439,7 +450,7 @@ define(['events', 'globalize', 'playbackManager', 'connectionManager', 'syncPlay
 
     function bindEvents(instance, player) {
 
-        var localOnTimeUpdate = function () {
+        const localOnTimeUpdate = function () {
             renderPlayerStats(instance, player);
         };
 
@@ -449,14 +460,15 @@ define(['events', 'globalize', 'playbackManager', 'connectionManager', 'syncPlay
 
     function unbindEvents(instance, player) {
 
-        var localOnTimeUpdate = instance.onTimeUpdate;
+        const localOnTimeUpdate = instance.onTimeUpdate;
 
         if (localOnTimeUpdate) {
             events.off(player, 'timeupdate', localOnTimeUpdate);
         }
     }
 
-    function PlayerStats(options) {
+class PlayerStats {
+    constructor(options) {
 
         this.options = options;
 
@@ -465,13 +477,13 @@ define(['events', 'globalize', 'playbackManager', 'connectionManager', 'syncPlay
         this.enabled(true);
     }
 
-    PlayerStats.prototype.enabled = function (enabled) {
+    enabled(enabled) {
 
         if (enabled == null) {
             return this._enabled;
         }
 
-        var options = this.options;
+        const options = this.options;
 
         if (!options) {
             return;
@@ -485,15 +497,15 @@ define(['events', 'globalize', 'playbackManager', 'connectionManager', 'syncPlay
             this.element.classList.add('hide');
             unbindEvents(this, options.player);
         }
-    };
+    }
 
-    PlayerStats.prototype.toggle = function () {
+    toggle() {
         this.enabled(!this.enabled());
-    };
+    }
 
-    PlayerStats.prototype.destroy = function () {
+    destroy() {
 
-        var options = this.options;
+        const options = this.options;
 
         if (options) {
 
@@ -501,12 +513,14 @@ define(['events', 'globalize', 'playbackManager', 'connectionManager', 'syncPlay
             unbindEvents(this, options.player);
         }
 
-        var elem = this.element;
+        const elem = this.element;
         if (elem) {
             elem.parentNode.removeChild(elem);
             this.element = null;
         }
-    };
+    }
+}
 
-    return PlayerStats;
-});
+/* eslint-enable indent */
+
+export default PlayerStats;
diff --git a/src/components/playlisteditor/playlisteditor.js b/src/components/playlisteditor/playlisteditor.js
index 56d7142ad3..7b1e915e1f 100644
--- a/src/components/playlisteditor/playlisteditor.js
+++ b/src/components/playlisteditor/playlisteditor.js
@@ -1,13 +1,28 @@
-define(['dom', 'shell', 'dialogHelper', 'loading', 'layoutManager', 'playbackManager', 'connectionManager', 'userSettings', 'appRouter', 'globalize', 'emby-input', 'paper-icon-button-light', 'emby-select', 'material-icons', 'css!./../formdialog', 'emby-button'], function (dom, shell, dialogHelper, loading, layoutManager, playbackManager, connectionManager, userSettings, appRouter, globalize) {
-    'use strict';
+import dom from 'dom';
+import dialogHelper from 'dialogHelper';
+import loading from 'loading';
+import layoutManager from 'layoutManager';
+import playbackManager from 'playbackManager';
+import connectionManager from 'connectionManager';
+import * as userSettings from 'userSettings';
+import appRouter from 'appRouter';
+import globalize from 'globalize';
+import 'emby-input';
+import 'paper-icon-button-light';
+import 'emby-select';
+import 'material-icons';
+import 'css!./../formdialog';
+import 'emby-button';
 
-    var currentServerId;
+/* eslint-disable indent */
+
+    let currentServerId;
 
     function onSubmit(e) {
-        var panel = dom.parentWithClass(this, 'dialog');
+        const panel = dom.parentWithClass(this, 'dialog');
 
-        var playlistId = panel.querySelector('#selectPlaylistToAddTo').value;
-        var apiClient = connectionManager.getApiClient(currentServerId);
+        const playlistId = panel.querySelector('#selectPlaylistToAddTo').value;
+        const apiClient = connectionManager.getApiClient(currentServerId);
 
         if (playlistId) {
             userSettings.set('playlisteditor-lastplaylistid', playlistId);
@@ -23,7 +38,7 @@ define(['dom', 'shell', 'dialogHelper', 'loading', 'layoutManager', 'playbackMan
     function createPlaylist(apiClient, dlg) {
         loading.show();
 
-        var url = apiClient.getUrl('Playlists', {
+        const url = apiClient.getUrl('Playlists', {
             Name: dlg.querySelector('#txtNewPlaylistName').value,
             Ids: dlg.querySelector('.fldSelectedItemIds').value || '',
             userId: apiClient.getCurrentUserId()
@@ -34,10 +49,10 @@ define(['dom', 'shell', 'dialogHelper', 'loading', 'layoutManager', 'playbackMan
             type: 'POST',
             url: url,
             dataType: 'json'
-        }).then(function (result) {
+        }).then(result => {
             loading.hide();
 
-            var id = result.Id;
+            const id = result.Id;
             dlg.submitted = true;
             dialogHelper.close(dlg);
             redirectToPlaylist(apiClient, id);
@@ -49,7 +64,7 @@ define(['dom', 'shell', 'dialogHelper', 'loading', 'layoutManager', 'playbackMan
     }
 
     function addToPlaylist(apiClient, dlg, id) {
-        var itemIds = dlg.querySelector('.fldSelectedItemIds').value || '';
+        const itemIds = dlg.querySelector('.fldSelectedItemIds').value || '';
 
         if (id === 'queue') {
             playbackManager.queue({
@@ -63,7 +78,7 @@ define(['dom', 'shell', 'dialogHelper', 'loading', 'layoutManager', 'playbackMan
 
         loading.show();
 
-        var url = apiClient.getUrl('Playlists/' + id + '/Items', {
+        const url = apiClient.getUrl(`Playlists/${id}/Items`, {
             Ids: itemIds,
             userId: apiClient.getCurrentUserId()
         });
@@ -72,7 +87,7 @@ define(['dom', 'shell', 'dialogHelper', 'loading', 'layoutManager', 'playbackMan
             type: 'POST',
             url: url
 
-        }).then(function () {
+        }).then(() => {
             loading.hide();
 
             dlg.submitted = true;
@@ -85,36 +100,36 @@ define(['dom', 'shell', 'dialogHelper', 'loading', 'layoutManager', 'playbackMan
     }
 
     function populatePlaylists(editorOptions, panel) {
-        var select = panel.querySelector('#selectPlaylistToAddTo');
+        const select = panel.querySelector('#selectPlaylistToAddTo');
 
         loading.hide();
 
         panel.querySelector('.newPlaylistInfo').classList.add('hide');
 
-        var options = {
+        const options = {
             Recursive: true,
             IncludeItemTypes: 'Playlist',
             SortBy: 'SortName',
             EnableTotalRecordCount: false
         };
 
-        var apiClient = connectionManager.getApiClient(currentServerId);
-        apiClient.getItems(apiClient.getCurrentUserId(), options).then(function (result) {
-            var html = '';
+        const apiClient = connectionManager.getApiClient(currentServerId);
+        apiClient.getItems(apiClient.getCurrentUserId(), options).then(result => {
+            let html = '';
 
             if (editorOptions.enableAddToPlayQueue !== false && playbackManager.isPlaying()) {
-                html += '<option value="queue">' + globalize.translate('AddToPlayQueue') + '</option>';
+                html += `<option value="queue">${globalize.translate('AddToPlayQueue')}</option>`;
             }
 
-            html += '<option value="">' + globalize.translate('OptionNew') + '</option>';
+            html += `<option value="">${globalize.translate('OptionNew')}</option>`;
 
-            html += result.Items.map(function (i) {
-                return '<option value="' + i.Id + '">' + i.Name + '</option>';
+            html += result.Items.map(i => {
+                return `<option value="${i.Id}">${i.Name}</option>`;
             });
 
             select.innerHTML = html;
 
-            var defaultValue = editorOptions.defaultValue;
+            let defaultValue = editorOptions.defaultValue;
             if (!defaultValue) {
                 defaultValue = userSettings.get('playlisteditor-lastplaylistid') || '';
             }
@@ -132,29 +147,29 @@ define(['dom', 'shell', 'dialogHelper', 'loading', 'layoutManager', 'playbackMan
     }
 
     function getEditorHtml(items) {
-        var html = '';
+        let html = '';
 
         html += '<div class="formDialogContent smoothScrollY" style="padding-top:2em;">';
         html += '<div class="dialogContentInner dialog-content-centered">';
         html += '<form style="margin:auto;">';
 
         html += '<div class="fldSelectPlaylist selectContainer">';
-        var autoFocus = items.length ? ' autofocus' : '';
-        html += '<select is="emby-select" id="selectPlaylistToAddTo" label="' + globalize.translate('LabelPlaylist') + '"' + autoFocus + '></select>';
+        let autoFocus = items.length ? ' autofocus' : '';
+        html += `<select is="emby-select" id="selectPlaylistToAddTo" label="${globalize.translate('LabelPlaylist')}"${autoFocus}></select>`;
         html += '</div>';
 
         html += '<div class="newPlaylistInfo">';
 
         html += '<div class="inputContainer">';
         autoFocus = items.length ? '' : ' autofocus';
-        html += '<input is="emby-input" type="text" id="txtNewPlaylistName" required="required" label="' + globalize.translate('LabelName') + '"' + autoFocus + ' />';
+        html += `<input is="emby-input" type="text" id="txtNewPlaylistName" required="required" label="${globalize.translate('LabelName')}"${autoFocus} />`;
         html += '</div>';
 
         // newPlaylistInfo
         html += '</div>';
 
         html += '<div class="formDialogFooter">';
-        html += '<button is="emby-button" type="submit" class="raised btnSubmit block formDialogFooterItem button-submit">' + globalize.translate('Add') + '</button>';
+        html += `<button is="emby-button" type="submit" class="raised btnSubmit block formDialogFooterItem button-submit">${globalize.translate('Add')}</button>`;
         html += '</div>';
 
         html += '<input type="hidden" class="fldSelectedItemIds" />';
@@ -187,7 +202,7 @@ define(['dom', 'shell', 'dialogHelper', 'loading', 'layoutManager', 'playbackMan
         } else {
             content.querySelector('.fldSelectPlaylist').classList.add('hide');
 
-            var selectPlaylistToAddTo = content.querySelector('#selectPlaylistToAddTo');
+            const selectPlaylistToAddTo = content.querySelector('#selectPlaylistToAddTo');
             selectPlaylistToAddTo.innerHTML = '';
             selectPlaylistToAddTo.value = '';
             triggerChange(selectPlaylistToAddTo);
@@ -195,72 +210,70 @@ define(['dom', 'shell', 'dialogHelper', 'loading', 'layoutManager', 'playbackMan
     }
 
     function centerFocus(elem, horiz, on) {
-        require(['scrollHelper'], function (scrollHelper) {
-            var fn = on ? 'on' : 'off';
+        import('scrollHelper').then(scrollHelper => {
+            const fn = on ? 'on' : 'off';
             scrollHelper.centerFocus[fn](elem, horiz);
         });
     }
 
-    function PlaylistEditor() {
+    export class showEditor {
+        constructor(options) {
+            const items = options.items || {};
+            currentServerId = options.serverId;
 
+            const dialogOptions = {
+                removeOnClose: true,
+                scrollY: false
+            };
+
+            if (layoutManager.tv) {
+                dialogOptions.size = 'fullscreen';
+            } else {
+                dialogOptions.size = 'small';
+            }
+
+            const dlg = dialogHelper.createDialog(dialogOptions);
+
+            dlg.classList.add('formDialog');
+
+            let html = '';
+            const title = globalize.translate('HeaderAddToPlaylist');
+
+            html += '<div class="formDialogHeader">';
+            html += '<button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><span class="material-icons arrow_back"></span></button>';
+            html += '<h3 class="formDialogHeaderTitle">';
+            html += title;
+            html += '</h3>';
+
+            html += '</div>';
+
+            html += getEditorHtml(items);
+
+            dlg.innerHTML = html;
+
+            initEditor(dlg, options, items);
+
+            dlg.querySelector('.btnCancel').addEventListener('click', () => {
+                dialogHelper.close(dlg);
+            });
+
+            if (layoutManager.tv) {
+                centerFocus(dlg.querySelector('.formDialogContent'), false, true);
+            }
+
+            return dialogHelper.open(dlg).then(() => {
+                if (layoutManager.tv) {
+                    centerFocus(dlg.querySelector('.formDialogContent'), false, false);
+                }
+
+                if (dlg.submitted) {
+                    return Promise.resolve();
+                }
+
+                return Promise.reject();
+            });
+        }
     }
 
-    PlaylistEditor.prototype.show = function (options) {
-        var items = options.items || {};
-        currentServerId = options.serverId;
-
-        var dialogOptions = {
-            removeOnClose: true,
-            scrollY: false
-        };
-
-        if (layoutManager.tv) {
-            dialogOptions.size = 'fullscreen';
-        } else {
-            dialogOptions.size = 'small';
-        }
-
-        var dlg = dialogHelper.createDialog(dialogOptions);
-
-        dlg.classList.add('formDialog');
-
-        var html = '';
-        var title = globalize.translate('HeaderAddToPlaylist');
-
-        html += '<div class="formDialogHeader">';
-        html += '<button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><span class="material-icons arrow_back"></span></button>';
-        html += '<h3 class="formDialogHeaderTitle">';
-        html += title;
-        html += '</h3>';
-
-        html += '</div>';
-
-        html += getEditorHtml(items);
-
-        dlg.innerHTML = html;
-
-        initEditor(dlg, options, items);
-
-        dlg.querySelector('.btnCancel').addEventListener('click', function () {
-            dialogHelper.close(dlg);
-        });
-
-        if (layoutManager.tv) {
-            centerFocus(dlg.querySelector('.formDialogContent'), false, true);
-        }
-
-        return dialogHelper.open(dlg).then(function () {
-            if (layoutManager.tv) {
-                centerFocus(dlg.querySelector('.formDialogContent'), false, false);
-            }
-
-            if (dlg.submitted) {
-                return Promise.resolve();
-            }
-
-            return Promise.reject();
-        });
-    };
-
-    return PlaylistEditor;
-});
+/* eslint-enable indent */
+export default showEditor;
diff --git a/src/components/pluginManager.js b/src/components/pluginManager.js
index 6cb56d767b..fd35d344bf 100644
--- a/src/components/pluginManager.js
+++ b/src/components/pluginManager.js
@@ -58,7 +58,7 @@ define(['events', 'globalize'], function (events, globalize) {
 
             return new Promise(function (resolve, reject) {
                 require([pluginSpec], (pluginFactory) => {
-                    var plugin = new pluginFactory();
+                    var plugin = pluginFactory.default ? new pluginFactory.default() : new pluginFactory();
 
                     // See if it's already installed
                     var existing = instance.pluginsList.filter(function (p) {
diff --git a/src/components/prompt/prompt.js b/src/components/prompt/prompt.js
index a76083cf04..f3bf72f8f2 100644
--- a/src/components/prompt/prompt.js
+++ b/src/components/prompt/prompt.js
@@ -1,12 +1,24 @@
-define(['browser', 'dialogHelper', 'layoutManager', 'scrollHelper', 'globalize', 'dom', 'require', 'material-icons', 'emby-button', 'paper-icon-button-light', 'emby-input', 'formDialogStyle'], function(browser, dialogHelper, layoutManager, scrollHelper, globalize, dom, require) {
-    'use strict';
+import browser from 'browser';
+import dialogHelper from 'dialogHelper';
+import layoutManager from 'layoutManager';
+import scrollHelper from 'scrollHelper';
+import globalize from 'globalize';
+import dom from 'dom';
+import 'material-icons';
+import 'emby-button';
+import 'paper-icon-button-light';
+import 'emby-input';
+import 'formDialogStyle';
+
+/* eslint-disable indent */
+export default (() => {
 
     function replaceAll(str, find, replace) {
         return str.split(find).join(replace);
     }
 
     function setInputProperties(dlg, options) {
-        var txtInput = dlg.querySelector('#txtInput');
+        const txtInput = dlg.querySelector('#txtInput');
 
         if (txtInput.label) {
             txtInput.label(options.label || '');
@@ -17,7 +29,7 @@ define(['browser', 'dialogHelper', 'layoutManager', 'scrollHelper', 'globalize',
     }
 
     function showDialog(options, template) {
-        var dialogOptions = {
+        const dialogOptions = {
             removeOnClose: true,
             scrollY: false
         };
@@ -26,7 +38,7 @@ define(['browser', 'dialogHelper', 'layoutManager', 'scrollHelper', 'globalize',
             dialogOptions.size = 'fullscreen';
         }
 
-        var dlg = dialogHelper.createDialog(dialogOptions);
+        const dlg = dialogHelper.createDialog(dialogOptions);
 
         dlg.classList.add('formDialog');
 
@@ -39,7 +51,7 @@ define(['browser', 'dialogHelper', 'layoutManager', 'scrollHelper', 'globalize',
             dlg.classList.add('dialog-fullscreen-lowres');
         }
 
-        dlg.querySelector('.btnCancel').addEventListener('click', function (e) {
+        dlg.querySelector('.btnCancel').addEventListener('click', () => {
             dialogHelper.close(dlg);
         });
 
@@ -53,16 +65,16 @@ define(['browser', 'dialogHelper', 'layoutManager', 'scrollHelper', 'globalize',
 
         setInputProperties(dlg, options);
 
-        var submitValue;
+        let submitValue;
 
-        dlg.querySelector('form').addEventListener('submit', function (e) {
+        dlg.querySelector('form').addEventListener('submit', e => {
 
             submitValue = dlg.querySelector('#txtInput').value;
             e.preventDefault();
             e.stopPropagation();
 
             // Important, don't close the dialog until after the form has completed submitting, or it will cause an error in Chrome
-            setTimeout(function () {
+            setTimeout(() => {
                 dialogHelper.close(dlg);
             }, 300);
 
@@ -71,9 +83,9 @@ define(['browser', 'dialogHelper', 'layoutManager', 'scrollHelper', 'globalize',
 
         dlg.querySelector('.submitText').innerHTML = options.confirmText || globalize.translate('ButtonOk');
 
-        dlg.style.minWidth = (Math.min(400, dom.getWindowSize().innerWidth - 50)) + 'px';
+        dlg.style.minWidth = `${Math.min(400, dom.getWindowSize().innerWidth - 50)}px`;
 
-        return dialogHelper.open(dlg).then(function () {
+        return dialogHelper.open(dlg).then(() => {
             if (layoutManager.tv) {
                 scrollHelper.centerFocus.off(dlg.querySelector('.formDialogContent'), false);
             }
@@ -87,7 +99,7 @@ define(['browser', 'dialogHelper', 'layoutManager', 'scrollHelper', 'globalize',
     }
 
     if ((browser.tv || browser.xboxOne) && window.confirm) {
-        return function (options) {
+        return options => {
             if (typeof options === 'string') {
                 options = {
                     label: '',
@@ -95,8 +107,8 @@ define(['browser', 'dialogHelper', 'layoutManager', 'scrollHelper', 'globalize',
                 };
             }
 
-            var label = replaceAll(options.label || '', '<br/>', '\n');
-            var result = prompt(label, options.text || '');
+            const label = replaceAll(options.label || '', '<br/>', '\n');
+            const result = prompt(label, options.text || '');
 
             if (result) {
                 return Promise.resolve(result);
@@ -105,9 +117,9 @@ define(['browser', 'dialogHelper', 'layoutManager', 'scrollHelper', 'globalize',
             }
         };
     } else {
-        return function (options) {
-            return new Promise(function (resolve, reject) {
-                require(['text!./prompt.template.html'], function (template) {
+        return options => {
+            return new Promise((resolve, reject) => {
+                import('text!./prompt.template.html').then(({default: template}) => {
                     if (typeof options === 'string') {
                         options = {
                             title: '',
@@ -119,4 +131,5 @@ define(['browser', 'dialogHelper', 'layoutManager', 'scrollHelper', 'globalize',
             });
         };
     }
-});
+})();
+/* eslint-enable indent */
diff --git a/src/components/prompt/prompt.template.html b/src/components/prompt/prompt.template.html
index 981fa9f102..a07629ae7e 100644
--- a/src/components/prompt/prompt.template.html
+++ b/src/components/prompt/prompt.template.html
@@ -2,12 +2,12 @@
     <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1">
         <span class="material-icons arrow_back"></span>
     </button>
+
     <h3 class="formDialogHeaderTitle"></h3>
 </div>
 
 <div class="formDialogContent smoothScrollY">
     <div class="dialogContentInner dialog-content-centered" style="padding-top:2em;">
-
         <form>
             <div class="inputContainer">
                 <input is="emby-input" type="text" id="txtInput" label="" />
@@ -19,7 +19,6 @@
                     <span class="submitText"></span>
                 </button>
             </div>
-
         </form>
     </div>
 </div>
diff --git a/src/components/recordingcreator/recordingcreator.js b/src/components/recordingcreator/recordingcreator.js
index ae26d0debc..d18d5fcb6c 100644
--- a/src/components/recordingcreator/recordingcreator.js
+++ b/src/components/recordingcreator/recordingcreator.js
@@ -156,7 +156,7 @@ define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'c
 
                 var html = '';
 
-                html += globalize.translateDocument(template, 'core');
+                html += globalize.translateHtml(template, 'core');
 
                 dlg.innerHTML = html;
 
diff --git a/src/components/recordingcreator/recordingeditor.js b/src/components/recordingcreator/recordingeditor.js
index 86c731ad26..c3f40fcddb 100644
--- a/src/components/recordingcreator/recordingeditor.js
+++ b/src/components/recordingcreator/recordingeditor.js
@@ -116,7 +116,7 @@ define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'c
 
                 var html = '';
 
-                html += globalize.translateDocument(template, 'core');
+                html += globalize.translateHtml(template, 'core');
 
                 dlg.innerHTML = html;
 
diff --git a/src/components/recordingcreator/recordingfields.js b/src/components/recordingcreator/recordingfields.js
index b4cbdfab0a..84348fcfbc 100644
--- a/src/components/recordingcreator/recordingfields.js
+++ b/src/components/recordingcreator/recordingfields.js
@@ -219,7 +219,7 @@ define(['globalize', 'connectionManager', 'serverNotifications', 'require', 'loa
             require(['text!./recordingfields.template.html'], function (template) {
                 var options = self.options;
                 var context = options.parent;
-                context.innerHTML = globalize.translateDocument(template, 'core');
+                context.innerHTML = globalize.translateHtml(template, 'core');
 
                 context.querySelector('.singleRecordingButton').addEventListener('click', onRecordChange.bind(self));
                 context.querySelector('.seriesRecordingButton').addEventListener('click', onRecordSeriesChange.bind(self));
diff --git a/src/components/recordingcreator/recordinghelper.js b/src/components/recordingcreator/recordinghelper.js
index a071cb2032..c773368f2d 100644
--- a/src/components/recordingcreator/recordinghelper.js
+++ b/src/components/recordingcreator/recordinghelper.js
@@ -34,7 +34,7 @@ define(['globalize', 'loading', 'connectionManager'], function (globalize, loadi
 
             require(['confirm'], function (confirm) {
 
-                confirm({
+                confirm.default({
 
                     text: globalize.translate('MessageConfirmRecordingCancellation'),
                     primary: 'delete',
@@ -59,7 +59,7 @@ define(['globalize', 'loading', 'connectionManager'], function (globalize, loadi
 
             require(['confirm'], function (confirm) {
 
-                confirm({
+                confirm.default({
 
                     text: globalize.translate('MessageConfirmRecordingCancellation'),
                     primary: 'delete',
diff --git a/src/components/recordingcreator/seriesrecordingeditor.js b/src/components/recordingcreator/seriesrecordingeditor.js
index 62accd5b63..a101ce53ec 100644
--- a/src/components/recordingcreator/seriesrecordingeditor.js
+++ b/src/components/recordingcreator/seriesrecordingeditor.js
@@ -168,7 +168,7 @@ define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'c
             var dlg = options.context;
 
             dlg.classList.add('hide');
-            dlg.innerHTML = globalize.translateDocument(template, 'core');
+            dlg.innerHTML = globalize.translateHtml(template, 'core');
 
             dlg.querySelector('.formDialogHeader').classList.add('hide');
             dlg.querySelector('.formDialogFooter').classList.add('hide');
@@ -221,7 +221,7 @@ define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'c
 
                 var html = '';
 
-                html += globalize.translateDocument(template, 'core');
+                html += globalize.translateHtml(template, 'core');
 
                 dlg.innerHTML = html;
 
diff --git a/src/components/remotecontrol/remotecontrol.css b/src/components/remotecontrol/remotecontrol.css
index 073c925339..c260799585 100644
--- a/src/components/remotecontrol/remotecontrol.css
+++ b/src/components/remotecontrol/remotecontrol.css
@@ -157,43 +157,110 @@
 }
 
 .nowPlayingSecondaryButtons {
-    display: -webkit-box;
-    display: -webkit-flex;
     display: flex;
-    -webkit-box-align: center;
-    -webkit-align-items: center;
     align-items: center;
-    -webkit-flex-wrap: wrap;
     flex-wrap: wrap;
-    -webkit-box-pack: end;
-    -webkit-justify-content: flex-end;
     justify-content: flex-end;
     z-index: 0;
 }
 
+.layout-mobile .playlistSectionButtonTransparent {
+    background: rgba(0, 0, 0, 0) !important;
+}
+
+.layout-mobile .playlistSection .playlist,
+.layout-mobile .playlistSection .contextMenu {
+    position: absolute;
+    top: 12.2em;
+    bottom: 4.2em;
+    overflow: scroll;
+    padding: 0 1em;
+    display: inline-block;
+    left: 0;
+    right: 0;
+    z-index: 1000;
+}
+
+.layout-mobile .playlistSectionButton {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    height: 4.2em;
+    right: 0;
+    padding-left: 7.3%;
+    padding-right: 7.3%;
+}
+
+.layout-desktop .playlistSectionButton,
+.layout-tv .playlistSectionButton {
+    background: none;
+}
+
+.layout-desktop .nowPlayingPlaylist,
+.layout-tv .nowPlayingPlaylist {
+    background: none;
+}
+
+.layout-mobile .playlistSectionButton .btnTogglePlaylist {
+    font-size: larger;
+    margin: 0;
+}
+
+.layout-mobile .playlistSectionButton .btnSavePlaylist {
+    margin: 0;
+    border-radius: 0;
+}
+
+.layout-mobile .playlistSectionButton .volumecontrol {
+    margin: 0;
+    padding-right: 0;
+    border-radius: 0;
+}
+
+.layout-mobile .playlistSectionButton .btnToggleContextMenu {
+    font-size: larger;
+    margin: 0;
+}
+
+.layout-mobile .nowPlayingSecondaryButtons .btnShuffleQueue {
+    display: none;
+}
+
+.layout-mobile .nowPlayingSecondaryButtons .volumecontrol {
+    display: none;
+}
+
+.layout-mobile .nowPlayingSecondaryButtons .btnRepeat {
+    display: none;
+}
+
+.layout-desktop .nowPlayingInfoButtons .btnRepeat,
+.layout-tv .nowPlayingInfoButtons .btnRepeat {
+    display: none;
+}
+
+.layout-desktop .nowPlayingInfoButtons .btnShuffleQueue,
+.layout-tv .nowPlayingInfoButtons .btnShuffleQueue {
+    display: none;
+}
+
+.layout-desktop .playlistSectionButton .volumecontrol,
+.layout-tv .playlistSectionButton .volumecontrol {
+    display: none;
+}
+
+.nowPlayingInfoControls .nowPlayingPageUserDataButtonsTitle {
+    display: none;
+}
+
+.layout-mobile .nowPlayingPageUserDataButtons {
+    display: none;
+}
+
 @media all and (min-width: 63em) {
     .nowPlayingPage {
         padding: 8em 0 0 0 !important;
     }
-
-    .nowPlayingSecondaryButtons {
-        -webkit-box-flex: 1;
-        -webkit-flex-grow: 1;
-        flex-grow: 1;
-        -webkit-box-pack: end;
-        -webkit-justify-content: flex-end;
-        justify-content: flex-end;
-    }
-
-    .nowPlayingPageUserDataButtonsTitle {
-        display: none !important;
-    }
-
-    .playlistSectionButton,
-    .nowPlayingPlaylist,
-    .nowPlayingContextMenu {
-        background: unset !important;
-    }
 }
 
 @media all and (min-width: 80em) {
@@ -202,7 +269,7 @@
     }
 }
 
-@media all and (orientation: portrait) and (max-width: 47em) {
+@media all and (orientation: portrait) and (max-width: 43em) {
     .remoteControlContent {
         padding-left: 7.3% !important;
         padding-right: 7.3% !important;
@@ -211,6 +278,10 @@
         flex-direction: column;
     }
 
+    .layout-desktop .nowPlayingPageUserDataButtons {
+        display: none;
+    }
+
     .nowPlayingInfoContainer {
         -webkit-box-orient: vertical !important;
         -webkit-box-direction: normal !important;
@@ -280,6 +351,7 @@
     .nowPlayingInfoControls .nowPlayingPageUserDataButtonsTitle {
         width: 20%;
         font-size: large;
+        display: unset;
     }
 
     .nowPlayingInfoControls .nowPlayingPageUserDataButtonsTitle button {
@@ -290,7 +362,7 @@
         border-radius: 0;
     }
 
-    .nowPlayingInfoButtons .btnRewind {
+    .nowPlayingInfoButtons .btnRepeat {
         position: absolute;
         left: 0;
         margin-left: 0;
@@ -298,7 +370,7 @@
         font-size: smaller;
     }
 
-    .nowPlayingInfoButtons .btnFastForward {
+    .nowPlayingInfoButtons .btnShuffleQueue {
         position: absolute;
         right: 0;
         margin-right: 0;
@@ -342,250 +414,6 @@
         width: auto;
     }
 
-    #nowPlayingPage .playlistSection .playlist,
-    #nowPlayingPage .playlistSection .contextMenu {
-        position: absolute;
-        top: 12.2em;
-        bottom: 4.2em;
-        overflow: scroll;
-        padding: 0 1em;
-        display: inline-block;
-        left: 0;
-        right: 0;
-        z-index: 1000;
-    }
-
-    .playlistSectionButton {
-        position: fixed;
-        bottom: 0;
-        left: 0;
-        height: 4.2em;
-        right: 0;
-        padding-left: 7.3%;
-        padding-right: 7.3%;
-    }
-
-    .playlistSectionButton .btnTogglePlaylist {
-        font-size: larger;
-        margin: 0;
-        padding-left: 0;
-    }
-
-    .playlistSectionButton .btnSavePlaylist {
-        margin: 0;
-        padding-right: 0;
-        -webkit-box-flex: 1;
-        -webkit-flex-grow: 1;
-        flex-grow: 1;
-        -webkit-box-pack: end;
-        -webkit-justify-content: flex-end;
-        justify-content: flex-end;
-        border-radius: 0;
-    }
-
-    .playlistSectionButton .btnToggleContextMenu {
-        font-size: larger;
-        margin: 0;
-        padding-right: 0;
-        -webkit-box-flex: 1;
-        -webkit-flex-grow: 1;
-        flex-grow: 1;
-        -webkit-box-pack: end;
-        -webkit-justify-content: flex-end;
-        justify-content: flex-end;
-        border-radius: 0;
-    }
-
-    .playlistSectionButton .volumecontrol {
-        width: 100%;
-    }
-
-    .remoteControlSection {
-        margin: 0;
-        padding: 0 0 4.2em 0;
-    }
-
-    .nowPlayingButtonsContainer {
-        display: flex;
-        height: 100%;
-        flex-direction: column;
-    }
-}
-
-@media all and (orientation: landscape) and (max-width: 63em) {
-    .remoteControlContent {
-        padding-left: 4.3% !important;
-        padding-right: 4.3% !important;
-        display: flex;
-        height: 100%;
-        flex-direction: column;
-    }
-
-    .nowPlayingInfoContainer {
-        -webkit-box-orient: horizontal !important;
-        -webkit-box-direction: normal !important;
-        -webkit-flex-direction: row !important;
-        flex-direction: row !important;
-        -webkit-box-align: center;
-        -webkit-align-items: center;
-        align-items: center;
-        width: 100%;
-        height: calc(100% - 4.2em);
-    }
-
-    .nowPlayingPageTitle {
-        /* text-align: center; */
-        margin: 0;
-    }
-
-    .nowPlayingInfoContainerMedia {
-        text-align: left !important;
-        width: 80%;
-    }
-
-    .nowPlayingPositionSliderContainer {
-        margin: 0.2em 1em 0.2em 1em;
-    }
-
-    .nowPlayingInfoButtons {
-        /* margin: 1.5em 0 0 0; */
-        -webkit-box-pack: center;
-        -webkit-justify-content: center;
-        justify-content: center;
-        font-size: x-large;
-        height: 100%;
-    }
-
-    .nowPlayingPageImageContainer {
-        width: 30%;
-        margin: auto 1em auto auto;
-    }
-
-    .nowPlayingPageImageContainerNoAlbum .cardImageContainer .cardImageIcon {
-        font-size: 12em;
-        color: inherit;
-    }
-
-    .nowPlayingInfoControls {
-        margin: 0.5em 0 1em 0;
-        width: 100%;
-        -webkit-box-pack: start !important;
-        -webkit-justify-content: start !important;
-        justify-content: start !important;
-    }
-
-    .nowPlayingSecondaryButtons {
-        -webkit-box-flex: 1;
-        -webkit-flex-grow: 1;
-        flex-grow: 1;
-        -webkit-box-pack: center;
-        -webkit-justify-content: center;
-        justify-content: center;
-    }
-
-    .nowPlayingInfoControls .nowPlayingPageUserDataButtonsTitle {
-        width: 20%;
-        font-size: large;
-    }
-
-    .nowPlayingInfoControls .nowPlayingPageUserDataButtonsTitle button {
-        padding-top: 0;
-        padding-right: 0;
-        margin-right: 0;
-        float: right;
-        border-radius: 0;
-    }
-
-    .paper-icon-button-light:hover {
-        color: #fff !important;
-        background-color: transparent !important;
-    }
-
-    .btnPlayPause {
-        padding: 0;
-        margin: 0;
-        font-size: 1.7em;
-    }
-
-    .btnPlayPause:hover {
-        background-color: transparent !important;
-    }
-
-    .nowPlayingPageImage {
-        /* width: inherit; */
-        overflow-y: hidden;
-        overflow: hidden;
-        margin: 0 auto;
-    }
-
-    .nowPlayingPageImage.nowPlayingPageImageAudio {
-        width: 100%;
-    }
-
-    .nowPlayingPageImageContainer.nowPlayingPageImagePoster {
-        height: 100%;
-        overflow: hidden;
-    }
-
-    .nowPlayingPageImageContainer.nowPlayingPageImagePoster img {
-        height: 100%;
-        width: auto;
-    }
-
-    #nowPlayingPage .playlistSection .playlist,
-    #nowPlayingPage .playlistSection .contextMenu {
-        position: absolute;
-        top: 7.2em;
-        bottom: 4.2em;
-        overflow: scroll;
-        padding: 0 1em;
-        display: inline-block;
-        left: 0;
-        right: 0;
-        z-index: 1000;
-    }
-
-    .playlistSectionButton {
-        position: fixed;
-        bottom: 0;
-        left: 0;
-        height: 4.2em;
-        right: 0;
-        padding-left: 4.3%;
-        padding-right: 4.3%;
-    }
-
-    .playlistSectionButton .btnTogglePlaylist {
-        font-size: larger;
-        margin: 0;
-        padding-left: 0;
-    }
-
-    .playlistSectionButton .btnSavePlaylist {
-        margin: 0;
-        padding-right: 0;
-        -webkit-box-flex: 1;
-        -webkit-flex-grow: 1;
-        flex-grow: 1;
-        -webkit-box-pack: end;
-        -webkit-justify-content: flex-end;
-        justify-content: flex-end;
-        border-radius: 0;
-    }
-
-    .playlistSectionButton .btnToggleContextMenu {
-        font-size: larger;
-        margin: 0;
-        padding-right: 0;
-        -webkit-box-flex: 1;
-        -webkit-flex-grow: 1;
-        flex-grow: 1;
-        -webkit-box-pack: end;
-        -webkit-justify-content: flex-end;
-        justify-content: flex-end;
-        border-radius: 0;
-    }
-
     .playlistSectionButton .volumecontrol {
         width: 100%;
     }
@@ -627,6 +455,10 @@
     background-image: url(../../assets/img/equalizer.gif) !important;
 }
 
+.playlistIndexIndicatorImage > * {
+    display: none;
+}
+
 .hideVideoButtons .videoButton {
     display: none;
 }
@@ -636,7 +468,6 @@
 }
 
 @media all and (max-width: 63em) {
-    .nowPlayingSecondaryButtons .nowPlayingPageUserDataButtons,
     .nowPlayingSecondaryButtons .repeatToggleButton,
     .nowPlayingInfoButtons .playlist .listItemMediaInfo,
     .nowPlayingInfoButtons .btnStop {
diff --git a/src/components/remotecontrol/remotecontrol.js b/src/components/remotecontrol/remotecontrol.js
index 089915a834..874137155c 100644
--- a/src/components/remotecontrol/remotecontrol.js
+++ b/src/components/remotecontrol/remotecontrol.js
@@ -1,5 +1,7 @@
-define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageLoader', 'playbackManager', 'nowPlayingHelper', 'events', 'connectionManager', 'apphost', 'globalize', 'layoutManager', 'userSettings', 'cardBuilder', 'cardStyle', 'emby-itemscontainer', 'css!./remotecontrol.css', 'emby-ratingbutton'], function (browser, datetime, backdrop, libraryBrowser, listView, imageLoader, playbackManager, nowPlayingHelper, events, connectionManager, appHost, globalize, layoutManager, userSettings, cardBuilder) {
+define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageLoader', 'playbackManager', 'nowPlayingHelper', 'events', 'connectionManager', 'apphost', 'globalize', 'layoutManager', 'userSettings', 'cardBuilder', 'itemContextMenu', 'cardStyle', 'emby-itemscontainer', 'css!./remotecontrol.css', 'emby-ratingbutton'], function (browser, datetime, backdrop, libraryBrowser, listView, imageLoader, playbackManager, nowPlayingHelper, events, connectionManager, appHost, globalize, layoutManager, userSettings, cardBuilder, itemContextMenu) {
     'use strict';
+    var showMuteButton = true;
+    var showVolumeSlider = true;
 
     function showAudioMenu(context, player, button, item) {
         var currentIndex = playbackManager.getAudioStreamIndex(player);
@@ -118,30 +120,41 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
             if (item.Type == 'Audio' || item.MediaStreams[0].Type == 'Audio') {
                 var songName = item.Name;
                 if (item.Album != null && item.Artists != null) {
+                    var artistsSeries = '';
                     var albumName = item.Album;
-                    var artistName;
                     if (item.ArtistItems != null) {
-                        artistName = item.ArtistItems[0].Name;
-                        context.querySelector('.nowPlayingAlbum').innerHTML = '<a class="button-link emby-button" is="emby-linkbutton" href="itemdetails.html?id=' + item.AlbumId + `&amp;serverId=${nowPlayingServerId}">${albumName}</a>`;
-                        context.querySelector('.nowPlayingArtist').innerHTML = '<a class="button-link emby-button" is="emby-linkbutton" href="itemdetails.html?id=' + item.ArtistItems[0].Id + `&amp;serverId=${nowPlayingServerId}">${artistName}</a>`;
-                        context.querySelector('.contextMenuAlbum').innerHTML = '<a class="button-link emby-button" is="emby-linkbutton" href="itemdetails.html?id=' + item.AlbumId + `&amp;serverId=${nowPlayingServerId}"><span class="actionsheetMenuItemIcon listItemIcon listItemIcon-transparent material-icons album"></span> ` + globalize.translate('ViewAlbum') + '</a>';
-                        context.querySelector('.contextMenuArtist').innerHTML = '<a class="button-link emby-button" is="emby-linkbutton" href="itemdetails.html?id=' + item.ArtistItems[0].Id + `&amp;serverId=${nowPlayingServerId}"><span class="actionsheetMenuItemIcon listItemIcon listItemIcon-transparent material-icons person"></span> ` + globalize.translate('ViewArtist') + '</a>';
-                    } else {
-                        artistName = item.Artists;
-                        context.querySelector('.nowPlayingAlbum').innerHTML = albumName;
-                        context.querySelector('.nowPlayingArtist').innerHTML = artistName;
+                        for (const artist of item.ArtistItems) {
+                            let artistName = artist.Name;
+                            let artistId = artist.Id;
+                            artistsSeries += `<a class="button-link emby-button" is="emby-linkbutton" href="details?id=${artistId}&serverId=${nowPlayingServerId}">${artistName}</a>`;
+                            if (artist !== item.ArtistItems.slice(-1)[0]) {
+                                artistsSeries += ', ';
+                            }
+                        }
+                    } else if (item.Artists) {
+                        // For some reason, Chromecast Player doesn't return a item.ArtistItems object, so we need to fallback
+                        // to normal item.Artists item.
+                        // TODO: Normalise fields returned by all the players
+                        for (const artist of item.Artists) {
+                            artistsSeries += `<a>${artist}</a>`;
+                            if (artist !== item.Artists.slice(-1)[0]) {
+                                artistsSeries += ', ';
+                            }
+                        }
                     }
+                    context.querySelector('.nowPlayingArtist').innerHTML = artistsSeries;
+                    context.querySelector('.nowPlayingAlbum').innerHTML = '<a class="button-link emby-button" is="emby-linkbutton" href="details?id=' + item.AlbumId + `&serverId=${nowPlayingServerId}">${albumName}</a>`;
                 }
                 context.querySelector('.nowPlayingSongName').innerHTML = songName;
             } else if (item.Type == 'Episode') {
                 if (item.SeasonName != null) {
                     var seasonName = item.SeasonName;
-                    context.querySelector('.nowPlayingSeason').innerHTML = '<a class="button-link emby-button" is="emby-linkbutton" href="itemdetails.html?id=' + item.SeasonId + `&amp;serverId=${nowPlayingServerId}">${seasonName}</a>`;
+                    context.querySelector('.nowPlayingSeason').innerHTML = '<a class="button-link emby-button" is="emby-linkbutton" href="details?id=' + item.SeasonId + `&serverId=${nowPlayingServerId}">${seasonName}</a>`;
                 }
                 if (item.SeriesName != null) {
                     var seriesName = item.SeriesName;
                     if (item.SeriesId != null) {
-                        context.querySelector('.nowPlayingSerie').innerHTML = '<a class="button-link emby-button" is="emby-linkbutton" href="itemdetails.html?id=' + item.SeriesId + `&amp;serverId=${nowPlayingServerId}">${seriesName}</a>`;
+                        context.querySelector('.nowPlayingSerie').innerHTML = '<a class="button-link emby-button" is="emby-linkbutton" href="details?id=' + item.SeriesId + `&serverId=${nowPlayingServerId}">${seriesName}</a>`;
                     } else {
                         context.querySelector('.nowPlayingSerie').innerHTML = seriesName;
                     }
@@ -163,11 +176,38 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
                 maxHeight: 300 * 2
             }) : null;
 
-            console.debug('updateNowPlayingInfo');
+            let contextButton = context.querySelector('.btnToggleContextMenu');
+            // We remove the previous event listener by replacing the item in each update event
+            const autoFocusContextButton = document.activeElement === contextButton;
+            let contextButtonClone = contextButton.cloneNode(true);
+            contextButton.parentNode.replaceChild(contextButtonClone, contextButton);
+            contextButton = context.querySelector('.btnToggleContextMenu');
+            if (autoFocusContextButton) {
+                contextButton.focus();
+            }
+            const stopPlayback = !!layoutManager.mobile;
+            var options = {
+                play: false,
+                queue: false,
+                stopPlayback: stopPlayback,
+                clearQueue: true,
+                openAlbum: false,
+                positionTo: contextButton
+            };
+            var apiClient = connectionManager.getApiClient(item.ServerId);
+            apiClient.getItem(apiClient.getCurrentUserId(), item.Id).then(function (fullItem) {
+                apiClient.getCurrentUser().then(function (user) {
+                    contextButton.addEventListener('click', function () {
+                        itemContextMenu.show(Object.assign({
+                            item: fullItem,
+                            user: user
+                        }, options));
+                    });
+                });
+            });
             setImageUrl(context, state, url);
             if (item) {
                 backdrop.setBackdrops([item]);
-                var apiClient = connectionManager.getApiClient(item.ServerId);
                 apiClient.getItem(apiClient.getCurrentUserId(), item.Id).then(function (fullItem) {
                     var userData = fullItem.UserData || {};
                     var likes = null == userData.Likes ? '' : userData.Likes;
@@ -175,7 +215,7 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
                     context.querySelector('.nowPlayingPageUserDataButtons').innerHTML = '<button is="emby-ratingbutton" type="button" class="listItemButton paper-icon-button-light" data-id="' + fullItem.Id + '" data-serverid="' + fullItem.ServerId + '" data-itemtype="' + fullItem.Type + '" data-likes="' + likes + '" data-isfavorite="' + userData.IsFavorite + '"><span class="material-icons favorite"></span></button>';
                 });
             } else {
-                backdrop.clear();
+                backdrop.clearBackdrop();
                 context.querySelector('.nowPlayingPageUserDataButtons').innerHTML = '';
             }
         }
@@ -196,7 +236,7 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
                 context.querySelector('.nowPlayingPageImage').classList.remove('nowPlayingPageImageAudio');
             }
         } else {
-            imgContainer.innerHTML = '<div class="nowPlayingPageImageContainerNoAlbum"><button data-action="link" class="cardContent-button cardImageContainer coveredImage ' + cardBuilder.getDefaultBackgroundClass(item.Name) + ' cardContent cardContent-shadow itemAction"><span class="cardImageIcon material-icons album"></span></button></div>';
+            imgContainer.innerHTML = '<div class="nowPlayingPageImageContainerNoAlbum"><button data-action="link" class="cardImageContainer coveredImage ' + cardBuilder.getDefaultBackgroundClass(item.Name) + ' cardContent cardContent-shadow itemAction"><span class="cardImageIcon material-icons album"></span></button></div>';
         }
     }
 
@@ -219,20 +259,16 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
 
     var currentImgUrl;
     return function () {
-        function toggleRepeat(player) {
-            if (player) {
-                switch (playbackManager.getRepeatMode(player)) {
-                    case 'RepeatNone':
-                        playbackManager.setRepeatMode('RepeatAll', player);
-                        break;
-
-                    case 'RepeatAll':
-                        playbackManager.setRepeatMode('RepeatOne', player);
-                        break;
-
-                    case 'RepeatOne':
-                        playbackManager.setRepeatMode('RepeatNone', player);
-                }
+        function toggleRepeat() {
+            switch (playbackManager.getRepeatMode()) {
+                case 'RepeatAll':
+                    playbackManager.setRepeatMode('RepeatOne');
+                    break;
+                case 'RepeatOne':
+                    playbackManager.setRepeatMode('RepeatNone');
+                    break;
+                case 'RepeatNone':
+                    playbackManager.setRepeatMode('RepeatAll');
             }
         }
 
@@ -275,8 +311,13 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
             buttonVisible(context.querySelector('.btnStop'), null != item);
             buttonVisible(context.querySelector('.btnNextTrack'), null != item);
             buttonVisible(context.querySelector('.btnPreviousTrack'), null != item);
-            buttonVisible(context.querySelector('.btnRewind'), null != item);
-            buttonVisible(context.querySelector('.btnFastForward'), null != item);
+            if (layoutManager.mobile) {
+                buttonVisible(context.querySelector('.btnRewind'), false);
+                buttonVisible(context.querySelector('.btnFastForward'), false);
+            } else {
+                buttonVisible(context.querySelector('.btnRewind'), null != item);
+                buttonVisible(context.querySelector('.btnFastForward'), null != item);
+            }
             var positionSlider = context.querySelector('.nowPlayingPositionSlider');
 
             if (positionSlider && item && item.RunTimeTicks) {
@@ -300,7 +341,8 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
                 context.classList.add('hideVideoButtons');
             }
 
-            updateRepeatModeDisplay(playState.RepeatMode);
+            updateRepeatModeDisplay(playbackManager.getRepeatMode());
+            onShuffleQueueModeChange(false);
             updateNowPlayingInfo(context, state);
         }
 
@@ -316,25 +358,32 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
 
         function updateRepeatModeDisplay(repeatMode) {
             var context = dlg;
-            var toggleRepeatButton = context.querySelector('.repeatToggleButton');
+            let toggleRepeatButtons = context.querySelectorAll('.repeatToggleButton');
+            const cssClass = 'buttonActive';
+            let innHtml = '<span class="material-icons repeat"></span>';
+            let repeatOn = true;
 
-            if ('RepeatAll' == repeatMode) {
-                toggleRepeatButton.innerHTML = "<span class='material-icons repeat'></span>";
-                toggleRepeatButton.classList.add('repeatButton-active');
-            } else if ('RepeatOne' == repeatMode) {
-                toggleRepeatButton.innerHTML = "<span class='material-icons repeat_one'></span>";
-                toggleRepeatButton.classList.add('repeatButton-active');
-            } else {
-                toggleRepeatButton.innerHTML = "<span class='material-icons repeat'></span>";
-                toggleRepeatButton.classList.remove('repeatButton-active');
+            switch (repeatMode) {
+                case 'RepeatAll':
+                    break;
+                case 'RepeatOne':
+                    innHtml = '<span class="material-icons repeat_one"></span>';
+                    break;
+                case 'RepeatNone':
+                default:
+                    repeatOn = false;
+                    break;
+            }
+
+            for (const toggleRepeatButton of toggleRepeatButtons) {
+                toggleRepeatButton.classList.toggle(cssClass, repeatOn);
+                toggleRepeatButton.innerHTML = innHtml;
             }
         }
 
         function updatePlayerVolumeState(context, isMuted, volumeLevel) {
             var view = context;
             var supportedCommands = currentPlayerSupportedCommands;
-            var showMuteButton = true;
-            var showVolumeSlider = true;
 
             if (-1 === supportedCommands.indexOf('Mute')) {
                 showMuteButton = false;
@@ -362,24 +411,21 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
                 buttonMuteIcon.classList.add('volume_up');
             }
 
-            if (showMuteButton) {
-                buttonMute.classList.remove('hide');
+            if (!showMuteButton && !showVolumeSlider) {
+                context.querySelector('.volumecontrol').classList.add('hide');
             } else {
-                buttonMute.classList.add('hide');
-            }
+                buttonMute.classList.toggle('hide', !showMuteButton);
 
-            var nowPlayingVolumeSlider = context.querySelector('.nowPlayingVolumeSlider');
-            var nowPlayingVolumeSliderContainer = context.querySelector('.nowPlayingVolumeSliderContainer');
+                var nowPlayingVolumeSlider = context.querySelector('.nowPlayingVolumeSlider');
+                var nowPlayingVolumeSliderContainer = context.querySelector('.nowPlayingVolumeSliderContainer');
 
-            if (nowPlayingVolumeSlider) {
-                if (showVolumeSlider) {
-                    nowPlayingVolumeSliderContainer.classList.remove('hide');
-                } else {
-                    nowPlayingVolumeSliderContainer.classList.add('hide');
-                }
+                if (nowPlayingVolumeSlider) {
 
-                if (!nowPlayingVolumeSlider.dragging) {
-                    nowPlayingVolumeSlider.value = volumeLevel || 0;
+                    nowPlayingVolumeSliderContainer.classList.toggle('hide', !showVolumeSlider);
+
+                    if (!nowPlayingVolumeSlider.dragging) {
+                        nowPlayingVolumeSlider.value = volumeLevel || 0;
+                    }
                 }
             }
         }
@@ -420,11 +466,21 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
         function loadPlaylist(context, player) {
             getPlaylistItems(player).then(function (items) {
                 var html = '';
+                let favoritesEnabled = true;
+                if (layoutManager.mobile) {
+                    if (items.length > 0) {
+                        context.querySelector('.btnTogglePlaylist').classList.remove('hide');
+                    } else {
+                        context.querySelector('.btnTogglePlaylist').classList.add('hide');
+                    }
+                    favoritesEnabled = false;
+                }
+
                 html += listView.getListViewHtml({
                     items: items,
                     smallIcon: true,
                     action: 'setplaylistindex',
-                    enableUserDataButtons: false,
+                    enableUserDataButtons: favoritesEnabled,
                     rightButtons: [{
                         icon: 'remove_circle_outline',
                         title: globalize.translate('ButtonRemove'),
@@ -433,18 +489,21 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
                     dragHandle: true
                 });
 
-                if (items.length) {
-                    context.querySelector('.btnTogglePlaylist').classList.remove('hide');
-                } else {
-                    context.querySelector('.btnTogglePlaylist').classList.add('hide');
+                var itemsContainer = context.querySelector('.playlist');
+                let focusedItemPlaylistId = itemsContainer.querySelector('button:focus');
+                itemsContainer.innerHTML = html;
+                if (focusedItemPlaylistId !== null) {
+                    focusedItemPlaylistId = focusedItemPlaylistId.getAttribute('data-playlistitemid');
+                    const newFocusedItem = itemsContainer.querySelector(`button[data-playlistitemid="${focusedItemPlaylistId}"]`);
+                    if (newFocusedItem !== null) {
+                        newFocusedItem.focus();
+                    }
                 }
 
-                var itemsContainer = context.querySelector('.playlist');
-                itemsContainer.innerHTML = html;
                 var playlistItemId = playbackManager.getCurrentPlaylistItemId(player);
 
                 if (playlistItemId) {
-                    var img = itemsContainer.querySelector('.listItem[data-playlistItemId="' + playlistItemId + '"] .listItemImage');
+                    var img = itemsContainer.querySelector(`.listItem[data-playlistItemId="${playlistItemId}"] .listItemImage`);
 
                     if (img) {
                         img.classList.remove('lazy');
@@ -453,9 +512,6 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
                 }
 
                 imageLoader.lazyChildren(itemsContainer);
-                context.querySelector('.playlist').classList.add('hide');
-                context.querySelector('.contextMenu').classList.add('hide');
-                context.querySelector('.btnSavePlaylist').classList.add('hide');
             });
         }
 
@@ -465,9 +521,31 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
             onStateChanged.call(player, e, state);
         }
 
-        function onRepeatModeChange(e) {
-            var player = this;
-            updateRepeatModeDisplay(playbackManager.getRepeatMode(player));
+        function onRepeatModeChange() {
+            updateRepeatModeDisplay(playbackManager.getRepeatMode());
+        }
+
+        function onShuffleQueueModeChange(updateView = true) {
+            let shuffleMode = playbackManager.getQueueShuffleMode(this);
+            let context = dlg;
+            const cssClass = 'buttonActive';
+            let shuffleButtons = context.querySelectorAll('.btnShuffleQueue');
+
+            for (let shuffleButton of shuffleButtons) {
+                switch (shuffleMode) {
+                    case 'Shuffle':
+                        shuffleButton.classList.add(cssClass);
+                        break;
+                    case 'Sorted':
+                    default:
+                        shuffleButton.classList.remove(cssClass);
+                        break;
+                }
+            }
+
+            if (updateView) {
+                onPlaylistUpdate();
+            }
         }
 
         function onPlaylistUpdate(e) {
@@ -476,14 +554,18 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
 
         function onPlaylistItemRemoved(e, info) {
             var context = dlg;
-            var playlistItemIds = info.playlistItemIds;
+            if (info !== undefined) {
+                var playlistItemIds = info.playlistItemIds;
 
-            for (var i = 0, length = playlistItemIds.length; i < length; i++) {
-                var listItem = context.querySelector('.listItem[data-playlistItemId="' + playlistItemIds[i] + '"]');
+                for (var i = 0, length = playlistItemIds.length; i < length; i++) {
+                    var listItem = context.querySelector('.listItem[data-playlistItemId="' + playlistItemIds[i] + '"]');
 
-                if (listItem) {
-                    listItem.parentNode.removeChild(listItem);
+                    if (listItem) {
+                        listItem.parentNode.removeChild(listItem);
+                    }
                 }
+            } else {
+                onPlaylistUpdate();
             }
         }
 
@@ -493,7 +575,6 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
 
             if (!state.NextMediaType) {
                 updatePlayerState(player, dlg, {});
-                loadPlaylist(dlg);
                 Emby.Page.back();
             }
         }
@@ -505,7 +586,7 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
         function onStateChanged(event, state) {
             var player = this;
             updatePlayerState(player, dlg, state);
-            loadPlaylist(dlg, player);
+            onPlaylistUpdate();
         }
 
         function onTimeUpdate(e) {
@@ -531,8 +612,10 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
                 events.off(player, 'playbackstart', onPlaybackStart);
                 events.off(player, 'statechange', onStateChanged);
                 events.off(player, 'repeatmodechange', onRepeatModeChange);
-                events.off(player, 'playlistitemremove', onPlaylistUpdate);
+                events.off(player, 'shufflequeuemodechange', onShuffleQueueModeChange);
+                events.off(player, 'playlistitemremove', onPlaylistItemRemoved);
                 events.off(player, 'playlistitemmove', onPlaylistUpdate);
+                events.off(player, 'playlistitemadd', onPlaylistUpdate);
                 events.off(player, 'playbackstop', onPlaybackStopped);
                 events.off(player, 'volumechange', onVolumeChanged);
                 events.off(player, 'pause', onPlayPauseStateChanged);
@@ -551,8 +634,10 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
                 events.on(player, 'playbackstart', onPlaybackStart);
                 events.on(player, 'statechange', onStateChanged);
                 events.on(player, 'repeatmodechange', onRepeatModeChange);
+                events.on(player, 'shufflequeuemodechange', onShuffleQueueModeChange);
                 events.on(player, 'playlistitemremove', onPlaylistItemRemoved);
                 events.on(player, 'playlistitemmove', onPlaylistUpdate);
+                events.on(player, 'playlistitemadd', onPlaylistUpdate);
                 events.on(player, 'playbackstop', onPlaybackStopped);
                 events.on(player, 'volumechange', onVolumeChanged);
                 events.on(player, 'pause', onPlayPauseStateChanged);
@@ -568,7 +653,7 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
         function onBtnCommandClick() {
             if (currentPlayer) {
                 if (this.classList.contains('repeatToggleButton')) {
-                    toggleRepeat(currentPlayer);
+                    toggleRepeat();
                 } else {
                     playbackManager.sendCommand({
                         Name: this.getAttribute('data-command')
@@ -589,7 +674,7 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
             require(['playlistEditor'], function (playlistEditor) {
                 getSaveablePlaylistItems().then(function (items) {
                     var serverId = items.length ? items[0].ServerId : ApiClient.serverId();
-                    new playlistEditor().show({
+                    new playlistEditor.showEditor({
                         items: items.map(function (i) {
                             return i.Id;
                         }),
@@ -603,6 +688,7 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
 
         function bindEvents(context) {
             var btnCommand = context.querySelectorAll('.btnCommand');
+            var positionSlider = context.querySelector('.nowPlayingPositionSlider');
 
             for (var i = 0, length = btnCommand.length; i < length; i++) {
                 btnCommand[i].addEventListener('click', onBtnCommandClick);
@@ -650,12 +736,37 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
                     playbackManager.fastForward(currentPlayer);
                 }
             });
-            context.querySelector('.btnPreviousTrack').addEventListener('click', function () {
+            for (const shuffleButton of context.querySelectorAll('.btnShuffleQueue')) {
+                shuffleButton.addEventListener('click', function () {
+                    if (currentPlayer) {
+                        playbackManager.toggleQueueShuffleMode(currentPlayer);
+                    }
+                });
+            }
+
+            context.querySelector('.btnPreviousTrack').addEventListener('click', function (e) {
+                if (currentPlayer) {
+                    if (lastPlayerState.NowPlayingItem.MediaType === 'Audio' && (currentPlayer._currentTime >= 5 || !playbackManager.previousTrack(currentPlayer))) {
+                        // Cancel this event if doubleclick is fired
+                        if (e.detail > 1 && playbackManager.previousTrack(currentPlayer)) {
+                            return;
+                        }
+                        playbackManager.seekPercent(0, currentPlayer);
+                        // This is done automatically by playbackManager. However, setting this here gives instant visual feedback.
+                        // TODO: Check why seekPercentage doesn't reflect the changes inmmediately, so we can remove this workaround.
+                        positionSlider.value = 0;
+                    } else {
+                        playbackManager.previousTrack(currentPlayer);
+                    }
+                }
+            });
+
+            context.querySelector('.btnPreviousTrack').addEventListener('dblclick', function () {
                 if (currentPlayer) {
                     playbackManager.previousTrack(currentPlayer);
                 }
             });
-            context.querySelector('.nowPlayingPositionSlider').addEventListener('change', function () {
+            positionSlider.addEventListener('change', function () {
                 var value = this.value;
 
                 if (currentPlayer) {
@@ -664,7 +775,7 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
                 }
             });
 
-            context.querySelector('.nowPlayingPositionSlider').getBubbleText = function (value) {
+            positionSlider.getBubbleText = function (value) {
                 var state = lastPlayerState;
 
                 if (!state || !state.NowPlayingItem || !currentRuntimeTicks) {
@@ -677,13 +788,10 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
                 return datetime.getDisplayRunningTime(ticks);
             };
 
-            function setVolume() {
-                playbackManager.setVolume(this.value, currentPlayer);
-            }
+            context.querySelector('.nowPlayingVolumeSlider').addEventListener('input', (e) => {
+                playbackManager.setVolume(e.target.value, currentPlayer);
+            });
 
-            context.querySelector('.nowPlayingVolumeSlider').addEventListener('change', setVolume);
-            context.querySelector('.nowPlayingVolumeSlider').addEventListener('mousemove', setVolume);
-            context.querySelector('.nowPlayingVolumeSlider').addEventListener('touchmove', setVolume);
             context.querySelector('.buttonMute').addEventListener('click', function () {
                 playbackManager.toggleMute(currentPlayer);
             });
@@ -701,21 +809,19 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
                 if (context.querySelector('.playlist').classList.contains('hide')) {
                     context.querySelector('.playlist').classList.remove('hide');
                     context.querySelector('.btnSavePlaylist').classList.remove('hide');
-                    context.querySelector('.contextMenu').classList.add('hide');
                     context.querySelector('.volumecontrol').classList.add('hide');
+                    if (layoutManager.mobile) {
+                        context.querySelector('.playlistSectionButton').classList.remove('playlistSectionButtonTransparent');
+                    }
                 } else {
                     context.querySelector('.playlist').classList.add('hide');
                     context.querySelector('.btnSavePlaylist').classList.add('hide');
-                    context.querySelector('.volumecontrol').classList.remove('hide');
-                }
-            });
-            context.querySelector('.btnToggleContextMenu').addEventListener('click', function () {
-                if (context.querySelector('.contextMenu').classList.contains('hide')) {
-                    context.querySelector('.contextMenu').classList.remove('hide');
-                    context.querySelector('.btnSavePlaylist').classList.add('hide');
-                    context.querySelector('.playlist').classList.add('hide');
-                } else {
-                    context.querySelector('.contextMenu').classList.add('hide');
+                    if (showMuteButton || showVolumeSlider) {
+                        context.querySelector('.volumecontrol').classList.remove('hide');
+                    }
+                    if (layoutManager.mobile) {
+                        context.querySelector('.playlistSectionButton').classList.add('playlistSectionButtonTransparent');
+                    }
                 }
             });
         }
@@ -764,16 +870,24 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
         }
 
         function init(ownerView, context) {
-            let contextmenuHtml = `<button id="toggleContextMenu" is="paper-icon-button-light" class="btnToggleContextMenu" title=${globalize.translate('ButtonToggleContextMenu')}><span class="material-icons more_vert"></span></button>`;
             let volumecontrolHtml = '<div class="volumecontrol flex align-items-center flex-wrap-wrap justify-content-center">';
             volumecontrolHtml += `<button is="paper-icon-button-light" class="buttonMute autoSize" title=${globalize.translate('Mute')}><span class="xlargePaperIconButton material-icons volume_up"></span></button>`;
             volumecontrolHtml += '<div class="sliderContainer nowPlayingVolumeSliderContainer"><input is="emby-slider" type="range" step="1" min="0" max="100" value="0" class="nowPlayingVolumeSlider"/></div>';
             volumecontrolHtml += '</div>';
+            let optionsSection = context.querySelector('.playlistSectionButton');
             if (!layoutManager.mobile) {
-                context.querySelector('.nowPlayingSecondaryButtons').innerHTML += volumecontrolHtml;
-                context.querySelector('.playlistSectionButton').innerHTML += contextmenuHtml;
+                context.querySelector('.nowPlayingSecondaryButtons').insertAdjacentHTML('beforeend', volumecontrolHtml);
+                optionsSection.classList.remove('align-items-center', 'justify-content-center');
+                optionsSection.classList.add('align-items-right', 'justify-content-flex-end');
+                context.querySelector('.playlist').classList.remove('hide');
+                context.querySelector('.btnSavePlaylist').classList.remove('hide');
+                context.classList.add('padded-bottom');
             } else {
-                context.querySelector('.playlistSectionButton').innerHTML += volumecontrolHtml + contextmenuHtml;
+                optionsSection.querySelector('.btnTogglePlaylist').insertAdjacentHTML('afterend', volumecontrolHtml);
+                optionsSection.classList.add('playlistSectionButtonTransparent');
+                context.querySelector('.btnTogglePlaylist').classList.remove('hide');
+                context.querySelector('.playlistSectionButton').classList.remove('justify-content-center');
+                context.querySelector('.playlistSectionButton').classList.add('justify-content-space-between');
             }
 
             bindEvents(context);
diff --git a/src/components/search/searchfields.js b/src/components/search/searchfields.js
index 53ab187a81..5cc38eda9a 100644
--- a/src/components/search/searchfields.js
+++ b/src/components/search/searchfields.js
@@ -1,10 +1,19 @@
-define(['layoutManager', 'globalize', 'require', 'events', 'browser', 'alphaPicker', 'emby-input', 'flexStyles', 'material-icons', 'css!./searchfields'], function (layoutManager, globalize, require, events, browser, AlphaPicker) {
-    'use strict';
+import layoutManager from 'layoutManager';
+import globalize from 'globalize';
+import events from 'events';
+import browser from 'browser';
+import AlphaPicker from 'alphaPicker';
+import 'emby-input';
+import 'flexStyles';
+import 'material-icons';
+import 'css!./searchfields';
+
+/* eslint-disable indent */
 
     function onSearchTimeout() {
 
-        var instance = this;
-        var value = instance.nextSearchValue;
+        const instance = this;
+        let value = instance.nextSearchValue;
 
         value = (value || '').trim();
         events.trigger(instance, 'search', [value]);
@@ -22,14 +31,14 @@ define(['layoutManager', 'globalize', 'require', 'events', 'browser', 'alphaPick
 
     function onAlphaValueClicked(e) {
 
-        var value = e.detail.value;
-        var searchFieldsInstance = this;
+        const value = e.detail.value;
+        const searchFieldsInstance = this;
 
-        var txtSearch = searchFieldsInstance.options.element.querySelector('.searchfields-txtSearch');
+        const txtSearch = searchFieldsInstance.options.element.querySelector('.searchfields-txtSearch');
 
         if (value === 'backspace') {
 
-            var val = txtSearch.value;
+            const val = txtSearch.value;
             txtSearch.value = val.length ? val.substring(0, val.length - 1) : '';
 
         } else {
@@ -53,16 +62,16 @@ define(['layoutManager', 'globalize', 'require', 'events', 'browser', 'alphaPick
 
     function onSearchInput(e) {
 
-        var value = e.target.value;
-        var searchFieldsInstance = this;
+        const value = e.target.value;
+        const searchFieldsInstance = this;
         triggerSearch(searchFieldsInstance, value);
     }
 
     function embed(elem, instance, options) {
 
-        require(['text!./searchfields.template.html'], function (template) {
+        import('text!./searchfields.template.html').then(({default: template}) => {
 
-            var html = globalize.translateDocument(template, 'core');
+            let html = globalize.translateHtml(template, 'core');
 
             if (browser.tizen || browser.orsay) {
                 html = html.replace('<input ', '<input readonly ');
@@ -72,10 +81,10 @@ define(['layoutManager', 'globalize', 'require', 'events', 'browser', 'alphaPick
 
             elem.classList.add('searchFields');
 
-            var txtSearch = elem.querySelector('.searchfields-txtSearch');
+            const txtSearch = elem.querySelector('.searchfields-txtSearch');
 
             if (layoutManager.tv) {
-                var alphaPickerElement = elem.querySelector('.alphaPicker');
+                const alphaPickerElement = elem.querySelector('.alphaPicker');
 
                 elem.querySelector('.alphaPicker').classList.remove('hide');
                 initAlphaPicker(alphaPickerElement, instance);
@@ -87,38 +96,39 @@ define(['layoutManager', 'globalize', 'require', 'events', 'browser', 'alphaPick
         });
     }
 
-    function SearchFields(options) {
+class SearchFields {
+    constructor(options) {
 
         this.options = options;
         embed(options.element, this, options);
     }
-
-    SearchFields.prototype.focus = function () {
+    focus() {
 
         this.options.element.querySelector('.searchfields-txtSearch').focus();
-    };
+    }
+    destroy() {
 
-    SearchFields.prototype.destroy = function () {
-
-        var options = this.options;
+        const options = this.options;
         if (options) {
             options.element.classList.remove('searchFields');
         }
         this.options = null;
 
-        var alphaPicker = this.alphaPicker;
+        const alphaPicker = this.alphaPicker;
         if (alphaPicker) {
             alphaPicker.destroy();
         }
         this.alphaPicker = null;
 
-        var searchTimeout = this.searchTimeout;
+        const searchTimeout = this.searchTimeout;
         if (searchTimeout) {
             clearTimeout(searchTimeout);
         }
         this.searchTimeout = null;
         this.nextSearchValue = null;
-    };
+    }
+}
 
-    return SearchFields;
-});
+export default SearchFields;
+
+/* eslint-enable indent */
diff --git a/src/components/search/searchresults.js b/src/components/search/searchresults.js
index d4de2349a4..e16b6a1cd4 100644
--- a/src/components/search/searchresults.js
+++ b/src/components/search/searchresults.js
@@ -1,9 +1,19 @@
-define(['layoutManager', 'globalize', 'require', 'events', 'connectionManager', 'cardBuilder', 'appRouter', 'emby-scroller', 'emby-itemscontainer', 'emby-button'], function (layoutManager, globalize, require, events, connectionManager, cardBuilder, appRouter) {
-    'use strict';
+import layoutManager from 'layoutManager';
+import globalize from 'globalize';
+import require from 'require';
+import events from 'events';
+import connectionManager from 'connectionManager';
+import cardBuilder from 'cardBuilder';
+import appRouter from 'appRouter';
+import 'emby-scroller';
+import 'emby-itemscontainer';
+import 'emby-button';
+
+/* eslint-disable indent */
 
     function loadSuggestions(instance, context, apiClient) {
 
-        var options = {
+        const options = {
 
             SortBy: 'IsFavoriteOrLiked,Random',
             IncludeItemTypes: 'Movie,Series,MusicArtist',
@@ -21,18 +31,18 @@ define(['layoutManager', 'globalize', 'require', 'events', 'connectionManager',
                 result.Items = [];
             }
 
-            var html = result.Items.map(function (i) {
+            const html = result.Items.map(function (i) {
 
-                var href = appRouter.getRouteUrl(i);
+                const href = appRouter.getRouteUrl(i);
 
-                var itemHtml = '<div><a is="emby-linkbutton" class="button-link" style="display:inline-block;padding:.5em 1em;" href="' + href + '">';
+                let itemHtml = '<div><a is="emby-linkbutton" class="button-link" style="display:inline-block;padding:.5em 1em;" href="' + href + '">';
                 itemHtml += i.Name;
                 itemHtml += '</a></div>';
                 return itemHtml;
 
             }).join('');
 
-            var searchSuggestions = context.querySelector('.searchSuggestions');
+            const searchSuggestions = context.querySelector('.searchSuggestions');
             searchSuggestions.querySelector('.searchSuggestionsList').innerHTML = html;
 
             if (result.Items.length) {
@@ -49,9 +59,9 @@ define(['layoutManager', 'globalize', 'require', 'events', 'connectionManager',
             });
         }
 
-        var allowSearch = true;
+        let allowSearch = true;
 
-        var queryIncludeItemTypes = query.IncludeItemTypes;
+        const queryIncludeItemTypes = query.IncludeItemTypes;
 
         if (instance.options.collectionType === 'tvshows') {
             if (query.IncludeArtists) {
@@ -127,7 +137,7 @@ define(['layoutManager', 'globalize', 'require', 'events', 'connectionManager',
             query.EnableTotalRecordCount = false;
             query.ImageTypeLimit = 1;
 
-            var methodName = 'getItems';
+            let methodName = 'getItems';
 
             if (!query.IncludeMedia) {
                 if (query.IncludePeople) {
@@ -464,7 +474,7 @@ define(['layoutManager', 'globalize', 'require', 'events', 'connectionManager',
             showTitle: true,
             overlayText: false,
             centerText: true,
-            action: 'play'
+            overlayPlayButton: true
 
         });
 
@@ -566,9 +576,9 @@ define(['layoutManager', 'globalize', 'require', 'events', 'connectionManager',
 
         section = context.querySelector(section);
 
-        var items = result.Items || result.SearchHints;
+        const items = result.Items || result.SearchHints;
 
-        var itemsContainer = section.querySelector('.itemsContainer');
+        const itemsContainer = section.querySelector('.itemsContainer');
 
         cardBuilder.buildCards(items, Object.assign({
 
@@ -588,20 +598,20 @@ define(['layoutManager', 'globalize', 'require', 'events', 'connectionManager',
     }
 
     function replaceAll(originalString, strReplace, strWith) {
-        var reg = new RegExp(strReplace, 'ig');
+        const reg = new RegExp(strReplace, 'ig');
         return originalString.replace(reg, strWith);
     }
 
     function embed(elem, instance, options) {
 
-        require(['text!./searchresults.template.html'], function (template) {
+        import('text!./searchresults.template.html').then(({default: template}) => {
 
             if (!enableScrollX()) {
                 template = replaceAll(template, 'data-horizontal="true"', 'data-horizontal="false"');
                 template = replaceAll(template, 'itemsContainer scrollSlider', 'itemsContainer scrollSlider vertical-wrap');
             }
 
-            var html = globalize.translateDocument(template, 'core');
+            const html = globalize.translateHtml(template, 'core');
 
             elem.innerHTML = html;
 
@@ -610,28 +620,29 @@ define(['layoutManager', 'globalize', 'require', 'events', 'connectionManager',
         });
     }
 
-    function SearchResults(options) {
+class SearchResults {
+    constructor(options) {
 
         this.options = options;
         embed(options.element, this, options);
     }
+    search(value) {
 
-    SearchResults.prototype.search = function (value) {
-
-        var apiClient = connectionManager.getApiClient(this.options.serverId);
+        const apiClient = connectionManager.getApiClient(this.options.serverId);
 
         search(this, apiClient, this.options.element, value);
-    };
+    }
+    destroy() {
 
-    SearchResults.prototype.destroy = function () {
-
-        var options = this.options;
+        const options = this.options;
         if (options) {
             options.element.classList.remove('searchFields');
         }
         this.options = null;
 
-    };
+    }
+}
 
-    return SearchResults;
-});
+export default SearchResults;
+
+/* eslint-enable indent */
diff --git a/src/components/serverRestartDialog.js b/src/components/serverRestartDialog.js
deleted file mode 100644
index 4c52d5f01b..0000000000
--- a/src/components/serverRestartDialog.js
+++ /dev/null
@@ -1,158 +0,0 @@
-define(['loading', 'events', 'dialogHelper', 'dom', 'layoutManager', 'scrollHelper', 'globalize', 'require', 'material-icons', 'emby-button', 'paper-icon-button-light', 'emby-input', 'formDialogStyle', 'flexStyles'], function (loading, events, dialogHelper, dom, layoutManager, scrollHelper, globalize, require) {
-    'use strict';
-
-    var currentApiClient;
-    var currentDlg;
-    var currentInstance;
-
-    function reloadPageWhenServerAvailable(retryCount) {
-        var apiClient = currentApiClient;
-        if (!apiClient) {
-            return;
-        }
-
-        // Don't use apiclient method because we don't want it reporting authentication under the old version
-        apiClient.getJSON(apiClient.getUrl('System/Info')).then(function (info) {
-
-            // If this is back to false, the restart completed
-            if (!info.IsShuttingDown) {
-                currentInstance.restarted = true;
-                dialogHelper.close(currentDlg);
-            } else {
-                retryReload(retryCount);
-            }
-
-        }, function () {
-            retryReload(retryCount);
-        });
-    }
-
-    function retryReload(retryCount) {
-        setTimeout(function () {
-            retryCount = retryCount || 0;
-            retryCount++;
-
-            if (retryCount < 150) {
-                reloadPageWhenServerAvailable(retryCount);
-            }
-        }, 500);
-    }
-
-    function startRestart(instance, apiClient, dlg) {
-        currentApiClient = apiClient;
-        currentDlg = dlg;
-        currentInstance = instance;
-
-        apiClient.restartServer().then(function () {
-            setTimeout(reloadPageWhenServerAvailable, 250);
-        });
-    }
-
-    function showDialog(instance, options, template) {
-
-        var dialogOptions = {
-            removeOnClose: true,
-            scrollY: false
-        };
-
-        var enableTvLayout = layoutManager.tv;
-
-        if (enableTvLayout) {
-            dialogOptions.size = 'fullscreen';
-        }
-
-        var dlg = dialogHelper.createDialog(dialogOptions);
-
-        var configuredButtons = [];
-
-        dlg.classList.add('formDialog');
-
-        dlg.innerHTML = globalize.translateHtml(template, 'core');
-
-        dlg.classList.add('align-items-center');
-        dlg.classList.add('justify-items-center');
-
-        var formDialogContent = dlg.querySelector('.formDialogContent');
-        formDialogContent.style['flex-grow'] = 'initial';
-
-        if (enableTvLayout) {
-            formDialogContent.style['max-width'] = '50%';
-            formDialogContent.style['max-height'] = '60%';
-            scrollHelper.centerFocus.on(formDialogContent, false);
-        } else {
-            formDialogContent.style.maxWidth = (Math.min((configuredButtons.length * 150) + 200, dom.getWindowSize().innerWidth - 50)) + 'px';
-            dlg.classList.add('dialog-fullscreen-lowres');
-        }
-
-        dlg.querySelector('.formDialogHeaderTitle').innerHTML = globalize.translate('HeaderRestartingServer');
-
-        dlg.querySelector('.text').innerHTML = globalize.translate('RestartPleaseWaitMessage');
-
-        var i;
-        var length;
-        var html = '';
-        for (i = 0, length = configuredButtons.length; i < length; i++) {
-            var item = configuredButtons[i];
-            var autoFocus = i === 0 ? ' autofocus' : '';
-            var buttonClass = 'btnOption raised formDialogFooterItem formDialogFooterItem-autosize';
-
-            if (item.type) {
-                buttonClass += ' button-' + item.type;
-            }
-            html += '<button is="emby-button" type="button" class="' + buttonClass + '" data-id="' + item.id + '"' + autoFocus + '>' + item.name + '</button>';
-        }
-
-        dlg.querySelector('.formDialogFooter').innerHTML = html;
-
-        function onButtonClick() {
-            dialogHelper.close(dlg);
-        }
-
-        var buttons = dlg.querySelectorAll('.btnOption');
-        for (i = 0, length = buttons.length; i < length; i++) {
-            buttons[i].addEventListener('click', onButtonClick);
-        }
-
-        var dlgPromise = dialogHelper.open(dlg);
-
-        startRestart(instance, options.apiClient, dlg);
-
-        return dlgPromise.then(function () {
-
-            if (enableTvLayout) {
-                scrollHelper.centerFocus.off(dlg.querySelector('.formDialogContent'), false);
-            }
-
-            instance.destroy();
-            loading.hide();
-
-            if (instance.restarted) {
-                events.trigger(instance, 'restarted');
-            }
-        });
-    }
-
-    function ServerRestartDialog(options) {
-        this.options = options;
-    }
-
-    ServerRestartDialog.prototype.show = function () {
-        var instance = this;
-        loading.show();
-
-        return new Promise(function (resolve, reject) {
-            require(['text!./../dialog/dialog.template.html'], function (template) {
-                showDialog(instance, instance.options, template).then(resolve, reject);
-            });
-        });
-    };
-
-    ServerRestartDialog.prototype.destroy = function () {
-        currentApiClient = null;
-        currentDlg = null;
-        currentInstance = null;
-        this.options = null;
-    };
-
-    return ServerRestartDialog;
-});
diff --git a/src/components/settingshelper.js b/src/components/settingshelper.js
new file mode 100644
index 0000000000..3db638c7ad
--- /dev/null
+++ b/src/components/settingshelper.js
@@ -0,0 +1,22 @@
+import globalize from 'globalize';
+
+/**
+ * Helper for handling settings.
+ * @module components/settingsHelper
+ */
+
+export function populateLanguages(select, languages) {
+    let html = '';
+
+    html += "<option value=''>" + globalize.translate('AnyLanguage') + '</option>';
+    for (let i = 0, length = languages.length; i < length; i++) {
+        const culture = languages[i];
+        html += "<option value='" + culture.ThreeLetterISOLanguageName + "'>" + culture.DisplayName + '</option>';
+    }
+
+    select.innerHTML = html;
+}
+
+export default {
+    populateLanguages: populateLanguages
+};
diff --git a/src/components/shortcuts.js b/src/components/shortcuts.js
index ab606ab1d2..f105d6c599 100644
--- a/src/components/shortcuts.js
+++ b/src/components/shortcuts.js
@@ -1,18 +1,30 @@
-define(['playbackManager', 'inputManager', 'connectionManager', 'appRouter', 'globalize', 'loading', 'dom', 'recordingHelper'], function (playbackManager, inputManager, connectionManager, appRouter, globalize, loading, dom, recordingHelper) {
-    'use strict';
+/* eslint-disable indent */
+
+/**
+ * Module shortcuts.
+ * @module components/shortcuts
+ */
+
+import playbackManager from 'playbackManager';
+import inputManager from 'inputManager';
+import connectionManager from 'connectionManager';
+import appRouter from 'appRouter';
+import globalize from 'globalize';
+import dom from 'dom';
+import recordingHelper from 'recordingHelper';
 
     function playAllFromHere(card, serverId, queue) {
 
-        var parent = card.parentNode;
-        var className = card.classList.length ? ('.' + card.classList[0]) : '';
-        var cards = parent.querySelectorAll(className + '[data-id]');
+        const parent = card.parentNode;
+        const className = card.classList.length ? (`.${card.classList[0]}`) : '';
+        const cards = parent.querySelectorAll(`${className}[data-id]`);
 
-        var ids = [];
+        const ids = [];
 
-        var foundCard = false;
-        var startIndex;
+        let foundCard = false;
+        let startIndex;
 
-        for (var i = 0, length = cards.length; i < length; i++) {
+        for (let i = 0, length = cards.length; i < length; i++) {
             if (cards[i] === card) {
                 foundCard = true;
                 startIndex = i;
@@ -22,12 +34,12 @@ define(['playbackManager', 'inputManager', 'connectionManager', 'appRouter', 'gl
             }
         }
 
-        var itemsContainer = dom.parentWithClass(card, 'itemsContainer');
+        const itemsContainer = dom.parentWithClass(card, 'itemsContainer');
         if (itemsContainer && itemsContainer.fetchData) {
 
-            var queryOptions = queue ? { StartIndex: startIndex } : {};
+            const queryOptions = queue ? { StartIndex: startIndex } : {};
 
-            return itemsContainer.fetchData(queryOptions).then(function (result) {
+            return itemsContainer.fetchData(queryOptions).then(result => {
 
                 if (queue) {
                     return playbackManager.queue({
@@ -64,7 +76,7 @@ define(['playbackManager', 'inputManager', 'connectionManager', 'appRouter', 'gl
 
     function showProgramDialog(item) {
 
-        require(['recordingCreator'], function (recordingCreator) {
+        import('recordingCreator').then(({default:recordingCreator}) => {
 
             recordingCreator.show(item.Id, item.ServerId);
         });
@@ -73,11 +85,11 @@ define(['playbackManager', 'inputManager', 'connectionManager', 'appRouter', 'gl
     function getItem(button) {
 
         button = dom.parentWithAttribute(button, 'data-id');
-        var serverId = button.getAttribute('data-serverid');
-        var id = button.getAttribute('data-id');
-        var type = button.getAttribute('data-type');
+        const serverId = button.getAttribute('data-serverid');
+        const id = button.getAttribute('data-id');
+        const type = button.getAttribute('data-type');
 
-        var apiClient = connectionManager.getApiClient(serverId);
+        const apiClient = connectionManager.getApiClient(serverId);
 
         if (type === 'Timer') {
             return apiClient.getLiveTvTimer(id);
@@ -99,19 +111,19 @@ define(['playbackManager', 'inputManager', 'connectionManager', 'appRouter', 'gl
 
     function showContextMenu(card, options) {
 
-        getItem(card).then(function (item) {
+        getItem(card).then(item => {
 
-            var playlistId = card.getAttribute('data-playlistid');
-            var collectionId = card.getAttribute('data-collectionid');
+            const playlistId = card.getAttribute('data-playlistid');
+            const collectionId = card.getAttribute('data-collectionid');
 
             if (playlistId) {
-                var elem = dom.parentWithAttribute(card, 'data-playlistitemid');
+                const elem = dom.parentWithAttribute(card, 'data-playlistitemid');
                 item.PlaylistItemId = elem ? elem.getAttribute('data-playlistitemid') : null;
             }
 
-            require(['itemContextMenu'], function (itemContextMenu) {
+            import('itemContextMenu').then(({default: itemContextMenu}) => {
 
-                connectionManager.getApiClient(item.ServerId).getCurrentUser().then(function (user) {
+                connectionManager.getApiClient(item.ServerId).getCurrentUser().then(user => {
                     itemContextMenu.show(Object.assign({
                         item: item,
                         play: true,
@@ -122,9 +134,7 @@ define(['playbackManager', 'inputManager', 'connectionManager', 'appRouter', 'gl
                         collectionId: collectionId,
                         user: user
 
-                    }, options || {})).then(function (result) {
-
-                        var itemsContainer;
+                    }, options || {})).then(result => {
 
                         if (result.command === 'playallfromhere' || result.command === 'queueallfromhere') {
                             executeAction(card, options.positionTo, result.command);
@@ -157,9 +167,9 @@ define(['playbackManager', 'inputManager', 'connectionManager', 'appRouter', 'gl
 
     function showPlayMenu(card, target) {
 
-        var item = getItemInfoFromCard(card);
+        const item = getItemInfoFromCard(card);
 
-        require(['playMenu'], function (playMenu) {
+        import('playMenu').then(({default: playMenu}) => {
 
             playMenu.show({
 
@@ -170,7 +180,7 @@ define(['playbackManager', 'inputManager', 'connectionManager', 'appRouter', 'gl
     }
 
     function sendToast(text) {
-        require(['toast'], function (toast) {
+        import('toast').then(({default: toast}) => {
             toast(text);
         });
     }
@@ -179,19 +189,19 @@ define(['playbackManager', 'inputManager', 'connectionManager', 'appRouter', 'gl
 
         target = target || card;
 
-        var id = card.getAttribute('data-id');
+        let id = card.getAttribute('data-id');
 
         if (!id) {
             card = dom.parentWithAttribute(card, 'data-id');
             id = card.getAttribute('data-id');
         }
 
-        var item = getItemInfoFromCard(card);
+        const item = getItemInfoFromCard(card);
 
-        var serverId = item.ServerId;
-        var type = item.Type;
+        const serverId = item.ServerId;
+        const type = item.Type;
 
-        var playableItemId = type === 'Program' ? item.ChannelId : item.Id;
+        const playableItemId = type === 'Program' ? item.ChannelId : item.Id;
 
         if (item.MediaType === 'Photo' && action === 'link') {
             action = 'play';
@@ -213,7 +223,7 @@ define(['playbackManager', 'inputManager', 'connectionManager', 'appRouter', 'gl
             });
         } else if (action === 'play' || action === 'resume') {
 
-            var startPositionTicks = parseInt(card.getAttribute('data-positionticks') || '0');
+            const startPositionTicks = parseInt(card.getAttribute('data-positionticks') || '0');
 
             playbackManager.play({
                 ids: [playableItemId],
@@ -244,7 +254,7 @@ define(['playbackManager', 'inputManager', 'connectionManager', 'appRouter', 'gl
             onRecordCommand(serverId, id, type, card.getAttribute('data-timerid'), card.getAttribute('data-seriestimerid'));
         } else if (action === 'menu') {
 
-            var options = target.getAttribute('data-playoptions') === 'false' ?
+            const options = target.getAttribute('data-playoptions') === 'false' ?
                 {
                     shuffle: false,
                     instantMix: false,
@@ -261,7 +271,7 @@ define(['playbackManager', 'inputManager', 'connectionManager', 'appRouter', 'gl
         } else if (action === 'playmenu') {
             showPlayMenu(card, target);
         } else if (action === 'edit') {
-            getItem(target).then(function (item) {
+            getItem(target).then(item => {
                 editItem(item, serverId);
             });
         } else if (action === 'playtrailer') {
@@ -270,9 +280,9 @@ define(['playbackManager', 'inputManager', 'connectionManager', 'appRouter', 'gl
             getItem(target).then(addToPlaylist);
         } else if (action === 'custom') {
 
-            var customAction = target.getAttribute('data-customaction');
+            const customAction = target.getAttribute('data-customaction');
 
-            card.dispatchEvent(new CustomEvent('action-' + customAction, {
+            card.dispatchEvent(new CustomEvent(`action-${customAction}`, {
                 detail: {
                     playlistItemId: card.getAttribute('data-playlistitemid')
                 },
@@ -283,7 +293,7 @@ define(['playbackManager', 'inputManager', 'connectionManager', 'appRouter', 'gl
     }
 
     function addToPlaylist(item) {
-        require(['playlistEditor'], function (playlistEditor) {
+        import('playlistEditor').then(({default: playlistEditor}) => {
 
             new playlistEditor().show({
                 items: [item.Id],
@@ -295,35 +305,35 @@ define(['playbackManager', 'inputManager', 'connectionManager', 'appRouter', 'gl
 
     function playTrailer(item) {
 
-        var apiClient = connectionManager.getApiClient(item.ServerId);
+        const apiClient = connectionManager.getApiClient(item.ServerId);
 
-        apiClient.getLocalTrailers(apiClient.getCurrentUserId(), item.Id).then(function (trailers) {
+        apiClient.getLocalTrailers(apiClient.getCurrentUserId(), item.Id).then(trailers => {
             playbackManager.play({ items: trailers });
         });
     }
 
     function editItem(item, serverId) {
 
-        var apiClient = connectionManager.getApiClient(serverId);
+        const apiClient = connectionManager.getApiClient(serverId);
 
-        return new Promise(function (resolve, reject) {
+        return new Promise((resolve, reject) => {
 
-            var serverId = apiClient.serverInfo().Id;
+            const serverId = apiClient.serverInfo().Id;
 
             if (item.Type === 'Timer') {
                 if (item.ProgramId) {
-                    require(['recordingCreator'], function (recordingCreator) {
+                    import('recordingCreator').then(({default: recordingCreator}) => {
 
                         recordingCreator.show(item.ProgramId, serverId).then(resolve, reject);
                     });
                 } else {
-                    require(['recordingEditor'], function (recordingEditor) {
+                    import('recordingEditor').then(({default: recordingEditor}) => {
 
                         recordingEditor.show(item.Id, serverId).then(resolve, reject);
                     });
                 }
             } else {
-                require(['metadataEditor'], function (metadataEditor) {
+                import('metadataEditor').then(({default: metadataEditor}) => {
 
                     metadataEditor.show(item.Id, serverId).then(resolve, reject);
                 });
@@ -335,19 +345,19 @@ define(['playbackManager', 'inputManager', 'connectionManager', 'appRouter', 'gl
 
         if (type === 'Program' || timerId || seriesTimerId) {
 
-            var programId = type === 'Program' ? id : null;
+            const programId = type === 'Program' ? id : null;
             recordingHelper.toggleRecording(serverId, programId, timerId, seriesTimerId);
         }
     }
 
-    function onClick(e) {
+    export function onClick(e) {
 
-        var card = dom.parentWithClass(e.target, 'itemAction');
+        const card = dom.parentWithClass(e.target, 'itemAction');
 
         if (card) {
 
-            var actionElement = card;
-            var action = actionElement.getAttribute('data-action');
+            let actionElement = card;
+            let action = actionElement.getAttribute('data-action');
 
             if (!action) {
                 actionElement = dom.parentWithAttribute(actionElement, 'data-action');
@@ -368,12 +378,12 @@ define(['playbackManager', 'inputManager', 'connectionManager', 'appRouter', 'gl
 
     function onCommand(e) {
 
-        var cmd = e.detail.command;
+        const cmd = e.detail.command;
 
         if (cmd === 'play' || cmd === 'resume' || cmd === 'record' || cmd === 'menu' || cmd === 'info') {
 
-            var target = e.target;
-            var card = dom.parentWithClass(target, 'itemAction') || dom.parentWithAttribute(target, 'data-id');
+            const target = e.target;
+            const card = dom.parentWithClass(target, 'itemAction') || dom.parentWithAttribute(target, 'data-id');
 
             if (card) {
                 e.preventDefault();
@@ -383,7 +393,7 @@ define(['playbackManager', 'inputManager', 'connectionManager', 'appRouter', 'gl
         }
     }
 
-    function on(context, options) {
+    export function on(context, options) {
 
         options = options || {};
 
@@ -396,7 +406,7 @@ define(['playbackManager', 'inputManager', 'connectionManager', 'appRouter', 'gl
         }
     }
 
-    function off(context, options) {
+    export function off(context, options) {
         options = options || {};
 
         context.removeEventListener('click', onClick);
@@ -406,23 +416,24 @@ define(['playbackManager', 'inputManager', 'connectionManager', 'appRouter', 'gl
         }
     }
 
-    function getShortcutAttributesHtml(item, serverId) {
+    export function getShortcutAttributesHtml(item, serverId) {
 
-        var html = 'data-id="' + item.Id + '" data-serverid="' + (serverId || item.ServerId) + '" data-type="' + item.Type + '" data-mediatype="' + item.MediaType + '" data-channelid="' + item.ChannelId + '" data-isfolder="' + item.IsFolder + '"';
+        let html = `data-id="${item.Id}" data-serverid="${serverId || item.ServerId}" data-type="${item.Type}" data-mediatype="${item.MediaType}" data-channelid="${item.ChannelId}" data-isfolder="${item.IsFolder}"`;
 
-        var collectionType = item.CollectionType;
+        const collectionType = item.CollectionType;
         if (collectionType) {
-            html += ' data-collectiontype="' + collectionType + '"';
+            html += ` data-collectiontype="${collectionType}"`;
         }
 
         return html;
     }
 
-    return {
-        on: on,
-        off: off,
-        onClick: onClick,
-        getShortcutAttributesHtml: getShortcutAttributesHtml
-    };
+/* eslint-enable indent */
+
+export default {
+    on: on,
+    off: off,
+    onClick: onClick,
+    getShortcutAttributesHtml: getShortcutAttributesHtml
+};
 
-});
diff --git a/src/components/skinManager.js b/src/components/skinManager.js
index b0a9178ac4..faa1a1f306 100644
--- a/src/components/skinManager.js
+++ b/src/components/skinManager.js
@@ -57,7 +57,6 @@ define(['apphost', 'userSettings', 'browser', 'events', 'backdrop', 'globalize',
         var selectedTheme;
 
         for (var i = 0, length = themes.length; i < length; i++) {
-
             var theme = themes[i];
             if (theme[isDefaultProperty]) {
                 defaultTheme = theme;
@@ -85,7 +84,7 @@ define(['apphost', 'userSettings', 'browser', 'events', 'backdrop', 'globalize',
             currentSound = null;
         }
 
-        backdrop.clear();
+        backdrop.clearBackdrop();
     }
 
     function onThemeLoaded() {
diff --git a/src/components/slideshow/slideshow.js b/src/components/slideshow/slideshow.js
index 6ff88a00c9..f7026a007e 100644
--- a/src/components/slideshow/slideshow.js
+++ b/src/components/slideshow/slideshow.js
@@ -2,9 +2,20 @@
  * Image viewer component
  * @module components/slideshow/slideshow
  */
-define(['dialogHelper', 'inputManager', 'connectionManager', 'layoutManager', 'focusManager', 'browser', 'apphost', 'css!./style', 'material-icons', 'paper-icon-button-light'], function (dialogHelper, inputManager, connectionManager, layoutManager, focusManager, browser, appHost) {
+define(['dialogHelper', 'inputManager', 'connectionManager', 'layoutManager', 'focusManager', 'browser', 'apphost', 'dom', 'css!./style', 'material-icons', 'paper-icon-button-light'], function (dialogHelper, inputManager, connectionManager, layoutManager, focusManager, browser, appHost, dom) {
     'use strict';
 
+    /**
+     * Name of transition event.
+     */
+    const transitionEndEventName = dom.whichTransitionEvent();
+
+    /**
+     * Flag to use fake image to fix blurry zoomed image.
+     * At least WebKit doesn't restore quality for zoomed images.
+     */
+    const useFakeZoomImage = browser.safari;
+
     /**
      * Retrieves an item's image URL from the API.
      * @param {object|string} item - Item used to generate the image URL.
@@ -213,6 +224,7 @@ define(['dialogHelper', 'inputManager', 'connectionManager', 'layoutManager', 'f
             });
 
             inputManager.on(window, onInputCommand);
+            /* eslint-disable-next-line compat/compat */
             document.addEventListener((window.PointerEvent ? 'pointermove' : 'mousemove'), onPointerMove);
 
             dialog.addEventListener('close', onDialogClosed);
@@ -240,6 +252,41 @@ define(['dialogHelper', 'inputManager', 'connectionManager', 'layoutManager', 'f
             }
         }
 
+        /**
+         * Handles zoom changes.
+         */
+        function onZoomChange(scale, imageEl, slideEl) {
+            const zoomImage = slideEl.querySelector('.swiper-zoom-fakeimg');
+
+            if (zoomImage) {
+                zoomImage.style.width = zoomImage.style.height = scale * 100 + '%';
+
+                if (scale > 1) {
+                    if (zoomImage.classList.contains('swiper-zoom-fakeimg-hidden')) {
+                        // Await for Swiper style changes
+                        setTimeout(() => {
+                            const callback = () => {
+                                imageEl.removeEventListener(transitionEndEventName, callback);
+                                zoomImage.classList.remove('swiper-zoom-fakeimg-hidden');
+                            };
+
+                            // Swiper set 'transition-duration: 300ms' for auto zoom
+                            // and 'transition-duration: 0s' for touch zoom
+                            const transitionDuration = parseFloat(imageEl.style.transitionDuration.replace(/[a-z]/i, ''));
+
+                            if (transitionDuration > 0) {
+                                imageEl.addEventListener(transitionEndEventName, callback);
+                            } else {
+                                callback();
+                            }
+                        }, 0);
+                    }
+                } else {
+                    zoomImage.classList.add('swiper-zoom-fakeimg-hidden');
+                }
+            }
+        }
+
         /**
          * Initializes the Swiper instance and binds the relevant events.
          * @param {HTMLElement} dialog - Element containing the dialog.
@@ -260,8 +307,7 @@ define(['dialogHelper', 'inputManager', 'connectionManager', 'layoutManager', 'f
                     loop: false,
                     zoom: {
                         minRatio: 1,
-                        toggle: true,
-                        containerClass: 'slider-zoom-container'
+                        toggle: true
                     },
                     autoplay: !options.interactive,
                     keyboard: {
@@ -288,6 +334,10 @@ define(['dialogHelper', 'inputManager', 'connectionManager', 'layoutManager', 'f
 
                 swiperInstance.on('autoplayStart', onAutoplayStart);
                 swiperInstance.on('autoplayStop', onAutoplayStop);
+
+                if (useFakeZoomImage) {
+                    swiperInstance.on('zoomChange', onZoomChange);
+                }
             });
         }
 
@@ -328,7 +378,10 @@ define(['dialogHelper', 'inputManager', 'connectionManager', 'layoutManager', 'f
         function getSwiperSlideHtmlFromSlide(item) {
             var html = '';
             html += '<div class="swiper-slide" data-original="' + item.originalImage + '" data-itemid="' + item.Id + '" data-serverid="' + item.ServerId + '">';
-            html += '<div class="slider-zoom-container">';
+            html += '<div class="swiper-zoom-container">';
+            if (useFakeZoomImage) {
+                html += `<div class="swiper-zoom-fakeimg swiper-zoom-fakeimg-hidden" style="background-image: url('${item.originalImage}')"></div>`;
+            }
             html += '<img src="' + item.originalImage + '" class="swiper-slide-img">';
             html += '</div>';
             if (item.title || item.subtitle) {
@@ -437,6 +490,7 @@ define(['dialogHelper', 'inputManager', 'connectionManager', 'layoutManager', 'f
             }
 
             inputManager.off(window, onInputCommand);
+            /* eslint-disable-next-line compat/compat */
             document.removeEventListener((window.PointerEvent ? 'pointermove' : 'mousemove'), onPointerMove);
             // Shows page scrollbar
             document.body.classList.remove('hide-scroll');
diff --git a/src/components/slideshow/style.css b/src/components/slideshow/style.css
index f1fea508d7..af50eb9cd7 100644
--- a/src/components/slideshow/style.css
+++ b/src/components/slideshow/style.css
@@ -40,16 +40,6 @@
     text-shadow: 3px 3px 0 #000, -1px -1px 0 #000, 1px -1px 0 #000, -1px 1px 0 #000, 1px 1px 0 #000;
 }
 
-.swiper-slide-img {
-    max-height: 100%;
-    max-width: 100%;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    text-align: center;
-    margin: auto;
-}
-
 .slideshowButtonIcon {
     color: #fff;
     opacity: 0.7;
@@ -135,13 +125,18 @@
     color: #ccc;
 }
 
-.swiper-slide {
-    display: flex;
-    flex-direction: column;
+.swiper-zoom-fakeimg {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    background-position: 50% 50%;
+    background-repeat: no-repeat;
+    background-size: contain;
+    z-index: 1;
+    pointer-events: none;
 }
 
-.slider-zoom-container {
-    margin: auto;
-    max-height: 100%;
-    max-width: 100%;
+.swiper-zoom-fakeimg-hidden {
+    display: none;
 }
diff --git a/src/components/sortmenu/sortmenu.js b/src/components/sortmenu/sortmenu.js
index 9950afb89a..dbf7ef1a7f 100644
--- a/src/components/sortmenu/sortmenu.js
+++ b/src/components/sortmenu/sortmenu.js
@@ -73,7 +73,7 @@ define(['require', 'dom', 'focusManager', 'dialogHelper', 'loading', 'layoutMana
 
                 html += template;
 
-                dlg.innerHTML = globalize.translateDocument(html, 'core');
+                dlg.innerHTML = globalize.translateHtml(html, 'core');
 
                 fillSortBy(dlg, options.sortOptions);
                 initEditor(dlg, options.settings);
diff --git a/src/components/subtitleeditor/subtitleeditor.js b/src/components/subtitleeditor/subtitleeditor.js
index e9bcc0bfca..9c0992c53c 100644
--- a/src/components/subtitleeditor/subtitleeditor.js
+++ b/src/components/subtitleeditor/subtitleeditor.js
@@ -69,7 +69,7 @@ define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings',
 
         require(['confirm'], function (confirm) {
 
-            confirm({
+            confirm.default({
 
                 title: globalize.translate('ConfirmDeletion'),
                 text: msg,
@@ -448,7 +448,7 @@ define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings',
             dlg.classList.add('formDialog');
             dlg.classList.add('subtitleEditorDialog');
 
-            dlg.innerHTML = globalize.translateDocument(template, 'core');
+            dlg.innerHTML = globalize.translateHtml(template, 'core');
 
             dlg.querySelector('.originalSubtitleFileLabel').innerHTML = globalize.translate('File');
 
diff --git a/src/components/subtitlesettings/subtitleappearancehelper.js b/src/components/subtitlesettings/subtitleappearancehelper.js
index bec8156aca..f710751376 100644
--- a/src/components/subtitlesettings/subtitleappearancehelper.js
+++ b/src/components/subtitlesettings/subtitleappearancehelper.js
@@ -1,159 +1,154 @@
-define([], function () {
-    'use strict';
+/**
+ * Subtitle settings visual helper.
+ * @module components/subtitleSettings/subtitleAppearanceHelper
+ */
 
-    function getTextStyles(settings, isCue) {
+function getTextStyles(settings, isCue) {
 
-        var list = [];
+    let list = [];
 
-        if (isCue) {
-            switch (settings.textSize || '') {
+    if (isCue) {
+        switch (settings.textSize || '') {
 
-                case 'smaller':
-                    list.push({ name: 'font-size', value: '.5em' });
-                    break;
-                case 'small':
-                    list.push({ name: 'font-size', value: '.7em' });
-                    break;
-                case 'large':
-                    list.push({ name: 'font-size', value: '1.3em' });
-                    break;
-                case 'larger':
-                    list.push({ name: 'font-size', value: '1.72em' });
-                    break;
-                case 'extralarge':
-                    list.push({ name: 'font-size', value: '2em' });
-                    break;
-                default:
-                case 'medium':
-                    break;
-            }
-        } else {
-            switch (settings.textSize || '') {
-
-                case 'smaller':
-                    list.push({ name: 'font-size', value: '.8em' });
-                    break;
-                case 'small':
-                    list.push({ name: 'font-size', value: 'inherit' });
-                    break;
-                case 'larger':
-                    list.push({ name: 'font-size', value: '2em' });
-                    break;
-                case 'extralarge':
-                    list.push({ name: 'font-size', value: '2.2em' });
-                    break;
-                case 'large':
-                    list.push({ name: 'font-size', value: '1.72em' });
-                    break;
-                default:
-                case 'medium':
-                    list.push({ name: 'font-size', value: '1.36em' });
-                    break;
-            }
-        }
-
-        switch (settings.dropShadow || '') {
-
-            case 'raised':
-                list.push({ name: 'text-shadow', value: '-1px -1px white, 0px -1px white, -1px 0px white, 1px 1px black, 0px 1px black, 1px 0px black' });
+            case 'smaller':
+                list.push({ name: 'font-size', value: '.5em' });
                 break;
-            case 'depressed':
-                list.push({ name: 'text-shadow', value: '1px 1px white, 0px 1px white, 1px 0px white, -1px -1px black, 0px -1px black, -1px 0px black' });
+            case 'small':
+                list.push({ name: 'font-size', value: '.7em' });
                 break;
-            case 'uniform':
-                list.push({ name: 'text-shadow', value: '-1px 0px #000000, 0px 1px #000000, 1px 0px #000000, 0px -1px #000000' });
+            case 'large':
+                list.push({ name: 'font-size', value: '1.3em' });
                 break;
-            case 'none':
-                list.push({ name: 'text-shadow', value: 'none' });
+            case 'larger':
+                list.push({ name: 'font-size', value: '1.72em' });
+                break;
+            case 'extralarge':
+                list.push({ name: 'font-size', value: '2em' });
                 break;
             default:
-            case 'dropshadow':
-                list.push({ name: 'text-shadow', value: '#000000 0px 0px 7px' });
+            case 'medium':
                 break;
         }
+    } else {
+        switch (settings.textSize || '') {
 
-        var background = settings.textBackground || 'transparent';
-        if (background) {
-            list.push({ name: 'background-color', value: background });
-        }
-
-        var textColor = settings.textColor || '#ffffff';
-        if (textColor) {
-            list.push({ name: 'color', value: textColor });
-        }
-
-        switch (settings.font || '') {
-
-            case 'typewriter':
-                list.push({ name: 'font-family', value: '"Courier New",monospace' });
-                list.push({ name: 'font-variant', value: 'none' });
+            case 'smaller':
+                list.push({ name: 'font-size', value: '.8em' });
                 break;
-            case 'print':
-                list.push({ name: 'font-family', value: 'Georgia,Times New Roman,Arial,Helvetica,serif' });
-                list.push({ name: 'font-variant', value: 'none' });
+            case 'small':
+                list.push({ name: 'font-size', value: 'inherit' });
                 break;
-            case 'console':
-                list.push({ name: 'font-family', value: 'Consolas,Lucida Console,Menlo,Monaco,monospace' });
-                list.push({ name: 'font-variant', value: 'none' });
+            case 'larger':
+                list.push({ name: 'font-size', value: '2em' });
                 break;
-            case 'cursive':
-                list.push({ name: 'font-family', value: 'Lucida Handwriting,Brush Script MT,Segoe Script,cursive,Quintessential,system-ui,-apple-system,BlinkMacSystemFont,sans-serif' });
-                list.push({ name: 'font-variant', value: 'none' });
+            case 'extralarge':
+                list.push({ name: 'font-size', value: '2.2em' });
                 break;
-            case 'casual':
-                list.push({ name: 'font-family', value: 'Gabriola,Segoe Print,Comic Sans MS,Chalkboard,Short Stack,system-ui,-apple-system,BlinkMacSystemFont,sans-serif' });
-                list.push({ name: 'font-variant', value: 'none' });
-                break;
-            case 'smallcaps':
-                list.push({ name: 'font-family', value: 'Copperplate Gothic,Copperplate Gothic Bold,Copperplate,system-ui,-apple-system,BlinkMacSystemFont,sans-serif' });
-                list.push({ name: 'font-variant', value: 'small-caps' });
+            case 'large':
+                list.push({ name: 'font-size', value: '1.72em' });
                 break;
             default:
-                list.push({ name: 'font-family', value: 'inherit' });
-                list.push({ name: 'font-variant', value: 'none' });
+            case 'medium':
+                list.push({ name: 'font-size', value: '1.36em' });
                 break;
         }
-
-        return list;
     }
 
-    function getWindowStyles(settings) {
+    switch (settings.dropShadow || '') {
 
-        return [];
+        case 'raised':
+            list.push({ name: 'text-shadow', value: '-1px -1px white, 0px -1px white, -1px 0px white, 1px 1px black, 0px 1px black, 1px 0px black' });
+            break;
+        case 'depressed':
+            list.push({ name: 'text-shadow', value: '1px 1px white, 0px 1px white, 1px 0px white, -1px -1px black, 0px -1px black, -1px 0px black' });
+            break;
+        case 'uniform':
+            list.push({ name: 'text-shadow', value: '-1px 0px #000000, 0px 1px #000000, 1px 0px #000000, 0px -1px #000000' });
+            break;
+        case 'none':
+            list.push({ name: 'text-shadow', value: 'none' });
+            break;
+        default:
+        case 'dropshadow':
+            list.push({ name: 'text-shadow', value: '#000000 0px 0px 7px' });
+            break;
     }
 
-    function getStyles(settings, isCue) {
-
-        return {
-            text: getTextStyles(settings, isCue),
-            window: getWindowStyles(settings)
-        };
+    const background = settings.textBackground || 'transparent';
+    if (background) {
+        list.push({ name: 'background-color', value: background });
     }
 
-    function applyStyleList(styles, elem) {
-
-        for (var i = 0, length = styles.length; i < length; i++) {
-
-            var style = styles[i];
-
-            elem.style[style.name] = style.value;
-        }
+    const textColor = settings.textColor || '#ffffff';
+    if (textColor) {
+        list.push({ name: 'color', value: textColor });
     }
 
-    function applyStyles(elements, appearanceSettings) {
+    switch (settings.font || '') {
 
-        var styles = getStyles(appearanceSettings);
-
-        if (elements.text) {
-            applyStyleList(styles.text, elements.text);
-        }
-        if (elements.window) {
-            applyStyleList(styles.window, elements.window);
-        }
+        case 'typewriter':
+            list.push({ name: 'font-family', value: '"Courier New",monospace' });
+            list.push({ name: 'font-variant', value: 'none' });
+            break;
+        case 'print':
+            list.push({ name: 'font-family', value: 'Georgia,Times New Roman,Arial,Helvetica,serif' });
+            list.push({ name: 'font-variant', value: 'none' });
+            break;
+        case 'console':
+            list.push({ name: 'font-family', value: 'Consolas,Lucida Console,Menlo,Monaco,monospace' });
+            list.push({ name: 'font-variant', value: 'none' });
+            break;
+        case 'cursive':
+            list.push({ name: 'font-family', value: 'Lucida Handwriting,Brush Script MT,Segoe Script,cursive,Quintessential,system-ui,-apple-system,BlinkMacSystemFont,sans-serif' });
+            list.push({ name: 'font-variant', value: 'none' });
+            break;
+        case 'casual':
+            list.push({ name: 'font-family', value: 'Gabriola,Segoe Print,Comic Sans MS,Chalkboard,Short Stack,system-ui,-apple-system,BlinkMacSystemFont,sans-serif' });
+            list.push({ name: 'font-variant', value: 'none' });
+            break;
+        case 'smallcaps':
+            list.push({ name: 'font-family', value: 'Copperplate Gothic,Copperplate Gothic Bold,Copperplate,system-ui,-apple-system,BlinkMacSystemFont,sans-serif' });
+            list.push({ name: 'font-variant', value: 'small-caps' });
+            break;
+        default:
+            list.push({ name: 'font-family', value: 'inherit' });
+            list.push({ name: 'font-variant', value: 'none' });
+            break;
     }
 
+    return list;
+}
+
+export function getStyles(settings, isCue) {
+
     return {
-        getStyles: getStyles,
-        applyStyles: applyStyles
+        text: getTextStyles(settings, isCue),
+        window: []
     };
-});
+}
+
+function applyStyleList(styles, elem) {
+
+    for (let i = 0, length = styles.length; i < length; i++) {
+
+        let style = styles[i];
+
+        elem.style[style.name] = style.value;
+    }
+}
+
+export function applyStyles(elements, appearanceSettings) {
+
+    let styles = getStyles(appearanceSettings);
+
+    if (elements.text) {
+        applyStyleList(styles.text, elements.text);
+    }
+    if (elements.window) {
+        applyStyleList(styles.window, elements.window);
+    }
+}
+export default {
+    getStyles: getStyles,
+    applyStyles: applyStyles
+};
diff --git a/src/components/subtitlesettings/subtitlesettings.js b/src/components/subtitlesettings/subtitlesettings.js
index d728360d05..d2ae852bd5 100644
--- a/src/components/subtitlesettings/subtitlesettings.js
+++ b/src/components/subtitlesettings/subtitlesettings.js
@@ -1,109 +1,212 @@
-define(['require', 'globalize', 'appSettings', 'apphost', 'focusManager', 'loading', 'connectionManager', 'subtitleAppearanceHelper', 'dom', 'events', 'listViewStyle', 'emby-select', 'emby-input', 'emby-checkbox', 'flexStyles'], function (require, globalize, appSettings, appHost, focusManager, loading, connectionManager, subtitleAppearanceHelper, dom, events) {
-    'use strict';
+import require from 'require';
+import globalize from 'globalize';
+import appHost from 'apphost';
+import appSettings from 'appSettings';
+import focusManager from 'focusManager';
+import loading from 'loading';
+import connectionManager from 'connectionManager';
+import subtitleAppearanceHelper from 'subtitleAppearanceHelper';
+import settingsHelper from 'settingsHelper';
+import dom from 'dom';
+import events from 'events';
+import 'listViewStyle';
+import 'emby-select';
+import 'emby-input';
+import 'emby-checkbox';
+import 'flexStyles';
 
-    function populateLanguages(select, languages) {
-        var html = '';
+/**
+ * Subtitle settings.
+ * @module components/subtitleSettings/subtitleSettings
+ */
 
-        html += "<option value=''>" + globalize.translate('AnyLanguage') + '</option>';
-        for (var i = 0, length = languages.length; i < length; i++) {
-            var culture = languages[i];
-            html += "<option value='" + culture.ThreeLetterISOLanguageName + "'>" + culture.DisplayName + '</option>';
+function getSubtitleAppearanceObject(context) {
+    let appearanceSettings = {};
+
+    appearanceSettings.textSize = context.querySelector('#selectTextSize').value;
+    appearanceSettings.dropShadow = context.querySelector('#selectDropShadow').value;
+    appearanceSettings.font = context.querySelector('#selectFont').value;
+    appearanceSettings.textBackground = context.querySelector('#inputTextBackground').value;
+    appearanceSettings.textColor = context.querySelector('#inputTextColor').value;
+
+    return appearanceSettings;
+}
+
+function loadForm(context, user, userSettings, appearanceSettings, apiClient) {
+
+    apiClient.getCultures().then(function (allCultures) {
+
+        if (appHost.supports('subtitleburnsettings') && user.Policy.EnableVideoPlaybackTranscoding) {
+            context.querySelector('.fldBurnIn').classList.remove('hide');
         }
 
-        select.innerHTML = html;
-    }
+        let selectSubtitleLanguage = context.querySelector('#selectSubtitleLanguage');
 
-    function getSubtitleAppearanceObject(context) {
-        var appearanceSettings = {};
+        settingsHelper.populateLanguages(selectSubtitleLanguage, allCultures);
 
-        appearanceSettings.textSize = context.querySelector('#selectTextSize').value;
-        appearanceSettings.dropShadow = context.querySelector('#selectDropShadow').value;
-        appearanceSettings.font = context.querySelector('#selectFont').value;
-        appearanceSettings.textBackground = context.querySelector('#inputTextBackground').value;
-        appearanceSettings.textColor = context.querySelector('#inputTextColor').value;
+        selectSubtitleLanguage.value = user.Configuration.SubtitleLanguagePreference || '';
+        context.querySelector('#selectSubtitlePlaybackMode').value = user.Configuration.SubtitleMode || '';
 
-        return appearanceSettings;
-    }
+        context.querySelector('#selectSubtitlePlaybackMode').dispatchEvent(new CustomEvent('change', {}));
 
-    function loadForm(context, user, userSettings, appearanceSettings, apiClient) {
+        context.querySelector('#selectTextSize').value = appearanceSettings.textSize || '';
+        context.querySelector('#selectDropShadow').value = appearanceSettings.dropShadow || '';
+        context.querySelector('#inputTextBackground').value = appearanceSettings.textBackground || 'transparent';
+        context.querySelector('#inputTextColor').value = appearanceSettings.textColor || '#ffffff';
+        context.querySelector('#selectFont').value = appearanceSettings.font || '';
 
-        apiClient.getCultures().then(function (allCultures) {
+        context.querySelector('#selectSubtitleBurnIn').value = appSettings.get('subtitleburnin') || '';
 
-            if (appHost.supports('subtitleburnsettings') && user.Policy.EnableVideoPlaybackTranscoding) {
-                context.querySelector('.fldBurnIn').classList.remove('hide');
-            }
+        onAppearanceFieldChange({
+            target: context.querySelector('#selectTextSize')
+        });
 
-            var selectSubtitleLanguage = context.querySelector('#selectSubtitleLanguage');
+        loading.hide();
+    });
+}
 
-            populateLanguages(selectSubtitleLanguage, allCultures);
+function saveUser(context, user, userSettingsInstance, appearanceKey, apiClient) {
 
-            selectSubtitleLanguage.value = user.Configuration.SubtitleLanguagePreference || '';
-            context.querySelector('#selectSubtitlePlaybackMode').value = user.Configuration.SubtitleMode || '';
+    let appearanceSettings = userSettingsInstance.getSubtitleAppearanceSettings(appearanceKey);
+    appearanceSettings = Object.assign(appearanceSettings, getSubtitleAppearanceObject(context));
 
-            context.querySelector('#selectSubtitlePlaybackMode').dispatchEvent(new CustomEvent('change', {}));
+    userSettingsInstance.setSubtitleAppearanceSettings(appearanceSettings, appearanceKey);
 
-            context.querySelector('#selectTextSize').value = appearanceSettings.textSize || '';
-            context.querySelector('#selectDropShadow').value = appearanceSettings.dropShadow || '';
-            context.querySelector('#inputTextBackground').value = appearanceSettings.textBackground || 'transparent';
-            context.querySelector('#inputTextColor').value = appearanceSettings.textColor || '#ffffff';
-            context.querySelector('#selectFont').value = appearanceSettings.font || '';
+    user.Configuration.SubtitleLanguagePreference = context.querySelector('#selectSubtitleLanguage').value;
+    user.Configuration.SubtitleMode = context.querySelector('#selectSubtitlePlaybackMode').value;
 
-            context.querySelector('#selectSubtitleBurnIn').value = appSettings.get('subtitleburnin') || '';
+    return apiClient.updateUserConfiguration(user.Id, user.Configuration);
+}
 
-            onAppearanceFieldChange({
-                target: context.querySelector('#selectTextSize')
-            });
+function save(instance, context, userId, userSettings, apiClient, enableSaveConfirmation) {
+
+    loading.show();
+
+    appSettings.set('subtitleburnin', context.querySelector('#selectSubtitleBurnIn').value);
+
+    apiClient.getUser(userId).then(function (user) {
+
+        saveUser(context, user, userSettings, instance.appearanceKey, apiClient).then(function () {
 
             loading.hide();
+            if (enableSaveConfirmation) {
+                import('toast').then(({default: toast}) => {
+                    toast(globalize.translate('SettingsSaved'));
+                });
+            }
+
+            events.trigger(instance, 'saved');
+
+        }, function () {
+            loading.hide();
         });
+    });
+}
+
+function onSubtitleModeChange(e) {
+
+    let view = dom.parentWithClass(e.target, 'subtitlesettings');
+
+    let subtitlesHelp = view.querySelectorAll('.subtitlesHelp');
+    for (let i = 0, length = subtitlesHelp.length; i < length; i++) {
+        subtitlesHelp[i].classList.add('hide');
+    }
+    view.querySelector('.subtitles' + this.value + 'Help').classList.remove('hide');
+}
+
+function onAppearanceFieldChange(e) {
+
+    let view = dom.parentWithClass(e.target, 'subtitlesettings');
+
+    let appearanceSettings = getSubtitleAppearanceObject(view);
+
+    let elements = {
+        window: view.querySelector('.subtitleappearance-preview-window'),
+        text: view.querySelector('.subtitleappearance-preview-text')
+    };
+
+    subtitleAppearanceHelper.applyStyles(elements, appearanceSettings);
+}
+
+function embed(options, self) {
+
+    import('text!./subtitlesettings.template.html').then(({default: template}) => {
+
+        options.element.classList.add('subtitlesettings');
+        options.element.innerHTML = globalize.translateHtml(template, 'core');
+
+        options.element.querySelector('form').addEventListener('submit', self.onSubmit.bind(self));
+
+        options.element.querySelector('#selectSubtitlePlaybackMode').addEventListener('change', onSubtitleModeChange);
+        options.element.querySelector('#selectTextSize').addEventListener('change', onAppearanceFieldChange);
+        options.element.querySelector('#selectDropShadow').addEventListener('change', onAppearanceFieldChange);
+        options.element.querySelector('#selectFont').addEventListener('change', onAppearanceFieldChange);
+        options.element.querySelector('#inputTextColor').addEventListener('change', onAppearanceFieldChange);
+        options.element.querySelector('#inputTextBackground').addEventListener('change', onAppearanceFieldChange);
+
+        if (options.enableSaveButton) {
+            options.element.querySelector('.btnSave').classList.remove('hide');
+        }
+
+        if (appHost.supports('subtitleappearancesettings')) {
+            options.element.querySelector('.subtitleAppearanceSection').classList.remove('hide');
+        }
+
+        self.loadData();
+
+        if (options.autoFocus) {
+            focusManager.autoFocus(options.element);
+        }
+    });
+}
+
+export class SubtitleSettings {
+
+    constructor(options) {
+
+        this.options = options;
+
+        embed(options, this);
     }
 
-    function saveUser(context, user, userSettingsInstance, appearanceKey, apiClient) {
-
-        var appearanceSettings = userSettingsInstance.getSubtitleAppearanceSettings(appearanceKey);
-        appearanceSettings = Object.assign(appearanceSettings, getSubtitleAppearanceObject(context));
-
-        userSettingsInstance.setSubtitleAppearanceSettings(appearanceSettings, appearanceKey);
-
-        user.Configuration.SubtitleLanguagePreference = context.querySelector('#selectSubtitleLanguage').value;
-        user.Configuration.SubtitleMode = context.querySelector('#selectSubtitlePlaybackMode').value;
-
-        return apiClient.updateUserConfiguration(user.Id, user.Configuration);
-    }
-
-    function save(instance, context, userId, userSettings, apiClient, enableSaveConfirmation) {
+    loadData() {
+        let self = this;
+        let context = self.options.element;
 
         loading.show();
 
-        appSettings.set('subtitleburnin', context.querySelector('#selectSubtitleBurnIn').value);
+        let userId = self.options.userId;
+        let apiClient = connectionManager.getApiClient(self.options.serverId);
+        let userSettings = self.options.userSettings;
 
         apiClient.getUser(userId).then(function (user) {
+            userSettings.setUserInfo(userId, apiClient).then(function () {
+                self.dataLoaded = true;
 
-            saveUser(context, user, userSettings, instance.appearanceKey, apiClient).then(function () {
+                let appearanceSettings = userSettings.getSubtitleAppearanceSettings(self.options.appearanceKey);
 
-                loading.hide();
-                if (enableSaveConfirmation) {
-                    require(['toast'], function (toast) {
-                        toast(globalize.translate('SettingsSaved'));
-                    });
-                }
-
-                events.trigger(instance, 'saved');
-
-            }, function () {
-                loading.hide();
+                loadForm(context, user, userSettings, appearanceSettings, apiClient);
             });
         });
     }
 
-    function onSubmit(e) {
-        var self = this;
-        var apiClient = connectionManager.getApiClient(self.options.serverId);
-        var userId = self.options.userId;
-        var userSettings = self.options.userSettings;
+    submit() {
+        this.onSubmit(null);
+    }
+
+    destroy() {
+        this.options = null;
+    }
+
+    onSubmit(e) {
+        const self = this;
+        let apiClient = connectionManager.getApiClient(self.options.serverId);
+        let userId = self.options.userId;
+        let userSettings = self.options.userSettings;
 
         userSettings.setUserInfo(userId, apiClient).then(function () {
-            var enableSaveConfirmation = self.options.enableSaveConfirmation;
+
+            let enableSaveConfirmation = self.options.enableSaveConfirmation;
             save(self, self.options.element, userId, userSettings, apiClient, enableSaveConfirmation);
         });
 
@@ -111,103 +214,8 @@ define(['require', 'globalize', 'appSettings', 'apphost', 'focusManager', 'loadi
         if (e) {
             e.preventDefault();
         }
-
         return false;
     }
+}
 
-    function onSubtitleModeChange(e) {
-
-        var view = dom.parentWithClass(e.target, 'subtitlesettings');
-
-        var subtitlesHelp = view.querySelectorAll('.subtitlesHelp');
-        for (var i = 0, length = subtitlesHelp.length; i < length; i++) {
-            subtitlesHelp[i].classList.add('hide');
-        }
-        view.querySelector('.subtitles' + this.value + 'Help').classList.remove('hide');
-    }
-
-    function onAppearanceFieldChange(e) {
-
-        var view = dom.parentWithClass(e.target, 'subtitlesettings');
-
-        var appearanceSettings = getSubtitleAppearanceObject(view);
-
-        var elements = {
-            window: view.querySelector('.subtitleappearance-preview-window'),
-            text: view.querySelector('.subtitleappearance-preview-text')
-        };
-
-        subtitleAppearanceHelper.applyStyles(elements, appearanceSettings);
-    }
-
-    function embed(options, self) {
-
-        require(['text!./subtitlesettings.template.html'], function (template) {
-
-            options.element.classList.add('subtitlesettings');
-            options.element.innerHTML = globalize.translateDocument(template, 'core');
-
-            options.element.querySelector('form').addEventListener('submit', onSubmit.bind(self));
-
-            options.element.querySelector('#selectSubtitlePlaybackMode').addEventListener('change', onSubtitleModeChange);
-            options.element.querySelector('#selectTextSize').addEventListener('change', onAppearanceFieldChange);
-            options.element.querySelector('#selectDropShadow').addEventListener('change', onAppearanceFieldChange);
-            options.element.querySelector('#selectFont').addEventListener('change', onAppearanceFieldChange);
-            options.element.querySelector('#inputTextColor').addEventListener('change', onAppearanceFieldChange);
-            options.element.querySelector('#inputTextBackground').addEventListener('change', onAppearanceFieldChange);
-
-            if (options.enableSaveButton) {
-                options.element.querySelector('.btnSave').classList.remove('hide');
-            }
-
-            if (appHost.supports('subtitleappearancesettings')) {
-                options.element.querySelector('.subtitleAppearanceSection').classList.remove('hide');
-            }
-
-            self.loadData();
-
-            if (options.autoFocus) {
-                focusManager.autoFocus(options.element);
-            }
-        });
-    }
-
-    function SubtitleSettings(options) {
-
-        this.options = options;
-
-        embed(options, this);
-    }
-
-    SubtitleSettings.prototype.loadData = function () {
-
-        var self = this;
-        var context = self.options.element;
-
-        loading.show();
-
-        var userId = self.options.userId;
-        var apiClient = connectionManager.getApiClient(self.options.serverId);
-        var userSettings = self.options.userSettings;
-
-        apiClient.getUser(userId).then(function (user) {
-            userSettings.setUserInfo(userId, apiClient).then(function () {
-                self.dataLoaded = true;
-
-                var appearanceSettings = userSettings.getSubtitleAppearanceSettings(self.options.appearanceKey);
-
-                loadForm(context, user, userSettings, appearanceSettings, apiClient);
-            });
-        });
-    };
-
-    SubtitleSettings.prototype.submit = function () {
-        onSubmit.call(this);
-    };
-
-    SubtitleSettings.prototype.destroy = function () {
-        this.options = null;
-    };
-
-    return SubtitleSettings;
-});
+export default SubtitleSettings;
diff --git a/src/components/subtitlesync/subtitlesync.css b/src/components/subtitlesync/subtitlesync.css
index 2ff8a3e905..a63d9915bb 100644
--- a/src/components/subtitlesync/subtitlesync.css
+++ b/src/components/subtitlesync/subtitlesync.css
@@ -1,12 +1,18 @@
+.subtitleSync {
+    position: absolute;
+    width: 100%;
+}
+
 .subtitleSyncContainer {
     width: 40%;
-    margin-left: 30%;
-    margin-right: 30%;
+    min-width: 18em;
+    margin-left: auto;
+    margin-right: auto;
     height: 4.2em;
     background: rgba(28, 28, 28, 0.8);
     border-radius: 0.3em;
     color: #fff;
-    position: absolute;
+    position: relative;
 }
 
 .subtitleSync-closeButton {
diff --git a/src/components/subtitlesync/subtitlesync.js b/src/components/subtitlesync/subtitlesync.js
index fb986ec348..a3e60593e8 100644
--- a/src/components/subtitlesync/subtitlesync.js
+++ b/src/components/subtitlesync/subtitlesync.js
@@ -65,6 +65,9 @@ define(['playbackManager', 'layoutManager', 'text!./subtitlesync.template.html',
                     event.preventDefault();
                 }
             }
+
+            // FIXME: TV layout will require special handling for navigation keys. But now field is not focusable
+            event.stopPropagation();
         });
 
         subtitleSyncTextField.blur = function() {
@@ -87,14 +90,6 @@ define(['playbackManager', 'layoutManager', 'text!./subtitlesync.template.html',
                 getOffsetFromPercentage(this.value));
         });
 
-        subtitleSyncSlider.addEventListener('touchmove', function () {
-            // set new offset
-            playbackManager.setSubtitleOffset(getOffsetFromPercentage(this.value), player);
-            // synchronize with textField value
-            subtitleSyncTextField.updateOffset(
-                getOffsetFromPercentage(this.value));
-        });
-
         subtitleSyncSlider.getBubbleHtml = function (value) {
             var newOffset = getOffsetFromPercentage(value);
             return '<h1 class="sliderBubbleText">' +
diff --git a/src/components/subtitlesync/subtitlesync.template.html b/src/components/subtitlesync/subtitlesync.template.html
index 4ca039aa03..fe202ebf60 100644
--- a/src/components/subtitlesync/subtitlesync.template.html
+++ b/src/components/subtitlesync/subtitlesync.template.html
@@ -1,7 +1,9 @@
-<div class="subtitleSyncContainer">
-    <button type="button" is="paper-icon-button-light" class="subtitleSync-closeButton"><span class="material-icons close"></span></button>
-    <div class="subtitleSyncTextField" contenteditable="true" spellcheck="false">0s</div>
-    <div class="sliderContainer subtitleSyncSliderContainer">
-        <input is="emby-slider" type="range" step="1" min="0" max="100" value="50" class="subtitleSyncSlider" />
+<div class="subtitleSync">
+    <div class="subtitleSyncContainer">
+        <button type="button" is="paper-icon-button-light" class="subtitleSync-closeButton"><span class="material-icons close"></span></button>
+        <div class="subtitleSyncTextField" contenteditable="true" spellcheck="false">0s</div>
+        <div class="sliderContainer subtitleSyncSliderContainer">
+            <input is="emby-slider" type="range" step="1" min="0" max="100" value="50" class="subtitleSyncSlider" data-slider-keep-progress="true" />
+        </div>
     </div>
 </div>
diff --git a/src/components/syncplay/groupSelectionMenu.js b/src/components/syncPlay/groupSelectionMenu.js
similarity index 94%
rename from src/components/syncplay/groupSelectionMenu.js
rename to src/components/syncPlay/groupSelectionMenu.js
index 067100ad73..360aa0b0c2 100644
--- a/src/components/syncplay/groupSelectionMenu.js
+++ b/src/components/syncPlay/groupSelectionMenu.js
@@ -37,7 +37,7 @@ function showNewJoinGroupSelection (button, user, apiClient) {
         console.debug('No item is currently playing.');
     }
 
-    apiClient.sendSyncPlayCommand(sessionId, 'ListGroups').then(function (response) {
+    apiClient.getSyncPlayGroups().then(function (response) {
         response.json().then(function (groups) {
             var menuItems = groups.map(function (group) {
                 return {
@@ -83,9 +83,9 @@ function showNewJoinGroupSelection (button, user, apiClient) {
 
             actionsheet.show(menuOptions).then(function (id) {
                 if (id == 'new-group') {
-                    apiClient.sendSyncPlayCommand(sessionId, 'NewGroup');
-                } else {
-                    apiClient.sendSyncPlayCommand(sessionId, 'JoinGroup', {
+                    apiClient.createSyncPlayGroup();
+                } else if (id) {
+                    apiClient.joinSyncPlayGroup({
                         GroupId: id,
                         PlayingItemId: playingItemId
                     });
@@ -140,7 +140,7 @@ function showLeaveGroupSelection (button, user, apiClient) {
 
     actionsheet.show(menuOptions).then(function (id) {
         if (id == 'leave-group') {
-            apiClient.sendSyncPlayCommand(sessionId, 'LeaveGroup');
+            apiClient.leaveSyncPlayGroup();
         }
     }).catch((error) => {
         console.error('SyncPlay: unexpected error showing group menu:', error);
diff --git a/src/components/syncplay/playbackPermissionManager.js b/src/components/syncPlay/playbackPermissionManager.js
similarity index 100%
rename from src/components/syncplay/playbackPermissionManager.js
rename to src/components/syncPlay/playbackPermissionManager.js
diff --git a/src/components/syncplay/syncPlayManager.js b/src/components/syncPlay/syncPlayManager.js
similarity index 97%
rename from src/components/syncplay/syncPlayManager.js
rename to src/components/syncPlay/syncPlayManager.js
index f5c9ac446d..c8660b2bc4 100644
--- a/src/components/syncplay/syncPlayManager.js
+++ b/src/components/syncPlay/syncPlayManager.js
@@ -1,6 +1,6 @@
 /**
  * Module that manages the SyncPlay feature.
- * @module components/syncplay/syncPlayManager
+ * @module components/syncPlay/syncPlayManager
  */
 
 import events from 'events';
@@ -139,7 +139,7 @@ class SyncPlayManager {
                     return;
                 }
 
-                apiClient.sendSyncPlayCommand(sessionId, 'UpdatePing', {
+                apiClient.sendSyncPlayPing({
                     Ping: ping
                 });
             }
@@ -212,6 +212,7 @@ class SyncPlayManager {
         if (!this.lastPlaybackWaiting) {
             this.lastPlaybackWaiting = new Date();
         }
+
         events.trigger(this, 'waiting');
     }
 
@@ -265,10 +266,9 @@ class SyncPlayManager {
         events.on(player, 'timeupdate', this._onTimeUpdate);
         events.on(player, 'playing', this._onPlaying);
         events.on(player, 'waiting', this._onWaiting);
-        this.playbackRateSupported = player.supports('PlaybackRate');
 
         // Save player current PlaybackRate value
-        if (this.playbackRateSupported) {
+        if (player.supports && player.supports('PlaybackRate')) {
             this.localPlayerPlaybackRate = player.getPlaybackRate();
         }
     }
@@ -289,6 +289,7 @@ class SyncPlayManager {
                 player.setPlaybackRate(this.localPlayerPlaybackRate);
                 this.localPlayerPlaybackRate = 1.0;
             }
+
             this.currentPlayer = null;
             this.playbackRateSupported = false;
         }
@@ -434,6 +435,7 @@ class SyncPlayManager {
                     });
                     return;
                 }
+
                 // Get playing item id
                 let playingItemId;
                 try {
@@ -448,7 +450,7 @@ class SyncPlayManager {
                     if (!success) {
                         console.warning('Error reporting playback state to server. Joining group will fail.');
                     }
-                    apiClient.sendSyncPlayCommand(sessionId, 'JoinGroup', {
+                    apiClient.joinSyncPlayGroup({
                         GroupId: groupId,
                         PlayingItemId: playingItemId
                     });
@@ -620,6 +622,7 @@ class SyncPlayManager {
         if (this.currentPlayer) {
             this.currentPlayer.setPlaybackRate(1);
         }
+
         this.clearSyncIcon();
     }
 
@@ -659,8 +662,7 @@ class SyncPlayManager {
      */
     playRequest (player) {
         var apiClient = connectionManager.currentApiClient();
-        var sessionId = getActivePlayerId();
-        apiClient.sendSyncPlayCommand(sessionId, 'PlayRequest');
+        apiClient.requestSyncPlayStart();
     }
 
     /**
@@ -668,8 +670,7 @@ class SyncPlayManager {
      */
     pauseRequest (player) {
         var apiClient = connectionManager.currentApiClient();
-        var sessionId = getActivePlayerId();
-        apiClient.sendSyncPlayCommand(sessionId, 'PauseRequest');
+        apiClient.requestSyncPlayPause();
         // Pause locally as well, to give the user some little control
         playbackManager._localUnpause(player);
     }
@@ -679,8 +680,7 @@ class SyncPlayManager {
      */
     seekRequest (PositionTicks, player) {
         var apiClient = connectionManager.currentApiClient();
-        var sessionId = getActivePlayerId();
-        apiClient.sendSyncPlayCommand(sessionId, 'SeekRequest', {
+        apiClient.requestSyncPlaySeek({
             PositionTicks: PositionTicks
         });
     }
diff --git a/src/components/syncplay/timeSyncManager.js b/src/components/syncPlay/timeSyncManager.js
similarity index 98%
rename from src/components/syncplay/timeSyncManager.js
rename to src/components/syncPlay/timeSyncManager.js
index ca92939576..d3b59589ee 100644
--- a/src/components/syncplay/timeSyncManager.js
+++ b/src/components/syncPlay/timeSyncManager.js
@@ -1,6 +1,6 @@
 /**
  * Module that manages time syncing with server.
- * @module components/syncplay/timeSyncManager
+ * @module components/syncPlay/timeSyncManager
  */
 
 import events from 'events';
@@ -65,8 +65,6 @@ class TimeSyncManager {
         this.pings = 0; // number of pings
         this.measurement = null; // current time sync
         this.measurements = [];
-
-        this.startPing();
     }
 
     /**
diff --git a/src/components/tabbedview/itemstab.js b/src/components/tabbedview/itemstab.js
index 884cfa2015..d40faef5dc 100644
--- a/src/components/tabbedview/itemstab.js
+++ b/src/components/tabbedview/itemstab.js
@@ -51,7 +51,7 @@ define(['playbackManager', 'userSettings', 'alphaPicker', 'alphaNumericShortcuts
 
         instance.itemsContainer = view.querySelector('.itemsContainer');
 
-        instance.alphaPicker = new AlphaPicker({
+        instance.alphaPicker = new AlphaPicker.default({
             element: instance.alphaPickerElement,
             itemsContainer: instance.itemsContainer,
             itemClass: 'card'
@@ -331,7 +331,7 @@ define(['playbackManager', 'userSettings', 'alphaPicker', 'alphaNumericShortcuts
         }
 
         if (this.enableAlphaNumericShortcuts !== false) {
-            this.alphaNumericShortcuts = new AlphaNumericShortcuts({
+            this.alphaNumericShortcuts = new AlphaNumericShortcuts.default({
                 itemsContainer: this.itemsContainer
             });
         }
@@ -561,7 +561,7 @@ define(['playbackManager', 'userSettings', 'alphaPicker', 'alphaNumericShortcuts
 
         var alphaNumericShortcuts = this.alphaNumericShortcuts;
         if (alphaNumericShortcuts) {
-            alphaNumericShortcuts.destroy();
+            alphaNumericShortcuts.default.destroy();
             this.alphaNumericShortcuts = null;
         }
     };
diff --git a/src/components/tabbedview/tabbedview.js b/src/components/tabbedview/tabbedview.js
index a67e8e0fa1..4fec69f619 100644
--- a/src/components/tabbedview/tabbedview.js
+++ b/src/components/tabbedview/tabbedview.js
@@ -95,7 +95,7 @@ define(['backdrop', 'mainTabsManager', 'layoutManager', 'emby-tabs'], function (
     TabbedView.prototype.onResume = function (options) {
 
         this.setTitle();
-        backdrop.clear();
+        backdrop.clearBackdrop();
 
         var currentTabController = this.currentTabController;
 
diff --git a/src/components/tvproviders/xmltv.js b/src/components/tvproviders/xmltv.js
index 4c39b14430..054c5b640d 100644
--- a/src/components/tvproviders/xmltv.js
+++ b/src/components/tvproviders/xmltv.js
@@ -139,7 +139,7 @@ define(['jQuery', 'loading', 'globalize', 'emby-checkbox', 'emby-input', 'listVi
             var page = $(e.target).parents('.xmltvForm')[0];
 
             require(['directorybrowser'], function (directoryBrowser) {
-                var picker = new directoryBrowser();
+                var picker = new directoryBrowser.default();
                 picker.show({
                     includeFiles: true,
                     callback: function (path) {
diff --git a/src/components/viewContainer.js b/src/components/viewContainer.js
index 6c83e4a3ba..dbc493bc91 100644
--- a/src/components/viewContainer.js
+++ b/src/components/viewContainer.js
@@ -43,18 +43,6 @@ define(['browser', 'dom', 'layoutManager', 'css!components/viewManager/viewConta
             var newView = newViewInfo.elem;
             var modulesToLoad = [];
 
-            if (isPluginpage) {
-                modulesToLoad.push('legacyDashboard');
-            }
-
-            if (newViewInfo.hasjQuerySelect) {
-                modulesToLoad.push('legacySelectMenu');
-            }
-
-            if (newViewInfo.hasjQueryChecked) {
-                modulesToLoad.push('fnchecked');
-            }
-
             return new Promise(function (resolve) {
                 require(modulesToLoad, function () {
                     var currentPage = allPages[pageIndex];
diff --git a/src/components/viewManager/viewManager.js b/src/components/viewManager/viewManager.js
index a8e514e06e..8e17264f9f 100644
--- a/src/components/viewManager/viewManager.js
+++ b/src/components/viewManager/viewManager.js
@@ -21,10 +21,11 @@ define(['viewContainer', 'focusManager', 'queryString', 'layoutManager'], functi
         if (!newView.initComplete) {
             newView.initComplete = true;
 
+            var controller;
             if (typeof options.controllerFactory === 'function') {
-
-                // Use controller method
-                var controller = new options.controllerFactory(newView, eventDetail.detail.params);
+                controller = new options.controllerFactory(newView, eventDetail.detail.params);
+            } else if (options.controllerFactory && typeof options.controllerFactory.default === 'function') {
+                controller = new options.controllerFactory.default(newView, eventDetail.detail.params);
             }
 
             if (!options.controllerFactory || dispatchPageEvents) {
diff --git a/src/components/viewsettings/viewsettings.js b/src/components/viewSettings/viewSettings.js
similarity index 97%
rename from src/components/viewsettings/viewsettings.js
rename to src/components/viewSettings/viewSettings.js
index 441c35157b..28a9854c34 100644
--- a/src/components/viewsettings/viewsettings.js
+++ b/src/components/viewSettings/viewSettings.js
@@ -57,7 +57,7 @@ define(['require', 'dialogHelper', 'loading', 'apphost', 'layoutManager', 'conne
 
         return new Promise(function (resolve, reject) {
 
-            require(['text!./viewsettings.template.html'], function (template) {
+            require(['text!./viewSettings.template.html'], function (template) {
 
                 var dialogOptions = {
                     removeOnClose: true,
@@ -84,7 +84,7 @@ define(['require', 'dialogHelper', 'loading', 'apphost', 'layoutManager', 'conne
 
                 html += template;
 
-                dlg.innerHTML = globalize.translateDocument(html, 'core');
+                dlg.innerHTML = globalize.translateHtml(html, 'core');
 
                 var settingElements = dlg.querySelectorAll('.viewSetting');
                 for (var i = 0, length = settingElements.length; i < length; i++) {
diff --git a/src/components/viewsettings/viewsettings.template.html b/src/components/viewSettings/viewSettings.template.html
similarity index 100%
rename from src/components/viewsettings/viewsettings.template.html
rename to src/components/viewSettings/viewSettings.template.html
diff --git a/src/components/youtubeplayer/plugin.js b/src/components/youtubeplayer/plugin.js
deleted file mode 100644
index 5b5e1b1a3c..0000000000
--- a/src/components/youtubeplayer/plugin.js
+++ /dev/null
@@ -1,409 +0,0 @@
-define(['require', 'events', 'browser', 'appRouter', 'loading'], function (require, events, browser, appRouter, loading) {
-    'use strict';
-    /* globals YT */
-
-    function zoomIn(elem, iterations) {
-        var keyframes = [
-            { transform: 'scale3d(.2, .2, .2)  ', opacity: '.6', offset: 0 },
-            { transform: 'none', opacity: '1', offset: 1 }
-        ];
-
-        var timing = { duration: 240, iterations: iterations };
-        return elem.animate(keyframes, timing);
-    }
-
-    function createMediaElement(instance, options) {
-
-        return new Promise(function (resolve, reject) {
-
-            var dlg = document.querySelector('.youtubePlayerContainer');
-
-            if (!dlg) {
-
-                require(['css!./style'], function () {
-
-                    loading.show();
-
-                    var dlg = document.createElement('div');
-
-                    dlg.classList.add('youtubePlayerContainer');
-
-                    if (options.fullscreen) {
-                        dlg.classList.add('onTop');
-                    }
-
-                    dlg.innerHTML = '<div id="player"></div>';
-                    var videoElement = dlg.querySelector('#player');
-
-                    document.body.insertBefore(dlg, document.body.firstChild);
-                    instance.videoDialog = dlg;
-
-                    if (options.fullscreen && dlg.animate && !browser.slow) {
-                        zoomIn(dlg, 1).onfinish = function () {
-                            resolve(videoElement);
-                        };
-                    } else {
-                        resolve(videoElement);
-                    }
-
-                });
-
-            } else {
-                resolve(dlg.querySelector('#player'));
-            }
-        });
-    }
-
-    function onVideoResize() {
-        var instance = this;
-        var player = instance.currentYoutubePlayer;
-        var dlg = instance.videoDialog;
-        if (player && dlg) {
-            player.setSize(dlg.offsetWidth, dlg.offsetHeight);
-        }
-    }
-
-    function clearTimeUpdateInterval(instance) {
-        if (instance.timeUpdateInterval) {
-            clearInterval(instance.timeUpdateInterval);
-        }
-        instance.timeUpdateInterval = null;
-    }
-
-    function onEndedInternal(instance) {
-
-        clearTimeUpdateInterval(instance);
-        var resizeListener = instance.resizeListener;
-        if (resizeListener) {
-            window.removeEventListener('resize', resizeListener);
-            window.removeEventListener('orientationChange', resizeListener);
-            instance.resizeListener = null;
-        }
-
-        var stopInfo = {
-            src: instance._currentSrc
-        };
-
-        events.trigger(instance, 'stopped', [stopInfo]);
-
-        instance._currentSrc = null;
-        if (instance.currentYoutubePlayer) {
-            instance.currentYoutubePlayer.destroy();
-        }
-        instance.currentYoutubePlayer = null;
-    }
-
-    // 4. The API will call this function when the video player is ready.
-    function onPlayerReady(event) {
-        event.target.playVideo();
-    }
-
-    function onTimeUpdate(e) {
-
-        events.trigger(this, 'timeupdate');
-    }
-
-    function onPlaying(instance, playOptions, resolve) {
-
-        if (!instance.started) {
-
-            instance.started = true;
-            resolve();
-            clearTimeUpdateInterval(instance);
-            instance.timeUpdateInterval = setInterval(onTimeUpdate.bind(instance), 500);
-
-            if (playOptions.fullscreen) {
-
-                appRouter.showVideoOsd().then(function () {
-                    instance.videoDialog.classList.remove('onTop');
-                });
-
-            } else {
-                appRouter.setTransparency('backdrop');
-                instance.videoDialog.classList.remove('onTop');
-            }
-
-            require(['loading'], function (loading) {
-
-                loading.hide();
-            });
-        }
-    }
-
-    function setCurrentSrc(instance, elem, options) {
-
-        return new Promise(function (resolve, reject) {
-
-            require(['queryString'], function (queryString) {
-
-                instance._currentSrc = options.url;
-                var params = queryString.parse(options.url.split('?')[1]);
-                // 3. This function creates an <iframe> (and YouTube player)
-                //    after the API code downloads.
-                window.onYouTubeIframeAPIReady = function () {
-                    instance.currentYoutubePlayer = new YT.Player('player', {
-                        height: instance.videoDialog.offsetHeight,
-                        width: instance.videoDialog.offsetWidth,
-                        videoId: params.v,
-                        events: {
-                            'onReady': onPlayerReady,
-                            'onStateChange': function (event) {
-                                if (event.data === YT.PlayerState.PLAYING) {
-                                    onPlaying(instance, options, resolve);
-                                } else if (event.data === YT.PlayerState.ENDED) {
-                                    onEndedInternal(instance);
-                                } else if (event.data === YT.PlayerState.PAUSED) {
-                                    events.trigger(instance, 'pause');
-                                }
-                            }
-                        },
-                        playerVars: {
-                            controls: 0,
-                            enablejsapi: 1,
-                            modestbranding: 1,
-                            rel: 0,
-                            showinfo: 0,
-                            fs: 0,
-                            playsinline: 1
-                        }
-                    });
-
-                    var resizeListener = instance.resizeListener;
-                    if (resizeListener) {
-                        window.removeEventListener('resize', resizeListener);
-                        window.addEventListener('resize', resizeListener);
-                    } else {
-                        resizeListener = instance.resizeListener = onVideoResize.bind(instance);
-                        window.addEventListener('resize', resizeListener);
-                    }
-                    window.removeEventListener('orientationChange', resizeListener);
-                    window.addEventListener('orientationChange', resizeListener);
-                };
-
-                if (!window.YT) {
-                    var tag = document.createElement('script');
-                    tag.src = 'https://www.youtube.com/iframe_api';
-                    var firstScriptTag = document.getElementsByTagName('script')[0];
-                    firstScriptTag.parentNode.insertBefore(tag, firstScriptTag);
-                } else {
-                    window.onYouTubeIframeAPIReady();
-                }
-            });
-
-        });
-    }
-
-    function YoutubePlayer() {
-
-        this.name = 'Youtube Player';
-        this.type = 'mediaplayer';
-        this.id = 'youtubeplayer';
-
-        // Let any players created by plugins take priority
-        this.priority = 1;
-    }
-
-    YoutubePlayer.prototype.play = function (options) {
-
-        this.started = false;
-        var instance = this;
-
-        return createMediaElement(this, options).then(function (elem) {
-
-            return setCurrentSrc(instance, elem, options);
-        });
-    };
-
-    YoutubePlayer.prototype.stop = function (destroyPlayer) {
-
-        var src = this._currentSrc;
-
-        if (src) {
-
-            if (this.currentYoutubePlayer) {
-                this.currentYoutubePlayer.stopVideo();
-            }
-            onEndedInternal(this);
-
-            if (destroyPlayer) {
-                this.destroy();
-            }
-        }
-
-        return Promise.resolve();
-    };
-
-    YoutubePlayer.prototype.destroy = function () {
-
-        appRouter.setTransparency('none');
-
-        var dlg = this.videoDialog;
-        if (dlg) {
-
-            this.videoDialog = null;
-
-            dlg.parentNode.removeChild(dlg);
-        }
-    };
-
-    YoutubePlayer.prototype.canPlayMediaType = function (mediaType) {
-
-        mediaType = (mediaType || '').toLowerCase();
-
-        return mediaType === 'audio' || mediaType === 'video';
-    };
-
-    YoutubePlayer.prototype.canPlayItem = function (item) {
-
-        // Does not play server items
-        return false;
-    };
-
-    YoutubePlayer.prototype.canPlayUrl = function (url) {
-
-        return url.toLowerCase().indexOf('youtube.com') !== -1;
-    };
-
-    YoutubePlayer.prototype.getDeviceProfile = function () {
-
-        return Promise.resolve({});
-    };
-
-    YoutubePlayer.prototype.currentSrc = function () {
-        return this._currentSrc;
-    };
-
-    YoutubePlayer.prototype.setSubtitleStreamIndex = function (index) {
-    };
-
-    YoutubePlayer.prototype.canSetAudioStreamIndex = function () {
-        return false;
-    };
-
-    YoutubePlayer.prototype.setAudioStreamIndex = function (index) {
-
-    };
-
-    // Save this for when playback stops, because querying the time at that point might return 0
-    YoutubePlayer.prototype.currentTime = function (val) {
-
-        var currentYoutubePlayer = this.currentYoutubePlayer;
-
-        if (currentYoutubePlayer) {
-            if (val != null) {
-                currentYoutubePlayer.seekTo(val / 1000, true);
-                return;
-            }
-
-            return currentYoutubePlayer.getCurrentTime() * 1000;
-        }
-    };
-
-    YoutubePlayer.prototype.duration = function (val) {
-
-        var currentYoutubePlayer = this.currentYoutubePlayer;
-
-        if (currentYoutubePlayer) {
-            return currentYoutubePlayer.getDuration() * 1000;
-        }
-        return null;
-    };
-
-    YoutubePlayer.prototype.pause = function () {
-
-        var currentYoutubePlayer = this.currentYoutubePlayer;
-
-        if (currentYoutubePlayer) {
-            currentYoutubePlayer.pauseVideo();
-
-            var instance = this;
-
-            // This needs a delay before the youtube player will report the correct player state
-            setTimeout(function () {
-                events.trigger(instance, 'pause');
-            }, 200);
-        }
-    };
-
-    YoutubePlayer.prototype.unpause = function () {
-
-        var currentYoutubePlayer = this.currentYoutubePlayer;
-
-        if (currentYoutubePlayer) {
-            currentYoutubePlayer.playVideo();
-
-            var instance = this;
-
-            // This needs a delay before the youtube player will report the correct player state
-            setTimeout(function () {
-                events.trigger(instance, 'unpause');
-            }, 200);
-        }
-    };
-
-    YoutubePlayer.prototype.paused = function () {
-
-        var currentYoutubePlayer = this.currentYoutubePlayer;
-
-        if (currentYoutubePlayer) {
-            return currentYoutubePlayer.getPlayerState() === 2;
-        }
-
-        return false;
-    };
-
-    YoutubePlayer.prototype.volume = function (val) {
-        if (val != null) {
-            return this.setVolume(val);
-        }
-
-        return this.getVolume();
-    };
-
-    YoutubePlayer.prototype.setVolume = function (val) {
-
-        var currentYoutubePlayer = this.currentYoutubePlayer;
-
-        if (currentYoutubePlayer) {
-            if (val != null) {
-                currentYoutubePlayer.setVolume(val);
-            }
-        }
-    };
-
-    YoutubePlayer.prototype.getVolume = function () {
-
-        var currentYoutubePlayer = this.currentYoutubePlayer;
-
-        if (currentYoutubePlayer) {
-            return currentYoutubePlayer.getVolume();
-        }
-    };
-
-    YoutubePlayer.prototype.setMute = function (mute) {
-
-        var currentYoutubePlayer = this.currentYoutubePlayer;
-
-        if (mute) {
-            if (currentYoutubePlayer) {
-                currentYoutubePlayer.mute();
-            }
-        } else {
-
-            if (currentYoutubePlayer) {
-                currentYoutubePlayer.unMute();
-            }
-        }
-    };
-
-    YoutubePlayer.prototype.isMuted = function () {
-
-        var currentYoutubePlayer = this.currentYoutubePlayer;
-
-        if (currentYoutubePlayer) {
-            return currentYoutubePlayer.isMuted();
-        }
-    };
-
-    return YoutubePlayer;
-});
diff --git a/src/config.json b/src/config.json
new file mode 120000
index 0000000000..f1bd2db71e
--- /dev/null
+++ b/src/config.json
@@ -0,0 +1 @@
+config.template.json
\ No newline at end of file
diff --git a/src/config.template.json b/src/config.template.json
index 1e79270943..4b22a699d6 100644
--- a/src/config.template.json
+++ b/src/config.template.json
@@ -1,3 +1,3 @@
 {
-    "multiserver": true
+    "multiserver": false
 }
diff --git a/src/controllers/dashboard/apikeys.js b/src/controllers/dashboard/apikeys.js
index f43bfd0329..0e122c486d 100644
--- a/src/controllers/dashboard/apikeys.js
+++ b/src/controllers/dashboard/apikeys.js
@@ -1,8 +1,14 @@
-define(['datetime', 'loading', 'libraryMenu', 'dom', 'globalize', 'emby-button'], function (datetime, loading, libraryMenu, dom, globalize) {
-    'use strict';
+import datetime from 'datetime';
+import loading from 'loading';
+import libraryMenu from 'libraryMenu';
+import dom from 'dom';
+import globalize from 'globalize';
+import 'emby-button';
+
+/* eslint-disable indent */
 
     function revoke(page, key) {
-        require(['confirm'], function (confirm) {
+        import('confirm').then(({default: confirm}) => {
             confirm(globalize.translate('MessageConfirmRevokeApiKey'), globalize.translate('HeaderConfirmRevokeApiKey')).then(function () {
                 loading.show();
                 ApiClient.ajax({
@@ -16,8 +22,8 @@ define(['datetime', 'loading', 'libraryMenu', 'dom', 'globalize', 'emby-button']
     }
 
     function renderKeys(page, keys) {
-        var rows = keys.map(function (item) {
-            var html = '';
+        const rows = keys.map(function (item) {
+            let html = '';
             html += '<tr class="detailTableBodyRow detailTableBodyRow-shaded">';
             html += '<td class="detailTableBodyCell">';
             html += '<button type="button" is="emby-button" data-token="' + item.AccessToken + '" class="raised raised-mini btnRevoke" data-mini="true" title="' + globalize.translate('ButtonRevoke') + '" style="margin:0;">' + globalize.translate('ButtonRevoke') + '</button>';
@@ -29,7 +35,7 @@ define(['datetime', 'loading', 'libraryMenu', 'dom', 'globalize', 'emby-button']
             html += item.AppName || '';
             html += '</td>';
             html += '<td class="detailTableBodyCell" style="vertical-align:middle;">';
-            var date = datetime.parseISO8601Date(item.DateCreated, true);
+            const date = datetime.parseISO8601Date(item.DateCreated, true);
             html += datetime.toLocaleDateString(date) + ' ' + datetime.getDisplayTime(date);
             html += '</td>';
             return html += '</tr>';
@@ -46,7 +52,7 @@ define(['datetime', 'loading', 'libraryMenu', 'dom', 'globalize', 'emby-button']
     }
 
     function showNewKeyPrompt(page) {
-        require(['prompt'], function (prompt) {
+        import('prompt').then(({default: prompt}) => {
             prompt({
                 title: globalize.translate('HeaderNewApiKey'),
                 label: globalize.translate('LabelAppName'),
@@ -65,12 +71,12 @@ define(['datetime', 'loading', 'libraryMenu', 'dom', 'globalize', 'emby-button']
     }
 
     pageIdOn('pageinit', 'apiKeysPage', function () {
-        var page = this;
+        const page = this;
         page.querySelector('.btnNewKey').addEventListener('click', function () {
             showNewKeyPrompt(page);
         });
         page.querySelector('.tblApiKeys').addEventListener('click', function (e) {
-            var btnRevoke = dom.parentWithClass(e.target, 'btnRevoke');
+            const btnRevoke = dom.parentWithClass(e.target, 'btnRevoke');
 
             if (btnRevoke) {
                 revoke(page, btnRevoke.getAttribute('data-token'));
@@ -80,4 +86,5 @@ define(['datetime', 'loading', 'libraryMenu', 'dom', 'globalize', 'emby-button']
     pageIdOn('pagebeforeshow', 'apiKeysPage', function () {
         loadData(this);
     });
-});
+
+/* eslint-enable indent */
diff --git a/src/controllers/dashboard/dashboard.js b/src/controllers/dashboard/dashboard.js
index f91f4e01ef..b9405c2da9 100644
--- a/src/controllers/dashboard/dashboard.js
+++ b/src/controllers/dashboard/dashboard.js
@@ -1,11 +1,31 @@
-define(['datetime', 'events', 'itemHelper', 'serverNotifications', 'dom', 'globalize', 'date-fns', 'dfnshelper', 'loading', 'connectionManager', 'playMethodHelper', 'cardBuilder', 'imageLoader', 'components/activitylog', 'scripts/imagehelper', 'indicators', 'listViewStyle', 'emby-button', 'flexStyles', 'emby-button', 'emby-itemscontainer'], function (datetime, events, itemHelper, serverNotifications, dom, globalize, datefns, dfnshelper, loading, connectionManager, playMethodHelper, cardBuilder, imageLoader, ActivityLog, imageHelper, indicators) {
-    'use strict';
+import datetime from 'datetime';
+import events from 'events';
+import itemHelper from 'itemHelper';
+import serverNotifications from 'serverNotifications';
+import dom from 'dom';
+import globalize from 'globalize';
+import * as datefns from 'date-fns';
+import dfnshelper from 'dfnshelper';
+import loading from 'loading';
+import connectionManager from 'connectionManager';
+import playMethodHelper from 'playMethodHelper';
+import cardBuilder from 'cardBuilder';
+import imageLoader from 'imageLoader';
+import ActivityLog from 'components/activitylog';
+import imageHelper from 'scripts/imagehelper';
+import indicators from 'indicators';
+import 'listViewStyle';
+import 'emby-button';
+import 'flexStyles';
+import 'emby-itemscontainer';
+
+/* eslint-disable indent */
 
     function showPlaybackInfo(btn, session) {
-        require(['alert'], function (alert) {
-            var title;
-            var text = [];
-            var displayPlayMethod = playMethodHelper.getDisplayPlayMethod(session);
+        import('alert').then(({default: alert}) => {
+            let title;
+            let text = [];
+            const displayPlayMethod = playMethodHelper.getDisplayPlayMethod(session);
 
             if (displayPlayMethod === 'DirectStream') {
                 title = globalize.translate('DirectStreaming');
@@ -33,7 +53,7 @@ define(['datetime', 'events', 'itemHelper', 'serverNotifications', 'dom', 'globa
     }
 
     function showSendMessageForm(btn, session) {
-        require(['prompt'], function (prompt) {
+        import('prompt').then(({default: prompt}) => {
             prompt({
                 title: globalize.translate('HeaderSendMessage'),
                 label: globalize.translate('LabelMessageText'),
@@ -50,8 +70,8 @@ define(['datetime', 'events', 'itemHelper', 'serverNotifications', 'dom', 'globa
     }
 
     function showOptionsMenu(btn, session) {
-        require(['actionsheet'], function (actionsheet) {
-            var menuItems = [];
+        import('actionsheet').then(({default: actionsheet}) => {
+            const menuItems = [];
 
             if (session.ServerId && session.DeviceId !== connectionManager.deviceId()) {
                 menuItems.push({
@@ -84,14 +104,14 @@ define(['datetime', 'events', 'itemHelper', 'serverNotifications', 'dom', 'globa
     }
 
     function onActiveDevicesClick(evt) {
-        var btn = dom.parentWithClass(evt.target, 'sessionCardButton');
+        const btn = dom.parentWithClass(evt.target, 'sessionCardButton');
 
         if (btn) {
-            var card = dom.parentWithClass(btn, 'card');
+            const card = dom.parentWithClass(btn, 'card');
 
             if (card) {
-                var sessionId = card.id;
-                var session = (DashboardPage.sessionsList || []).filter(function (dashboardSession) {
+                const sessionId = card.id;
+                const session = (DashboardPage.sessionsList || []).filter(function (dashboardSession) {
                     return 'session' + dashboardSession.Id === sessionId;
                 })[0];
 
@@ -113,11 +133,11 @@ define(['datetime', 'events', 'itemHelper', 'serverNotifications', 'dom', 'globa
     }
 
     function filterSessions(sessions) {
-        var list = [];
-        var minActiveDate = new Date().getTime() - 9e5;
+        const list = [];
+        const minActiveDate = new Date().getTime() - 9e5;
 
-        for (var i = 0, length = sessions.length; i < length; i++) {
-            var session = sessions[i];
+        for (let i = 0, length = sessions.length; i < length; i++) {
+            const session = sessions[i];
 
             if (!session.NowPlayingItem && !session.UserId) {
                 continue;
@@ -139,7 +159,7 @@ define(['datetime', 'events', 'itemHelper', 'serverNotifications', 'dom', 'globa
             EnableTotalRecordCount: false,
             EnableImageTypes: 'Primary,Thumb,Backdrop'
         }).then(function (result) {
-            var itemsContainer = view.querySelector('.activeRecordingItems');
+            const itemsContainer = view.querySelector('.activeRecordingItems');
 
             if (!result.Items.length) {
                 view.querySelector('.activeRecordingsSection').classList.add('hide');
@@ -169,13 +189,7 @@ define(['datetime', 'events', 'itemHelper', 'serverNotifications', 'dom', 'globa
     function reloadSystemInfo(view, apiClient) {
         apiClient.getSystemInfo().then(function (systemInfo) {
             view.querySelector('#serverName').innerHTML = globalize.translate('DashboardServerName', systemInfo.ServerName);
-            var localizedVersion = globalize.translate('DashboardVersionNumber', systemInfo.Version);
-
-            if (systemInfo.SystemUpdateLevel !== 'Release') {
-                localizedVersion += ' ' + systemInfo.SystemUpdateLevel;
-            }
-
-            view.querySelector('#versionNumber').innerHTML = localizedVersion;
+            view.querySelector('#versionNumber').innerHTML = globalize.translate('DashboardVersionNumber', systemInfo.Version);
             view.querySelector('#operatingSystem').innerHTML = globalize.translate('DashboardOperatingSystem', systemInfo.OperatingSystem);
             view.querySelector('#architecture').innerHTML = globalize.translate('DashboardArchitecture', systemInfo.SystemArchitecture);
 
@@ -205,31 +219,31 @@ define(['datetime', 'events', 'itemHelper', 'serverNotifications', 'dom', 'globa
     }
 
     function renderActiveConnections(view, sessions) {
-        var html = '';
+        let html = '';
         DashboardPage.sessionsList = sessions;
-        var parentElement = view.querySelector('.activeDevices');
-        var cardElem = parentElement.querySelector('.card');
+        const parentElement = view.querySelector('.activeDevices');
+        const cardElem = parentElement.querySelector('.card');
 
         if (cardElem) {
             cardElem.classList.add('deadSession');
         }
 
-        for (var i = 0, length = sessions.length; i < length; i++) {
-            var session = sessions[i];
-            var rowId = 'session' + session.Id;
-            var elem = view.querySelector('#' + rowId);
+        for (let i = 0, length = sessions.length; i < length; i++) {
+            const session = sessions[i];
+            const rowId = 'session' + session.Id;
+            const elem = view.querySelector('#' + rowId);
 
             if (elem) {
                 DashboardPage.updateSession(elem, session);
             } else {
-                var nowPlayingItem = session.NowPlayingItem;
-                var className = 'scalableCard card activeSession backdropCard backdropCard-scalable';
+                const nowPlayingItem = session.NowPlayingItem;
+                const className = 'scalableCard card activeSession backdropCard backdropCard-scalable';
                 html += '<div class="' + className + '" id="' + rowId + '">';
                 html += '<div class="cardBox visualCardBox">';
                 html += '<div class="cardScalable visualCardBox-cardScalable">';
                 html += '<div class="cardPadder cardPadder-backdrop"></div>';
                 html += '<div class="cardContent">';
-                var imgUrl = DashboardPage.getNowPlayingImageUrl(nowPlayingItem);
+                const imgUrl = DashboardPage.getNowPlayingImageUrl(nowPlayingItem);
 
                 if (imgUrl) {
                     html += '<div class="sessionNowPlayingContent sessionNowPlayingContent-withbackground"';
@@ -240,7 +254,7 @@ define(['datetime', 'events', 'itemHelper', 'serverNotifications', 'dom', 'globa
 
                 html += '<div class="sessionNowPlayingInnerContent">';
                 html += '<div class="sessionAppInfo">';
-                var clientImage = DashboardPage.getClientImage(session);
+                const clientImage = DashboardPage.getClientImage(session);
 
                 if (clientImage) {
                     html += clientImage;
@@ -252,14 +266,8 @@ define(['datetime', 'events', 'itemHelper', 'serverNotifications', 'dom', 'globa
                 html += '</div>';
                 html += '</div>';
 
-                if (session.TranscodingInfo && session.TranscodingInfo.Framerate) {
-                    html += '<div class="sessionTranscodingFramerate">' + session.TranscodingInfo.Framerate + ' fps</div>';
-                } else {
-                    html += '<div class="sessionTranscodingFramerate"></div>';
-                }
-
                 html += '<div class="sessionNowPlayingDetails">';
-                var nowPlayingName = DashboardPage.getNowPlayingName(session);
+                const nowPlayingName = DashboardPage.getNowPlayingName(session);
                 html += '<div class="sessionNowPlayingInfo" data-imgsrc="' + nowPlayingName.image + '">';
                 html += nowPlayingName.html;
                 html += '</div>';
@@ -267,7 +275,7 @@ define(['datetime', 'events', 'itemHelper', 'serverNotifications', 'dom', 'globa
                 html += '</div>';
 
                 if (nowPlayingItem && nowPlayingItem.RunTimeTicks) {
-                    var percent = 100 * (session.PlayState.PositionTicks || 0) / nowPlayingItem.RunTimeTicks;
+                    const percent = 100 * (session.PlayState.PositionTicks || 0) / nowPlayingItem.RunTimeTicks;
                     html += indicators.getProgressHtml(percent, {
                         containerClass: 'playbackProgress'
                     });
@@ -279,7 +287,7 @@ define(['datetime', 'events', 'itemHelper', 'serverNotifications', 'dom', 'globa
                 }
 
                 if (session.TranscodingInfo && session.TranscodingInfo.CompletionPercentage) {
-                    var percent = session.TranscodingInfo.CompletionPercentage.toFixed(1);
+                    const percent = session.TranscodingInfo.CompletionPercentage.toFixed(1);
                     html += indicators.getProgressHtml(percent, {
                         containerClass: 'transcodingProgress'
                     });
@@ -296,7 +304,7 @@ define(['datetime', 'events', 'itemHelper', 'serverNotifications', 'dom', 'globa
                 html += '<div class="sessionCardFooter cardFooter">';
                 html += '<div class="sessionCardButtons flex align-items-center justify-content-center">';
 
-                var btnCssClass = session.ServerId && session.NowPlayingItem && session.SupportsRemoteControl ? '' : ' hide';
+                let btnCssClass = session.ServerId && session.NowPlayingItem && session.SupportsRemoteControl ? '' : ' hide';
                 const playIcon = session.PlayState.IsPaused ? 'pause' : 'play_arrow';
 
                 html += '<button is="paper-icon-button-light" class="sessionCardButton btnSessionPlayPause paper-icon-button-light ' + btnCssClass + '"><span class="material-icons ' + playIcon + '"></span></button>';
@@ -314,7 +322,7 @@ define(['datetime', 'events', 'itemHelper', 'serverNotifications', 'dom', 'globa
                 html += '</div>';
 
                 html += '<div class="flex align-items-center justify-content-center">';
-                var userImage = DashboardPage.getUserImage(session);
+                const userImage = DashboardPage.getUserImage(session);
                 html += userImage ? '<div class="activitylogUserPhoto" style="background-image:url(\'' + userImage + "');\"></div>" : '<div style="height:1.71em;"></div>';
                 html += '<div class="sessionUserName">';
                 html += DashboardPage.getUsersHtml(session);
@@ -328,7 +336,7 @@ define(['datetime', 'events', 'itemHelper', 'serverNotifications', 'dom', 'globa
         }
 
         parentElement.insertAdjacentHTML('beforeend', html);
-        var deadSessionElem = parentElement.querySelector('.deadSession');
+        const deadSessionElem = parentElement.querySelector('.deadSession');
 
         if (deadSessionElem) {
             deadSessionElem.parentNode.removeChild(deadSessionElem);
@@ -336,7 +344,7 @@ define(['datetime', 'events', 'itemHelper', 'serverNotifications', 'dom', 'globa
     }
 
     function renderRunningTasks(view, tasks) {
-        var html = '';
+        let html = '';
         tasks = tasks.filter(function (task) {
             if ('Idle' != task.State) {
                 return !task.IsHidden;
@@ -351,13 +359,13 @@ define(['datetime', 'events', 'itemHelper', 'serverNotifications', 'dom', 'globa
             view.querySelector('.runningTasksContainer').classList.add('hide');
         }
 
-        for (var i = 0, length = tasks.length; i < length; i++) {
-            var task = tasks[i];
+        for (let i = 0, length = tasks.length; i < length; i++) {
+            const task = tasks[i];
             html += '<p>';
             html += task.Name + '<br/>';
 
             if (task.State === 'Running') {
-                var progress = (task.CurrentProgressPercentage || 0).toFixed(1);
+                const progress = (task.CurrentProgressPercentage || 0).toFixed(1);
                 html += '<progress max="100" value="' + progress + '" title="' + progress + '%">';
                 html += progress + '%';
                 html += '</progress>';
@@ -383,9 +391,9 @@ define(['datetime', 'events', 'itemHelper', 'serverNotifications', 'dom', 'globa
             apiClient.sendMessage('ScheduledTasksInfoStop');
         },
         getSessionNowPlayingStreamInfo: function (session) {
-            var html = '';
-            var showTranscodingInfo = false;
-            var displayPlayMethod = playMethodHelper.getDisplayPlayMethod(session);
+            let html = '';
+            let showTranscodingInfo = false;
+            const displayPlayMethod = playMethodHelper.getDisplayPlayMethod(session);
 
             if (displayPlayMethod === 'DirectStream') {
                 html += globalize.translate('DirectStreaming');
@@ -402,7 +410,7 @@ define(['datetime', 'events', 'itemHelper', 'serverNotifications', 'dom', 'globa
             }
 
             if (showTranscodingInfo) {
-                var line = [];
+                const line = [];
 
                 if (session.TranscodingInfo) {
                     if (session.TranscodingInfo.Bitrate) {
@@ -434,8 +442,8 @@ define(['datetime', 'events', 'itemHelper', 'serverNotifications', 'dom', 'globa
             return html;
         },
         getSessionNowPlayingTime: function (session) {
-            var nowPlayingItem = session.NowPlayingItem;
-            var html = '';
+            const nowPlayingItem = session.NowPlayingItem;
+            let html = '';
 
             if (nowPlayingItem) {
                 if (session.PlayState.PositionTicks) {
@@ -459,8 +467,8 @@ define(['datetime', 'events', 'itemHelper', 'serverNotifications', 'dom', 'globa
             return session.Client + ' ' + session.ApplicationVersion;
         },
         getNowPlayingName: function (session) {
-            var imgUrl = '';
-            var nowPlayingItem = session.NowPlayingItem;
+            let imgUrl = '';
+            const nowPlayingItem = session.NowPlayingItem;
             // FIXME: It seems that, sometimes, server sends date in the future, so date-fns displays messages like 'in less than a minute'. We should fix
             // how dates are returned by the server when the session is active and show something like 'Active now', instead of past/future sentences
             if (!nowPlayingItem) {
@@ -470,8 +478,8 @@ define(['datetime', 'events', 'itemHelper', 'serverNotifications', 'dom', 'globa
                 };
             }
 
-            var topText = itemHelper.getDisplayName(nowPlayingItem);
-            var bottomText = '';
+            let topText = itemHelper.getDisplayName(nowPlayingItem);
+            let bottomText = '';
 
             if (nowPlayingItem.Artists && nowPlayingItem.Artists.length) {
                 bottomText = topText;
@@ -511,13 +519,13 @@ define(['datetime', 'events', 'itemHelper', 'serverNotifications', 'dom', 'globa
             };
         },
         getUsersHtml: function (session) {
-            var html = [];
+            const html = [];
 
             if (session.UserId) {
                 html.push(session.UserName);
             }
 
-            for (var i = 0, length = session.AdditionalUsers.length; i < length; i++) {
+            for (let i = 0, length = session.AdditionalUsers.length; i < length; i++) {
                 html.push(session.AdditionalUsers[i].UserName);
             }
 
@@ -535,7 +543,7 @@ define(['datetime', 'events', 'itemHelper', 'serverNotifications', 'dom', 'globa
         },
         updateSession: function (row, session) {
             row.classList.remove('deadSession');
-            var nowPlayingItem = session.NowPlayingItem;
+            const nowPlayingItem = session.NowPlayingItem;
 
             if (nowPlayingItem) {
                 row.classList.add('playingSession');
@@ -555,7 +563,7 @@ define(['datetime', 'events', 'itemHelper', 'serverNotifications', 'dom', 'globa
                 row.querySelector('.btnSessionInfo').classList.add('hide');
             }
 
-            var btnSessionPlayPause = row.querySelector('.btnSessionPlayPause');
+            const btnSessionPlayPause = row.querySelector('.btnSessionPlayPause');
 
             if (session.ServerId && nowPlayingItem && session.SupportsRemoteControl && session.DeviceId !== connectionManager.deviceId()) {
                 btnSessionPlayPause.classList.remove('hide');
@@ -573,19 +581,18 @@ define(['datetime', 'events', 'itemHelper', 'serverNotifications', 'dom', 'globa
             row.querySelector('.sessionNowPlayingTime').innerHTML = DashboardPage.getSessionNowPlayingTime(session);
             row.querySelector('.sessionUserName').innerHTML = DashboardPage.getUsersHtml(session);
             row.querySelector('.sessionAppSecondaryText').innerHTML = DashboardPage.getAppSecondaryText(session);
-            row.querySelector('.sessionTranscodingFramerate').innerHTML = session.TranscodingInfo && session.TranscodingInfo.Framerate ? session.TranscodingInfo.Framerate + ' fps' : '';
-            var nowPlayingName = DashboardPage.getNowPlayingName(session);
-            var nowPlayingInfoElem = row.querySelector('.sessionNowPlayingInfo');
+            const nowPlayingName = DashboardPage.getNowPlayingName(session);
+            const nowPlayingInfoElem = row.querySelector('.sessionNowPlayingInfo');
 
             if (!(nowPlayingName.image && nowPlayingName.image == nowPlayingInfoElem.getAttribute('data-imgsrc'))) {
                 nowPlayingInfoElem.innerHTML = nowPlayingName.html;
                 nowPlayingInfoElem.setAttribute('data-imgsrc', nowPlayingName.image || '');
             }
 
-            var playbackProgressElem = row.querySelector('.playbackProgress');
+            const playbackProgressElem = row.querySelector('.playbackProgress');
 
             if (nowPlayingItem && nowPlayingItem.RunTimeTicks) {
-                var percent = 100 * (session.PlayState.PositionTicks || 0) / nowPlayingItem.RunTimeTicks;
+                const percent = 100 * (session.PlayState.PositionTicks || 0) / nowPlayingItem.RunTimeTicks;
                 playbackProgressElem.outerHTML = indicators.getProgressHtml(percent, {
                     containerClass: 'playbackProgress'
                 });
@@ -595,10 +602,10 @@ define(['datetime', 'events', 'itemHelper', 'serverNotifications', 'dom', 'globa
                 });
             }
 
-            var transcodingProgress = row.querySelector('.transcodingProgress');
+            const transcodingProgress = row.querySelector('.transcodingProgress');
 
             if (session.TranscodingInfo && session.TranscodingInfo.CompletionPercentage) {
-                var percent = session.TranscodingInfo.CompletionPercentage.toFixed(1);
+                const percent = session.TranscodingInfo.CompletionPercentage.toFixed(1);
                 transcodingProgress.outerHTML = indicators.getProgressHtml(percent, {
                     containerClass: 'transcodingProgress'
                 });
@@ -608,8 +615,8 @@ define(['datetime', 'events', 'itemHelper', 'serverNotifications', 'dom', 'globa
                 });
             }
 
-            var imgUrl = DashboardPage.getNowPlayingImageUrl(nowPlayingItem) || '';
-            var imgElem = row.querySelector('.sessionNowPlayingContent');
+            const imgUrl = DashboardPage.getNowPlayingImageUrl(nowPlayingItem) || '';
+            const imgElem = row.querySelector('.sessionNowPlayingContent');
 
             if (imgUrl != imgElem.getAttribute('data-src')) {
                 imgElem.style.backgroundImage = imgUrl ? "url('" + imgUrl + "')" : '';
@@ -623,7 +630,7 @@ define(['datetime', 'events', 'itemHelper', 'serverNotifications', 'dom', 'globa
             }
         },
         getClientImage: function (connection) {
-            var iconUrl = imageHelper.getDeviceIcon(connection);
+            const iconUrl = imageHelper.getDeviceIcon(connection);
             return "<img src='" + iconUrl + "' />";
         },
         getNowPlayingImageUrl: function (item) {
@@ -653,7 +660,7 @@ define(['datetime', 'events', 'itemHelper', 'serverNotifications', 'dom', 'globa
                 });
             }
 
-            var imageTags = (item || {}).ImageTags || {};
+            const imageTags = (item || {}).ImageTags || {};
 
             if (item && imageTags.Thumb) {
                 return ApiClient.getScaledImageUrl(item.Id, {
@@ -707,20 +714,20 @@ define(['datetime', 'events', 'itemHelper', 'serverNotifications', 'dom', 'globa
         },
         systemUpdateTaskKey: 'SystemUpdateTask',
         stopTask: function (btn, id) {
-            var page = dom.parentWithClass(btn, 'page');
+            const page = dom.parentWithClass(btn, 'page');
             ApiClient.stopScheduledTask(id).then(function () {
                 pollForInfo(page, ApiClient);
             });
         },
         restart: function (btn) {
-            require(['confirm'], function (confirm) {
+            import('confirm').then(({default: confirm}) => {
                 confirm({
                     title: globalize.translate('HeaderRestart'),
                     text: globalize.translate('MessageConfirmRestart'),
                     confirmText: globalize.translate('ButtonRestart'),
                     primary: 'delete'
                 }).then(function () {
-                    var page = dom.parentWithClass(btn, 'page');
+                    const page = dom.parentWithClass(btn, 'page');
                     page.querySelector('#btnRestartServer').disabled = true;
                     page.querySelector('#btnShutdown').disabled = true;
                     ApiClient.restartServer();
@@ -728,14 +735,14 @@ define(['datetime', 'events', 'itemHelper', 'serverNotifications', 'dom', 'globa
             });
         },
         shutdown: function (btn) {
-            require(['confirm'], function (confirm) {
+            import('confirm').then(({default: confirm}) => {
                 confirm({
                     title: globalize.translate('HeaderShutdown'),
                     text: globalize.translate('MessageConfirmShutdown'),
                     confirmText: globalize.translate('ButtonShutdown'),
                     primary: 'delete'
                 }).then(function () {
-                    var page = dom.parentWithClass(btn, 'page');
+                    const page = dom.parentWithClass(btn, 'page');
                     page.querySelector('#btnRestartServer').disabled = true;
                     page.querySelector('#btnShutdown').disabled = true;
                     ApiClient.shutdownServer();
@@ -743,7 +750,7 @@ define(['datetime', 'events', 'itemHelper', 'serverNotifications', 'dom', 'globa
             });
         }
     };
-    return function (view, params) {
+    export default function (view, params) {
         function onRestartRequired(evt, apiClient) {
             console.debug('onRestartRequired not implemented', evt, apiClient);
         }
@@ -782,11 +789,11 @@ define(['datetime', 'events', 'itemHelper', 'serverNotifications', 'dom', 'globa
             }
         }
 
-        var serverId = ApiClient.serverId();
+        const serverId = ApiClient.serverId();
         view.querySelector('.activeDevices').addEventListener('click', onActiveDevicesClick);
         view.addEventListener('viewshow', function () {
-            var page = this;
-            var apiClient = ApiClient;
+            const page = this;
+            const apiClient = ApiClient;
 
             if (apiClient) {
                 loading.show();
@@ -823,7 +830,7 @@ define(['datetime', 'events', 'itemHelper', 'serverNotifications', 'dom', 'globa
             }
         });
         view.addEventListener('viewbeforehide', function () {
-            var apiClient = ApiClient;
+            const apiClient = ApiClient;
             events.off(serverNotifications, 'RestartRequired', onRestartRequired);
             events.off(serverNotifications, 'ServerShuttingDown', onServerShuttingDown);
             events.off(serverNotifications, 'ServerRestarting', onServerRestarting);
@@ -837,18 +844,19 @@ define(['datetime', 'events', 'itemHelper', 'serverNotifications', 'dom', 'globa
             }
         });
         view.addEventListener('viewdestroy', function () {
-            var page = this;
-            var userActivityLog = page.userActivityLog;
+            const page = this;
+            const userActivityLog = page.userActivityLog;
 
             if (userActivityLog) {
                 userActivityLog.destroy();
             }
 
-            var serverActivityLog = page.serverActivityLog;
+            const serverActivityLog = page.serverActivityLog;
 
             if (serverActivityLog) {
                 serverActivityLog.destroy();
             }
         });
-    };
-});
+    }
+
+/* eslint-enable indent */
diff --git a/src/controllers/dashboard/devices/device.js b/src/controllers/dashboard/devices/device.js
index 9ff3f5902e..7faaee2494 100644
--- a/src/controllers/dashboard/devices/device.js
+++ b/src/controllers/dashboard/devices/device.js
@@ -1,5 +1,10 @@
-define(['loading', 'libraryMenu', 'dom', 'emby-input', 'emby-button'], function (loading, libraryMenu, dom) {
-    'use strict';
+import loading from 'loading';
+import libraryMenu from 'libraryMenu';
+import dom from 'dom';
+import 'emby-input';
+import 'emby-button';
+
+/* eslint-disable indent */
 
     function load(page, device, deviceOptions) {
         page.querySelector('#txtCustomName', page).value = deviceOptions.CustomName || '';
@@ -7,13 +12,13 @@ define(['loading', 'libraryMenu', 'dom', 'emby-input', 'emby-button'], function
     }
 
     function loadData() {
-        var page = this;
+        const page = this;
         loading.show();
-        var id = getParameterByName('id');
-        var promise1 = ApiClient.getJSON(ApiClient.getUrl('Devices/Info', {
+        const id = getParameterByName('id');
+        const promise1 = ApiClient.getJSON(ApiClient.getUrl('Devices/Info', {
             Id: id
         }));
-        var promise2 = ApiClient.getJSON(ApiClient.getUrl('Devices/Options', {
+        const promise2 = ApiClient.getJSON(ApiClient.getUrl('Devices/Options', {
             Id: id
         }));
         Promise.all([promise1, promise2]).then(function (responses) {
@@ -23,7 +28,7 @@ define(['loading', 'libraryMenu', 'dom', 'emby-input', 'emby-button'], function
     }
 
     function save(page) {
-        var id = getParameterByName('id');
+        const id = getParameterByName('id');
         ApiClient.ajax({
             url: ApiClient.getUrl('Devices/Options', {
                 Id: id
@@ -37,14 +42,15 @@ define(['loading', 'libraryMenu', 'dom', 'emby-input', 'emby-button'], function
     }
 
     function onSubmit(e) {
-        var form = this;
+        const form = this;
         save(dom.parentWithClass(form, 'page'));
         e.preventDefault();
         return false;
     }
 
-    return function (view, params) {
+    export default function (view, params) {
         view.querySelector('form').addEventListener('submit', onSubmit);
         view.addEventListener('viewshow', loadData);
-    };
-});
+    }
+
+/* eslint-enable indent */
diff --git a/src/controllers/dashboard/devices/devices.js b/src/controllers/dashboard/devices/devices.js
index 0dea81c756..9f05d84713 100644
--- a/src/controllers/dashboard/devices/devices.js
+++ b/src/controllers/dashboard/devices/devices.js
@@ -1,14 +1,24 @@
-define(['loading', 'dom', 'libraryMenu', 'globalize', 'scripts/imagehelper', 'date-fns', 'dfnshelper', 'emby-button', 'emby-itemscontainer', 'cardStyle'], function (loading, dom, libraryMenu, globalize, imageHelper, datefns, dfnshelper) {
-    'use strict';
+import loading from 'loading';
+import dom from 'dom';
+import libraryMenu from 'libraryMenu';
+import globalize from 'globalize';
+import imageHelper from 'scripts/imagehelper';
+import * as datefns from 'date-fns';
+import dfnshelper from 'dfnshelper';
+import 'emby-button';
+import 'emby-itemscontainer';
+import 'cardStyle';
+
+/* eslint-disable indent */
 
     function canDelete(deviceId) {
         return deviceId !== ApiClient.deviceId();
     }
 
     function deleteDevice(page, id) {
-        var msg = globalize.translate('DeleteDeviceConfirmation');
+        const msg = globalize.translate('DeleteDeviceConfirmation');
 
-        require(['confirm'], function (confirm) {
+        import('confirm').then(({default: confirm}) => {
             confirm({
                 text: msg,
                 title: globalize.translate('HeaderDeleteDevice'),
@@ -29,7 +39,7 @@ define(['loading', 'dom', 'libraryMenu', 'globalize', 'scripts/imagehelper', 'da
     }
 
     function showDeviceMenu(view, btn, deviceId) {
-        var menuItems = [];
+        let menuItems = [];
 
         if (canEdit) {
             menuItems.push({
@@ -47,7 +57,7 @@ define(['loading', 'dom', 'libraryMenu', 'globalize', 'scripts/imagehelper', 'da
             });
         }
 
-        require(['actionsheet'], function (actionsheet) {
+        import('actionsheet').then(({default: actionsheet}) => {
             actionsheet.show({
                 items: menuItems,
                 positionTo: btn,
@@ -66,15 +76,15 @@ define(['loading', 'dom', 'libraryMenu', 'globalize', 'scripts/imagehelper', 'da
     }
 
     function load(page, devices) {
-        var html = '';
+        let html = '';
         html += devices.map(function (device) {
-            var deviceHtml = '';
+            let deviceHtml = '';
             deviceHtml += "<div data-id='" + device.Id + "' class='card backdropCard'>";
             deviceHtml += '<div class="cardBox visualCardBox">';
             deviceHtml += '<div class="cardScalable">';
             deviceHtml += '<div class="cardPadder cardPadder-backdrop"></div>';
             deviceHtml += '<a is="emby-linkbutton" href="' + (canEdit ? 'device.html?id=' + device.Id : '#') + '" class="cardContent cardImageContainer">';
-            var iconUrl = imageHelper.getDeviceIcon(device);
+            const iconUrl = imageHelper.getDeviceIcon(device);
 
             if (iconUrl) {
                 deviceHtml += '<div class="cardImage" style="background-image:url(\'' + iconUrl + "');background-size: auto 64%;background-position:center center;\">";
@@ -124,10 +134,10 @@ define(['loading', 'dom', 'libraryMenu', 'globalize', 'scripts/imagehelper', 'da
         });
     }
 
-    var canEdit = ApiClient.isMinServerVersion('3.4.1.31');
-    return function (view, params) {
+    const canEdit = ApiClient.isMinServerVersion('3.4.1.31');
+    export default function (view, params) {
         view.querySelector('.devicesList').addEventListener('click', function (e) {
-            var btnDeviceMenu = dom.parentWithClass(e.target, 'btnDeviceMenu');
+            const btnDeviceMenu = dom.parentWithClass(e.target, 'btnDeviceMenu');
 
             if (btnDeviceMenu) {
                 showDeviceMenu(view, btnDeviceMenu, btnDeviceMenu.getAttribute('data-id'));
@@ -136,5 +146,6 @@ define(['loading', 'dom', 'libraryMenu', 'globalize', 'scripts/imagehelper', 'da
         view.addEventListener('viewshow', function () {
             loadData(this);
         });
-    };
-});
+    }
+
+/* eslint-enable indent */
diff --git a/src/controllers/dashboard/dlna/profile.js b/src/controllers/dashboard/dlna/profile.js
index 3fe238c8ad..69098ac506 100644
--- a/src/controllers/dashboard/dlna/profile.js
+++ b/src/controllers/dashboard/dlna/profile.js
@@ -1,10 +1,18 @@
-define(['jQuery', 'loading', 'globalize', 'fnchecked', 'emby-select', 'emby-button', 'emby-input', 'emby-checkbox', 'listViewStyle', 'emby-button'], function ($, loading, globalize) {
-    'use strict';
+import $ from 'jQuery';
+import loading from 'loading';
+import globalize from 'globalize';
+import 'emby-select';
+import 'emby-button';
+import 'emby-input';
+import 'emby-checkbox';
+import 'listViewStyle';
+
+/* eslint-disable indent */
 
     function loadProfile(page) {
         loading.show();
-        var promise1 = getProfile();
-        var promise2 = ApiClient.getUsers();
+        const promise1 = getProfile();
+        const promise2 = ApiClient.getUsers();
         Promise.all([promise1, promise2]).then(function (responses) {
             currentProfile = responses[0];
             renderProfile(page, currentProfile, responses[1]);
@@ -13,8 +21,8 @@ define(['jQuery', 'loading', 'globalize', 'fnchecked', 'emby-select', 'emby-butt
     }
 
     function getProfile() {
-        var id = getParameterByName('id');
-        var url = id ? 'Dlna/Profiles/' + id : 'Dlna/Profiles/Default';
+        const id = getParameterByName('id');
+        const url = id ? 'Dlna/Profiles/' + id : 'Dlna/Profiles/Default';
         return ApiClient.getJSON(ApiClient.getUrl(url));
     }
 
@@ -23,10 +31,10 @@ define(['jQuery', 'loading', 'globalize', 'fnchecked', 'emby-select', 'emby-butt
         $('.chkMediaType', page).each(function () {
             this.checked = -1 != (profile.SupportedMediaTypes || '').split(',').indexOf(this.getAttribute('data-value'));
         });
-        $('#chkEnableAlbumArtInDidl', page).checked(profile.EnableAlbumArtInDidl);
-        $('#chkEnableSingleImageLimit', page).checked(profile.EnableSingleAlbumArtLimit);
+        $('#chkEnableAlbumArtInDidl', page).prop('checked', profile.EnableAlbumArtInDidl);
+        $('#chkEnableSingleImageLimit', page).prop('checked', profile.EnableSingleAlbumArtLimit);
         renderXmlDocumentAttributes(page, profile.XmlRootAttributes || []);
-        var idInfo = profile.Identification || {};
+        const idInfo = profile.Identification || {};
         renderIdentificationHeaders(page, idInfo.Headers || []);
         renderSubtitleProfiles(page, profile.SubtitleProfiles || []);
         $('#txtInfoFriendlyName', page).val(profile.FriendlyName || '');
@@ -51,11 +59,11 @@ define(['jQuery', 'loading', 'globalize', 'fnchecked', 'emby-select', 'emby-butt
         $('#txtAlbumArtMaxHeight', page).val(profile.MaxAlbumArtHeight || '');
         $('#txtIconMaxWidth', page).val(profile.MaxIconWidth || '');
         $('#txtIconMaxHeight', page).val(profile.MaxIconHeight || '');
-        $('#chkIgnoreTranscodeByteRangeRequests', page).checked(profile.IgnoreTranscodeByteRangeRequests);
+        $('#chkIgnoreTranscodeByteRangeRequests', page).prop('checked', profile.IgnoreTranscodeByteRangeRequests);
         $('#txtMaxAllowedBitrate', page).val(profile.MaxStreamingBitrate || '');
         $('#txtMusicStreamingTranscodingBitrate', page).val(profile.MusicStreamingTranscodingBitrate || '');
-        $('#chkRequiresPlainFolders', page).checked(profile.RequiresPlainFolders);
-        $('#chkRequiresPlainVideoItems', page).checked(profile.RequiresPlainVideoItems);
+        $('#chkRequiresPlainFolders', page).prop('checked', profile.RequiresPlainFolders);
+        $('#chkRequiresPlainVideoItems', page).prop('checked', profile.RequiresPlainVideoItems);
         $('#txtProtocolInfo', page).val(profile.ProtocolInfo || '');
         $('#txtXDlnaCap', page).val(profile.XDlnaCap || '');
         $('#txtXDlnaDoc', page).val(profile.XDlnaDoc || '');
@@ -65,7 +73,7 @@ define(['jQuery', 'loading', 'globalize', 'fnchecked', 'emby-select', 'emby-butt
         profile.ContainerProfiles = profile.ContainerProfiles || [];
         profile.CodecProfiles = profile.CodecProfiles || [];
         profile.ResponseProfiles = profile.ResponseProfiles || [];
-        var usersHtml = '<option></option>' + users.map(function (u) {
+        const usersHtml = '<option></option>' + users.map(function (u) {
             return '<option value="' + u.Id + '">' + u.Name + '</option>';
         }).join('');
         $('#selectUser', page).html(usersHtml).val(profile.UserId || '');
@@ -73,9 +81,9 @@ define(['jQuery', 'loading', 'globalize', 'fnchecked', 'emby-select', 'emby-butt
     }
 
     function renderIdentificationHeaders(page, headers) {
-        var index = 0;
-        var html = '<div class="paperList">' + headers.map(function (h) {
-            var li = '<div class="listItem">';
+        let index = 0;
+        const html = '<div class="paperList">' + headers.map(function (h) {
+            let li = '<div class="listItem">';
             li += '<span class="material-icons listItemIcon info"></span>';
             li += '<div class="listItemBody">';
             li += '<h3 class="listItemBodyText">' + h.Name + ': ' + (h.Value || '') + '</h3>';
@@ -86,9 +94,9 @@ define(['jQuery', 'loading', 'globalize', 'fnchecked', 'emby-select', 'emby-butt
             index++;
             return li;
         }).join('') + '</div>';
-        var elem = $('.httpHeaderIdentificationList', page).html(html).trigger('create');
+        const elem = $('.httpHeaderIdentificationList', page).html(html).trigger('create');
         $('.btnDeleteIdentificationHeader', elem).on('click', function () {
-            var itemIndex = parseInt(this.getAttribute('data-index'));
+            const itemIndex = parseInt(this.getAttribute('data-index'));
             currentProfile.Identification.Headers.splice(itemIndex, 1);
             renderIdentificationHeaders(page, currentProfile.Identification.Headers);
         });
@@ -106,7 +114,7 @@ define(['jQuery', 'loading', 'globalize', 'fnchecked', 'emby-select', 'emby-butt
         isSubProfileNew = null == header;
         header = header || {};
         currentSubProfile = header;
-        var popup = $('#identificationHeaderPopup', page);
+        const popup = $('#identificationHeaderPopup', page);
         $('#txtIdentificationHeaderName', popup).val(header.Name || '');
         $('#txtIdentificationHeaderValue', popup).val(header.Value || '');
         $('#selectMatchType', popup).val(header.Match || 'Equals');
@@ -130,8 +138,8 @@ define(['jQuery', 'loading', 'globalize', 'fnchecked', 'emby-select', 'emby-butt
     }
 
     function renderXmlDocumentAttributes(page, attribute) {
-        var html = '<div class="paperList">' + attribute.map(function (h) {
-            var li = '<div class="listItem">';
+        const html = '<div class="paperList">' + attribute.map(function (h) {
+            let li = '<div class="listItem">';
             li += '<span class="material-icons listItemIcon info"></span>';
             li += '<div class="listItemBody">';
             li += '<h3 class="listItemBodyText">' + h.Name + ' = ' + (h.Value || '') + '</h3>';
@@ -139,9 +147,9 @@ define(['jQuery', 'loading', 'globalize', 'fnchecked', 'emby-select', 'emby-butt
             li += '<button type="button" is="paper-icon-button-light" class="btnDeleteXmlAttribute listItemButton" data-index="0"><span class="material-icons delete"></span></button>';
             return li += '</div>';
         }).join('') + '</div>';
-        var elem = $('.xmlDocumentAttributeList', page).html(html).trigger('create');
+        const elem = $('.xmlDocumentAttributeList', page).html(html).trigger('create');
         $('.btnDeleteXmlAttribute', elem).on('click', function () {
-            var itemIndex = parseInt(this.getAttribute('data-index'));
+            const itemIndex = parseInt(this.getAttribute('data-index'));
             currentProfile.XmlRootAttributes.splice(itemIndex, 1);
             renderXmlDocumentAttributes(page, currentProfile.XmlRootAttributes);
         });
@@ -151,7 +159,7 @@ define(['jQuery', 'loading', 'globalize', 'fnchecked', 'emby-select', 'emby-butt
         isSubProfileNew = null == attribute;
         attribute = attribute || {};
         currentSubProfile = attribute;
-        var popup = $('#xmlAttributePopup', page);
+        const popup = $('#xmlAttributePopup', page);
         $('#txtXmlAttributeName', popup).val(attribute.Name || '');
         $('#txtXmlAttributeValue', popup).val(attribute.Value || '');
         openPopup(popup[0]);
@@ -171,9 +179,9 @@ define(['jQuery', 'loading', 'globalize', 'fnchecked', 'emby-select', 'emby-butt
     }
 
     function renderSubtitleProfiles(page, profiles) {
-        var index = 0;
-        var html = '<div class="paperList">' + profiles.map(function (h) {
-            var li = '<div class="listItem lnkEditSubProfile" data-index="' + index + '">';
+        let index = 0;
+        const html = '<div class="paperList">' + profiles.map(function (h) {
+            let li = '<div class="listItem lnkEditSubProfile" data-index="' + index + '">';
             li += '<span class="material-icons listItemIcon info"></span>';
             li += '<div class="listItemBody">';
             li += '<h3 class="listItemBodyText">' + (h.Format || '') + '</h3>';
@@ -183,14 +191,14 @@ define(['jQuery', 'loading', 'globalize', 'fnchecked', 'emby-select', 'emby-butt
             index++;
             return li;
         }).join('') + '</div>';
-        var elem = $('.subtitleProfileList', page).html(html).trigger('create');
+        const elem = $('.subtitleProfileList', page).html(html).trigger('create');
         $('.btnDeleteProfile', elem).on('click', function () {
-            var itemIndex = parseInt(this.getAttribute('data-index'));
+            const itemIndex = parseInt(this.getAttribute('data-index'));
             currentProfile.SubtitleProfiles.splice(itemIndex, 1);
             renderSubtitleProfiles(page, currentProfile.SubtitleProfiles);
         });
         $('.lnkEditSubProfile', elem).on('click', function () {
-            var itemIndex = parseInt(this.getAttribute('data-index'));
+            const itemIndex = parseInt(this.getAttribute('data-index'));
             editSubtitleProfile(page, currentProfile.SubtitleProfiles[itemIndex]);
         });
     }
@@ -199,7 +207,7 @@ define(['jQuery', 'loading', 'globalize', 'fnchecked', 'emby-select', 'emby-butt
         isSubProfileNew = null == profile;
         profile = profile || {};
         currentSubProfile = profile;
-        var popup = $('#subtitleProfilePopup', page);
+        const popup = $('#subtitleProfilePopup', page);
         $('#txtSubtitleProfileFormat', popup).val(profile.Format || '');
         $('#selectSubtitleProfileMethod', popup).val(profile.Method || '');
         $('#selectSubtitleProfileDidlMode', popup).val(profile.DidlMode || '');
@@ -244,12 +252,11 @@ define(['jQuery', 'loading', 'globalize', 'fnchecked', 'emby-select', 'emby-butt
     }
 
     function renderDirectPlayProfiles(page, profiles) {
-        var html = '';
+        let html = '';
         html += '<ul data-role="listview" data-inset="true" data-split-icon="delete">';
-        var currentType;
+        let currentType;
 
-        for (var i = 0, length = profiles.length; i < length; i++) {
-            var profile = profiles[i];
+        for (const [index, profile] of profiles.entries()) {
 
             if (profile.Type !== currentType) {
                 html += '<li data-role="list-divider">' + profile.Type + '</li>';
@@ -257,7 +264,7 @@ define(['jQuery', 'loading', 'globalize', 'fnchecked', 'emby-select', 'emby-butt
             }
 
             html += '<div>';
-            html += '<a is="emby-linkbutton" href="#" class="lnkEditSubProfile" data-profileindex="' + i + '">';
+            html += '<a is="emby-linkbutton" href="#" class="lnkEditSubProfile" data-profileindex="' + index + '">';
             html += '<p>' + globalize.translate('ValueContainer', profile.Container || allText) + '</p>';
 
             if ('Video' == profile.Type) {
@@ -270,18 +277,18 @@ define(['jQuery', 'loading', 'globalize', 'fnchecked', 'emby-select', 'emby-butt
             }
 
             html += '</a>';
-            html += '<button type="button" is="paper-icon-button-light" class="btnDeleteProfile listItemButton" data-profileindex="' + i + '"><span class="material-icons delete"></span></button>';
+            html += '<button type="button" is="paper-icon-button-light" class="btnDeleteProfile listItemButton" data-profileindex="' + index + '"><span class="material-icons delete"></span></button>';
             html += '</div>';
         }
 
         html += '</ul>';
-        var elem = $('.directPlayProfiles', page).html(html).trigger('create');
+        const elem = $('.directPlayProfiles', page).html(html).trigger('create');
         $('.btnDeleteProfile', elem).on('click', function () {
-            var index = this.getAttribute('data-profileindex');
+            const index = this.getAttribute('data-profileindex');
             deleteDirectPlayProfile(page, index);
         });
         $('.lnkEditSubProfile', elem).on('click', function () {
-            var index = parseInt(this.getAttribute('data-profileindex'));
+            const index = parseInt(this.getAttribute('data-profileindex'));
             editDirectPlayProfile(page, currentProfile.DirectPlayProfiles[index]);
         });
     }
@@ -295,7 +302,7 @@ define(['jQuery', 'loading', 'globalize', 'fnchecked', 'emby-select', 'emby-butt
         isSubProfileNew = null == directPlayProfile;
         directPlayProfile = directPlayProfile || {};
         currentSubProfile = directPlayProfile;
-        var popup = $('#popupEditDirectPlayProfile', page);
+        const popup = $('#popupEditDirectPlayProfile', page);
         $('#selectDirectPlayProfileType', popup).val(directPlayProfile.Type || 'Video').trigger('change');
         $('#txtDirectPlayContainer', popup).val(directPlayProfile.Container || '');
         $('#txtDirectPlayAudioCodec', popup).val(directPlayProfile.AudioCodec || '');
@@ -304,12 +311,12 @@ define(['jQuery', 'loading', 'globalize', 'fnchecked', 'emby-select', 'emby-butt
     }
 
     function renderTranscodingProfiles(page, profiles) {
-        var html = '';
+        let html = '';
         html += '<ul data-role="listview" data-inset="true" data-split-icon="delete">';
-        var currentType;
+        let currentType;
 
-        for (var i = 0, length = profiles.length; i < length; i++) {
-            var profile = profiles[i];
+        for (let i = 0, length = profiles.length; i < length; i++) {
+            let profile = profiles[i];
 
             if (profile.Type !== currentType) {
                 html += '<li data-role="list-divider">' + profile.Type + '</li>';
@@ -336,13 +343,13 @@ define(['jQuery', 'loading', 'globalize', 'fnchecked', 'emby-select', 'emby-butt
         }
 
         html += '</ul>';
-        var elem = $('.transcodingProfiles', page).html(html).trigger('create');
+        const elem = $('.transcodingProfiles', page).html(html).trigger('create');
         $('.btnDeleteProfile', elem).on('click', function () {
-            var index = this.getAttribute('data-profileindex');
+            const index = this.getAttribute('data-profileindex');
             deleteTranscodingProfile(page, index);
         });
         $('.lnkEditSubProfile', elem).on('click', function () {
-            var index = parseInt(this.getAttribute('data-profileindex'));
+            const index = parseInt(this.getAttribute('data-profileindex'));
             editTranscodingProfile(page, currentProfile.TranscodingProfiles[index]);
         });
     }
@@ -351,15 +358,15 @@ define(['jQuery', 'loading', 'globalize', 'fnchecked', 'emby-select', 'emby-butt
         isSubProfileNew = null == transcodingProfile;
         transcodingProfile = transcodingProfile || {};
         currentSubProfile = transcodingProfile;
-        var popup = $('#transcodingProfilePopup', page);
+        const popup = $('#transcodingProfilePopup', page);
         $('#selectTranscodingProfileType', popup).val(transcodingProfile.Type || 'Video').trigger('change');
         $('#txtTranscodingContainer', popup).val(transcodingProfile.Container || '');
         $('#txtTranscodingAudioCodec', popup).val(transcodingProfile.AudioCodec || '');
         $('#txtTranscodingVideoCodec', popup).val(transcodingProfile.VideoCodec || '');
         $('#selectTranscodingProtocol', popup).val(transcodingProfile.Protocol || 'Http');
-        $('#chkEnableMpegtsM2TsMode', popup).checked(transcodingProfile.EnableMpegtsM2TsMode || false);
-        $('#chkEstimateContentLength', popup).checked(transcodingProfile.EstimateContentLength || false);
-        $('#chkReportByteRangeRequests', popup).checked('Bytes' == transcodingProfile.TranscodeSeekInfo);
+        $('#chkEnableMpegtsM2TsMode', popup).prop('checked', transcodingProfile.EnableMpegtsM2TsMode || false);
+        $('#chkEstimateContentLength', popup).prop('checked', transcodingProfile.EstimateContentLength || false);
+        $('#chkReportByteRangeRequests', popup).prop('checked', 'Bytes' == transcodingProfile.TranscodeSeekInfo);
         $('.radioTabButton:first', popup).trigger('click');
         openPopup(popup[0]);
     }
@@ -376,9 +383,9 @@ define(['jQuery', 'loading', 'globalize', 'fnchecked', 'emby-select', 'emby-butt
         currentSubProfile.VideoCodec = $('#txtTranscodingVideoCodec', page).val();
         currentSubProfile.Protocol = $('#selectTranscodingProtocol', page).val();
         currentSubProfile.Context = 'Streaming';
-        currentSubProfile.EnableMpegtsM2TsMode = $('#chkEnableMpegtsM2TsMode', page).checked();
-        currentSubProfile.EstimateContentLength = $('#chkEstimateContentLength', page).checked();
-        currentSubProfile.TranscodeSeekInfo = $('#chkReportByteRangeRequests', page).checked() ? 'Bytes' : 'Auto';
+        currentSubProfile.EnableMpegtsM2TsMode = $('#chkEnableMpegtsM2TsMode', page).is(':checked');
+        currentSubProfile.EstimateContentLength = $('#chkEstimateContentLength', page).is(':checked');
+        currentSubProfile.TranscodeSeekInfo = $('#chkReportByteRangeRequests', page).is(':checked') ? 'Bytes' : 'Auto';
 
         if (isSubProfileNew) {
             currentProfile.TranscodingProfiles.push(currentSubProfile);
@@ -390,12 +397,12 @@ define(['jQuery', 'loading', 'globalize', 'fnchecked', 'emby-select', 'emby-butt
     }
 
     function renderContainerProfiles(page, profiles) {
-        var html = '';
+        let html = '';
         html += '<ul data-role="listview" data-inset="true" data-split-icon="delete">';
-        var currentType;
+        let currentType;
 
-        for (var i = 0, length = profiles.length; i < length; i++) {
-            var profile = profiles[i];
+        for (let i = 0, length = profiles.length; i < length; i++) {
+            let profile = profiles[i];
 
             if (profile.Type !== currentType) {
                 html += '<li data-role="list-divider">' + profile.Type + '</li>';
@@ -420,13 +427,13 @@ define(['jQuery', 'loading', 'globalize', 'fnchecked', 'emby-select', 'emby-butt
         }
 
         html += '</ul>';
-        var elem = $('.containerProfiles', page).html(html).trigger('create');
+        const elem = $('.containerProfiles', page).html(html).trigger('create');
         $('.btnDeleteProfile', elem).on('click', function () {
-            var index = this.getAttribute('data-profileindex');
+            const index = this.getAttribute('data-profileindex');
             deleteContainerProfile(page, index);
         });
         $('.lnkEditSubProfile', elem).on('click', function () {
-            var index = parseInt(this.getAttribute('data-profileindex'));
+            const index = parseInt(this.getAttribute('data-profileindex'));
             editContainerProfile(page, currentProfile.ContainerProfiles[index]);
         });
     }
@@ -440,7 +447,7 @@ define(['jQuery', 'loading', 'globalize', 'fnchecked', 'emby-select', 'emby-butt
         isSubProfileNew = null == containerProfile;
         containerProfile = containerProfile || {};
         currentSubProfile = containerProfile;
-        var popup = $('#containerProfilePopup', page);
+        const popup = $('#containerProfilePopup', page);
         $('#selectContainerProfileType', popup).val(containerProfile.Type || 'Video').trigger('change');
         $('#txtContainerProfileContainer', popup).val(containerProfile.Container || '');
         $('.radioTabButton:first', popup).trigger('click');
@@ -461,13 +468,13 @@ define(['jQuery', 'loading', 'globalize', 'fnchecked', 'emby-select', 'emby-butt
     }
 
     function renderCodecProfiles(page, profiles) {
-        var html = '';
+        let html = '';
         html += '<ul data-role="listview" data-inset="true" data-split-icon="delete">';
-        var currentType;
+        let currentType;
 
-        for (var i = 0, length = profiles.length; i < length; i++) {
-            var profile = profiles[i];
-            var type = profile.Type.replace('VideoAudio', 'Video Audio');
+        for (let i = 0, length = profiles.length; i < length; i++) {
+            let profile = profiles[i];
+            const type = profile.Type.replace('VideoAudio', 'Video Audio');
 
             if (type !== currentType) {
                 html += '<li data-role="list-divider">' + type + '</li>';
@@ -492,13 +499,13 @@ define(['jQuery', 'loading', 'globalize', 'fnchecked', 'emby-select', 'emby-butt
         }
 
         html += '</ul>';
-        var elem = $('.codecProfiles', page).html(html).trigger('create');
+        const elem = $('.codecProfiles', page).html(html).trigger('create');
         $('.btnDeleteProfile', elem).on('click', function () {
-            var index = this.getAttribute('data-profileindex');
+            const index = this.getAttribute('data-profileindex');
             deleteCodecProfile(page, index);
         });
         $('.lnkEditSubProfile', elem).on('click', function () {
-            var index = parseInt(this.getAttribute('data-profileindex'));
+            const index = parseInt(this.getAttribute('data-profileindex'));
             editCodecProfile(page, currentProfile.CodecProfiles[index]);
         });
     }
@@ -512,7 +519,7 @@ define(['jQuery', 'loading', 'globalize', 'fnchecked', 'emby-select', 'emby-butt
         isSubProfileNew = null == codecProfile;
         codecProfile = codecProfile || {};
         currentSubProfile = codecProfile;
-        var popup = $('#codecProfilePopup', page);
+        const popup = $('#codecProfilePopup', page);
         $('#selectCodecProfileType', popup).val(codecProfile.Type || 'Video').trigger('change');
         $('#txtCodecProfileCodec', popup).val(codecProfile.Codec || '');
         $('.radioTabButton:first', popup).trigger('click');
@@ -533,12 +540,12 @@ define(['jQuery', 'loading', 'globalize', 'fnchecked', 'emby-select', 'emby-butt
     }
 
     function renderResponseProfiles(page, profiles) {
-        var html = '';
+        let html = '';
         html += '<ul data-role="listview" data-inset="true" data-split-icon="delete">';
-        var currentType;
+        let currentType;
 
-        for (var i = 0, length = profiles.length; i < length; i++) {
-            var profile = profiles[i];
+        for (let i = 0, length = profiles.length; i < length; i++) {
+            const profile = profiles[i];
 
             if (profile.Type !== currentType) {
                 html += '<li data-role="list-divider">' + profile.Type + '</li>';
@@ -572,13 +579,13 @@ define(['jQuery', 'loading', 'globalize', 'fnchecked', 'emby-select', 'emby-butt
         }
 
         html += '</ul>';
-        var elem = $('.mediaProfiles', page).html(html).trigger('create');
+        const elem = $('.mediaProfiles', page).html(html).trigger('create');
         $('.btnDeleteProfile', elem).on('click', function () {
-            var index = this.getAttribute('data-profileindex');
+            const index = this.getAttribute('data-profileindex');
             deleteResponseProfile(page, index);
         });
         $('.lnkEditSubProfile', elem).on('click', function () {
-            var index = parseInt(this.getAttribute('data-profileindex'));
+            const index = parseInt(this.getAttribute('data-profileindex'));
             editResponseProfile(page, currentProfile.ResponseProfiles[index]);
         });
     }
@@ -592,7 +599,7 @@ define(['jQuery', 'loading', 'globalize', 'fnchecked', 'emby-select', 'emby-butt
         isSubProfileNew = null == responseProfile;
         responseProfile = responseProfile || {};
         currentSubProfile = responseProfile;
-        var popup = $('#responseProfilePopup', page);
+        const popup = $('#responseProfilePopup', page);
         $('#selectResponseProfileType', popup).val(responseProfile.Type || 'Video').trigger('change');
         $('#txtResponseProfileContainer', popup).val(responseProfile.Container || '');
         $('#txtResponseProfileAudioCodec', popup).val(responseProfile.AudioCodec || '');
@@ -618,7 +625,7 @@ define(['jQuery', 'loading', 'globalize', 'fnchecked', 'emby-select', 'emby-butt
 
     function saveProfile(page, profile) {
         updateProfile(page, profile);
-        var id = getParameterByName('id');
+        const id = getParameterByName('id');
 
         if (id) {
             ApiClient.ajax({
@@ -627,7 +634,7 @@ define(['jQuery', 'loading', 'globalize', 'fnchecked', 'emby-select', 'emby-butt
                 data: JSON.stringify(profile),
                 contentType: 'application/json'
             }).then(function () {
-                require(['toast'], function (toast) {
+                import('toast').then(({default: toast}) => {
                     toast('Settings saved.');
                 });
             }, Dashboard.processErrorResponse);
@@ -647,8 +654,8 @@ define(['jQuery', 'loading', 'globalize', 'fnchecked', 'emby-select', 'emby-butt
 
     function updateProfile(page, profile) {
         profile.Name = $('#txtName', page).val();
-        profile.EnableAlbumArtInDidl = $('#chkEnableAlbumArtInDidl', page).checked();
-        profile.EnableSingleAlbumArtLimit = $('#chkEnableSingleImageLimit', page).checked();
+        profile.EnableAlbumArtInDidl = $('#chkEnableAlbumArtInDidl', page).is(':checked');
+        profile.EnableSingleAlbumArtLimit = $('#chkEnableSingleImageLimit', page).is(':checked');
         profile.SupportedMediaTypes = $('.chkMediaType:checked', page).get().map(function (c) {
             return c.getAttribute('data-value');
         }).join(',');
@@ -675,9 +682,9 @@ define(['jQuery', 'loading', 'globalize', 'fnchecked', 'emby-select', 'emby-butt
         profile.MaxAlbumArtHeight = $('#txtAlbumArtMaxHeight', page).val();
         profile.MaxIconWidth = $('#txtIconMaxWidth', page).val();
         profile.MaxIconHeight = $('#txtIconMaxHeight', page).val();
-        profile.RequiresPlainFolders = $('#chkRequiresPlainFolders', page).checked();
-        profile.RequiresPlainVideoItems = $('#chkRequiresPlainVideoItems', page).checked();
-        profile.IgnoreTranscodeByteRangeRequests = $('#chkIgnoreTranscodeByteRangeRequests', page).checked();
+        profile.RequiresPlainFolders = $('#chkRequiresPlainFolders', page).is(':checked');
+        profile.RequiresPlainVideoItems = $('#chkRequiresPlainVideoItems', page).is(':checked');
+        profile.IgnoreTranscodeByteRangeRequests = $('#chkIgnoreTranscodeByteRangeRequests', page).is(':checked');
         profile.MaxStreamingBitrate = $('#txtMaxAllowedBitrate', page).val();
         profile.MusicStreamingTranscodingBitrate = $('#txtMusicStreamingTranscodingBitrate', page).val();
         profile.ProtocolInfo = $('#txtProtocolInfo', page).val();
@@ -687,18 +694,18 @@ define(['jQuery', 'loading', 'globalize', 'fnchecked', 'emby-select', 'emby-butt
         profile.UserId = $('#selectUser', page).val();
     }
 
-    var currentProfile;
-    var currentSubProfile;
-    var isSubProfileNew;
-    var allText = globalize.translate('LabelAll');
+    let currentProfile;
+    let currentSubProfile;
+    let isSubProfileNew;
+    const allText = globalize.translate('LabelAll');
 
     $(document).on('pageinit', '#dlnaProfilePage', function () {
-        var page = this;
+        const page = this;
         $('.radioTabButton', page).on('click', function () {
             $(this).siblings().removeClass('ui-btn-active');
             $(this).addClass('ui-btn-active');
-            var value = 'A' == this.tagName ? this.getAttribute('data-value') : this.value;
-            var elem = $('.' + value, page);
+            const value = 'A' == this.tagName ? this.getAttribute('data-value') : this.value;
+            const elem = $('.' + value, page);
             elem.siblings('.tabContent').hide();
             elem.show();
         });
@@ -783,7 +790,7 @@ define(['jQuery', 'loading', 'globalize', 'fnchecked', 'emby-select', 'emby-butt
         $('.xmlAttributeForm').off('submit', DlnaProfilePage.onXmlAttributeFormSubmit).on('submit', DlnaProfilePage.onXmlAttributeFormSubmit);
         $('.subtitleProfileForm').off('submit', DlnaProfilePage.onSubtitleProfileFormSubmit).on('submit', DlnaProfilePage.onSubtitleProfileFormSubmit);
     }).on('pageshow', '#dlnaProfilePage', function () {
-        var page = this;
+        const page = this;
         $('#radioInfo', page).trigger('click');
         loadProfile(page);
     });
@@ -826,4 +833,5 @@ define(['jQuery', 'loading', 'globalize', 'fnchecked', 'emby-select', 'emby-butt
             return false;
         }
     };
-});
+
+/* eslint-enable indent */
diff --git a/src/controllers/dashboard/dlna/profiles.js b/src/controllers/dashboard/dlna/profiles.js
index fb4caadeb9..510128be4b 100644
--- a/src/controllers/dashboard/dlna/profiles.js
+++ b/src/controllers/dashboard/dlna/profiles.js
@@ -1,5 +1,11 @@
-define(['jQuery', 'globalize', 'loading', 'libraryMenu', 'listViewStyle', 'emby-button'], function ($, globalize, loading, libraryMenu) {
-    'use strict';
+import $ from 'jQuery';
+import globalize from 'globalize';
+import loading from 'loading';
+import libraryMenu from 'libraryMenu';
+import 'listViewStyle';
+import 'emby-button';
+
+/* eslint-disable indent */
 
     function loadProfiles(page) {
         loading.show();
@@ -23,14 +29,14 @@ define(['jQuery', 'globalize', 'loading', 'libraryMenu', 'listViewStyle', 'emby-
     }
 
     function renderProfiles(page, element, profiles) {
-        var html = '';
+        let html = '';
 
         if (profiles.length) {
             html += '<div class="paperList">';
         }
 
-        for (var i = 0, length = profiles.length; i < length; i++) {
-            var profile = profiles[i];
+        for (let i = 0, length = profiles.length; i < length; i++) {
+            let profile = profiles[i];
             html += '<div class="listItem listItem-border">';
             html += '<span class="listItemIcon material-icons live_tv"></span>';
             html += '<div class="listItemBody two-line">';
@@ -52,13 +58,13 @@ define(['jQuery', 'globalize', 'loading', 'libraryMenu', 'listViewStyle', 'emby-
 
         element.innerHTML = html;
         $('.btnDeleteProfile', element).on('click', function () {
-            var id = this.getAttribute('data-profileid');
+            const id = this.getAttribute('data-profileid');
             deleteProfile(page, id);
         });
     }
 
     function deleteProfile(page, id) {
-        require(['confirm'], function (confirm) {
+        import('confirm').then(({default: confirm}) => {
             confirm(globalize.translate('MessageConfirmProfileDeletion'), globalize.translate('HeaderConfirmProfileDeletion')).then(function () {
                 loading.show();
                 ApiClient.ajax({
@@ -86,4 +92,5 @@ define(['jQuery', 'globalize', 'loading', 'libraryMenu', 'listViewStyle', 'emby-
         libraryMenu.setTabs('dlna', 1, getTabs);
         loadProfiles(this);
     });
-});
+
+/* eslint-enable indent */
diff --git a/src/controllers/dashboard/dlna/settings.js b/src/controllers/dashboard/dlna/settings.js
index a818002d01..9e7d78d799 100644
--- a/src/controllers/dashboard/dlna/settings.js
+++ b/src/controllers/dashboard/dlna/settings.js
@@ -1,14 +1,18 @@
-define(['jQuery', 'loading', 'libraryMenu', 'globalize', 'fnchecked'], function ($, loading, libraryMenu, globalize) {
-    'use strict';
+import $ from 'jQuery';
+import loading from 'loading';
+import libraryMenu from 'libraryMenu';
+import globalize from 'globalize';
+
+/* eslint-disable indent */
 
     function loadPage(page, config, users) {
         page.querySelector('#chkEnablePlayTo').checked = config.EnablePlayTo;
         page.querySelector('#chkEnableDlnaDebugLogging').checked = config.EnableDebugLog;
         $('#txtClientDiscoveryInterval', page).val(config.ClientDiscoveryIntervalSeconds);
-        $('#chkEnableServer', page).checked(config.EnableServer);
-        $('#chkBlastAliveMessages', page).checked(config.BlastAliveMessages);
+        $('#chkEnableServer', page).prop('checked', config.EnableServer);
+        $('#chkBlastAliveMessages', page).prop('checked', config.BlastAliveMessages);
         $('#txtBlastInterval', page).val(config.BlastAliveMessageIntervalSeconds);
-        var usersHtml = users.map(function (u) {
+        const usersHtml = users.map(function (u) {
             return '<option value="' + u.Id + '">' + u.Name + '</option>';
         }).join('');
         $('#selectUser', page).html(usersHtml).val(config.DefaultUserId || '');
@@ -17,13 +21,13 @@ define(['jQuery', 'loading', 'libraryMenu', 'globalize', 'fnchecked'], function
 
     function onSubmit() {
         loading.show();
-        var form = this;
+        const form = this;
         ApiClient.getNamedConfiguration('dlna').then(function (config) {
             config.EnablePlayTo = form.querySelector('#chkEnablePlayTo').checked;
             config.EnableDebugLog = form.querySelector('#chkEnableDlnaDebugLogging').checked;
             config.ClientDiscoveryIntervalSeconds = $('#txtClientDiscoveryInterval', form).val();
-            config.EnableServer = $('#chkEnableServer', form).checked();
-            config.BlastAliveMessages = $('#chkBlastAliveMessages', form).checked();
+            config.EnableServer = $('#chkEnableServer', form).is(':checked');
+            config.BlastAliveMessages = $('#chkBlastAliveMessages', form).is(':checked');
             config.BlastAliveMessageIntervalSeconds = $('#txtBlastInterval', form).val();
             config.DefaultUserId = $('#selectUser', form).val();
             ApiClient.updateNamedConfiguration('dlna', config).then(Dashboard.processServerConfigurationUpdateResult);
@@ -46,11 +50,12 @@ define(['jQuery', 'loading', 'libraryMenu', 'globalize', 'fnchecked'], function
     }).on('pageshow', '#dlnaSettingsPage', function () {
         libraryMenu.setTabs('dlna', 0, getTabs);
         loading.show();
-        var page = this;
-        var promise1 = ApiClient.getNamedConfiguration('dlna');
-        var promise2 = ApiClient.getUsers();
+        const page = this;
+        const promise1 = ApiClient.getNamedConfiguration('dlna');
+        const promise2 = ApiClient.getUsers();
         Promise.all([promise1, promise2]).then(function (responses) {
             loadPage(page, responses[0], responses[1]);
         });
     });
-});
+
+/* eslint-enable indent */
diff --git a/src/controllers/dashboard/encodingsettings.js b/src/controllers/dashboard/encodingsettings.js
index 65f4e4401d..aac18360ac 100644
--- a/src/controllers/dashboard/encodingsettings.js
+++ b/src/controllers/dashboard/encodingsettings.js
@@ -1,10 +1,17 @@
-define(['jQuery', 'loading', 'globalize', 'dom', 'libraryMenu'], function ($, loading, globalize, dom, libraryMenu) {
-    'use strict';
+import $ from 'jQuery';
+import loading from 'loading';
+import globalize from 'globalize';
+import dom from 'dom';
+import libraryMenu from 'libraryMenu';
+
+/* eslint-disable indent */
 
     function loadPage(page, config, systemInfo) {
         Array.prototype.forEach.call(page.querySelectorAll('.chkDecodeCodec'), function (c) {
             c.checked = -1 !== (config.HardwareDecodingCodecs || []).indexOf(c.getAttribute('data-codec'));
         });
+        page.querySelector('#chkDecodingColorDepth10Hevc').checked = config.EnableDecodingColorDepth10Hevc;
+        page.querySelector('#chkDecodingColorDepth10Vp9').checked = config.EnableDecodingColorDepth10Vp9;
         page.querySelector('#chkHardwareEncoding').checked = config.EnableHardwareEncoding;
         $('#selectVideoDecoder', page).val(config.HardwareAccelerationType);
         $('#selectThreadCount', page).val(config.EncodingThreadCount);
@@ -25,10 +32,10 @@ define(['jQuery', 'loading', 'globalize', 'dom', 'libraryMenu'], function ($, lo
 
     function onSaveEncodingPathFailure(response) {
         loading.hide();
-        var msg = '';
+        let msg = '';
         msg = globalize.translate('FFmpegSavePathNotFound');
 
-        require(['alert'], function (alert) {
+        import('alert').then(({default: alert}) => {
             alert(msg);
         });
     }
@@ -47,9 +54,9 @@ define(['jQuery', 'loading', 'globalize', 'dom', 'libraryMenu'], function ($, lo
     }
 
     function onSubmit() {
-        var form = this;
+        const form = this;
 
-        var onDecoderConfirmed = function () {
+        const onDecoderConfirmed = function () {
             loading.show();
             ApiClient.getNamedConfiguration('encoding').then(function (config) {
                 config.DownMixAudioBoost = $('#txtDownMixAudioBoost', form).val();
@@ -67,11 +74,13 @@ define(['jQuery', 'loading', 'globalize', 'dom', 'libraryMenu'], function ($, lo
                 }), function (c) {
                     return c.getAttribute('data-codec');
                 });
+                config.EnableDecodingColorDepth10Hevc = form.querySelector('#chkDecodingColorDepth10Hevc').checked;
+                config.EnableDecodingColorDepth10Vp9 = form.querySelector('#chkDecodingColorDepth10Vp9').checked;
                 config.EnableHardwareEncoding = form.querySelector('#chkHardwareEncoding').checked;
                 ApiClient.updateNamedConfiguration('encoding', config).then(function () {
                     updateEncoder(form);
                 }, function () {
-                    require(['alert'], function (alert) {
+                    import('alert').then(({default: alert}) => {
                         alert(globalize.translate('DefaultErrorMessage'));
                     });
 
@@ -81,7 +90,7 @@ define(['jQuery', 'loading', 'globalize', 'dom', 'libraryMenu'], function ($, lo
         };
 
         if ($('#selectVideoDecoder', form).val()) {
-            require(['alert'], function (alert) {
+            import('alert').then(({default: alert}) => {
                 alert({
                     title: globalize.translate('TitleHardwareAcceleration'),
                     text: globalize.translate('HardwareAccelerationWarning')
@@ -96,7 +105,7 @@ define(['jQuery', 'loading', 'globalize', 'dom', 'libraryMenu'], function ($, lo
 
     function setDecodingCodecsVisible(context, value) {
         value = value || '';
-        var any;
+        let any;
         Array.prototype.forEach.call(context.querySelectorAll('.chkDecodeCodec'), function (c) {
             if (-1 === c.getAttribute('data-types').split(',').indexOf(value)) {
                 dom.parentWithTag(c, 'LABEL').classList.add('hide');
@@ -127,7 +136,7 @@ define(['jQuery', 'loading', 'globalize', 'dom', 'libraryMenu'], function ($, lo
     }
 
     $(document).on('pageinit', '#encodingSettingsPage', function () {
-        var page = this;
+        const page = this;
         page.querySelector('#selectVideoDecoder').addEventListener('change', function () {
             if ('vaapi' == this.value) {
                 page.querySelector('.fldVaapiDevice').classList.remove('hide');
@@ -146,8 +155,8 @@ define(['jQuery', 'loading', 'globalize', 'dom', 'libraryMenu'], function ($, lo
             setDecodingCodecsVisible(page, this.value);
         });
         $('#btnSelectEncoderPath', page).on('click.selectDirectory', function () {
-            require(['directorybrowser'], function (directoryBrowser) {
-                var picker = new directoryBrowser();
+            import('directorybrowser').then(({default: directoryBrowser}) => {
+                const picker = new directoryBrowser();
                 picker.show({
                     includeFiles: true,
                     callback: function (path) {
@@ -161,8 +170,8 @@ define(['jQuery', 'loading', 'globalize', 'dom', 'libraryMenu'], function ($, lo
             });
         });
         $('#btnSelectTranscodingTempPath', page).on('click.selectDirectory', function () {
-            require(['directorybrowser'], function (directoryBrowser) {
-                var picker = new directoryBrowser();
+            import('directorybrowser').then(({default: directoryBrowser}) => {
+                const picker = new directoryBrowser();
                 picker.show({
                     callback: function (path) {
                         if (path) {
@@ -181,11 +190,12 @@ define(['jQuery', 'loading', 'globalize', 'dom', 'libraryMenu'], function ($, lo
     }).on('pageshow', '#encodingSettingsPage', function () {
         loading.show();
         libraryMenu.setTabs('playback', 0, getTabs);
-        var page = this;
+        const page = this;
         ApiClient.getNamedConfiguration('encoding').then(function (config) {
             ApiClient.getSystemInfo().then(function (systemInfo) {
                 loadPage(page, config, systemInfo);
             });
         });
     });
-});
+
+/* eslint-enable indent */
diff --git a/src/controllers/dashboard/general.js b/src/controllers/dashboard/general.js
index 778285054b..8e30749aba 100644
--- a/src/controllers/dashboard/general.js
+++ b/src/controllers/dashboard/general.js
@@ -1,16 +1,16 @@
-define(['jQuery', 'loading', 'globalize', 'fnchecked', 'emby-checkbox', 'emby-textarea', 'emby-input', 'emby-select', 'emby-button'], function ($, loading, globalize) {
-    'use strict';
+import $ from 'jQuery';
+import loading from 'loading';
+import globalize from 'globalize';
+import 'emby-checkbox';
+import 'emby-textarea';
+import 'emby-input';
+import 'emby-select';
+import 'emby-button';
+
+/* eslint-disable indent */
 
     function loadPage(page, config, languageOptions, systemInfo) {
         page.querySelector('#txtServerName').value = systemInfo.ServerName;
-        $('#chkAutoRunWebApp', page).checked(config.AutoRunWebApp);
-
-        if (systemInfo.CanLaunchWebBrowser) {
-            page.querySelector('#fldAutoRunWebApp').classList.remove('hide');
-        } else {
-            page.querySelector('#fldAutoRunWebApp').classList.add('hide');
-        }
-
         page.querySelector('#txtCachePath').value = systemInfo.CachePath || '';
         $('#txtMetadataPath', page).val(systemInfo.InternalMetadataPath || '');
         $('#txtMetadataNetworkPath', page).val(systemInfo.MetadataNetworkPath || '');
@@ -24,7 +24,7 @@ define(['jQuery', 'loading', 'globalize', 'fnchecked', 'emby-checkbox', 'emby-te
 
     function onSubmit() {
         loading.show();
-        var form = this;
+        const form = this;
         $(form).parents('.page');
         ApiClient.getServerConfiguration().then(function (config) {
             config.ServerName = $('#txtServerName', form).val();
@@ -32,8 +32,7 @@ define(['jQuery', 'loading', 'globalize', 'fnchecked', 'emby-checkbox', 'emby-te
             config.CachePath = form.querySelector('#txtCachePath').value;
             config.MetadataPath = $('#txtMetadataPath', form).val();
             config.MetadataNetworkPath = $('#txtMetadataNetworkPath', form).val();
-            var requiresReload = config.UICulture !== currentLanguage;
-            config.AutoRunWebApp = $('#chkAutoRunWebApp', form).checked();
+            let requiresReload = config.UICulture !== currentLanguage;
             ApiClient.updateServerConfiguration(config).then(function() {
                 ApiClient.getNamedConfiguration(brandingConfigKey).then(function(brandingConfig) {
                     brandingConfig.LoginDisclaimer = form.querySelector('#txtLoginDisclaimer').value;
@@ -52,7 +51,7 @@ define(['jQuery', 'loading', 'globalize', 'fnchecked', 'emby-checkbox', 'emby-te
                     });
                 });
             }, function () {
-                require(['alert'], function (alert) {
+                import('alert').then(({default: alert}) => {
                     alert(globalize.translate('DefaultErrorMessage'));
                 });
 
@@ -62,13 +61,13 @@ define(['jQuery', 'loading', 'globalize', 'fnchecked', 'emby-checkbox', 'emby-te
         return false;
     }
 
-    var currentBrandingOptions;
-    var currentLanguage;
-    var brandingConfigKey = 'branding';
-    return function (view, params) {
+    let currentBrandingOptions;
+    let currentLanguage;
+    const brandingConfigKey = 'branding';
+    export default function (view, params) {
         $('#btnSelectCachePath', view).on('click.selectDirectory', function () {
-            require(['directorybrowser'], function (directoryBrowser) {
-                var picker = new directoryBrowser();
+            import('directorybrowser').then(({default: directoryBrowser}) => {
+                const picker = new directoryBrowser();
                 picker.show({
                     callback: function (path) {
                         if (path) {
@@ -84,8 +83,8 @@ define(['jQuery', 'loading', 'globalize', 'fnchecked', 'emby-checkbox', 'emby-te
             });
         });
         $('#btnSelectMetadataPath', view).on('click.selectDirectory', function () {
-            require(['directorybrowser'], function (directoryBrowser) {
-                var picker = new directoryBrowser();
+            import('directorybrowser').then(({default: directoryBrowser}) => {
+                const picker = new directoryBrowser();
                 picker.show({
                     path: $('#txtMetadataPath', view).val(),
                     networkSharePath: $('#txtMetadataNetworkPath', view).val(),
@@ -109,9 +108,9 @@ define(['jQuery', 'loading', 'globalize', 'fnchecked', 'emby-checkbox', 'emby-te
         });
         $('.dashboardGeneralForm', view).off('submit', onSubmit).on('submit', onSubmit);
         view.addEventListener('viewshow', function () {
-            var promiseConfig = ApiClient.getServerConfiguration();
-            var promiseLanguageOptions = ApiClient.getJSON(ApiClient.getUrl('Localization/Options'));
-            var promiseSystemInfo = ApiClient.getSystemInfo();
+            const promiseConfig = ApiClient.getServerConfiguration();
+            const promiseLanguageOptions = ApiClient.getJSON(ApiClient.getUrl('Localization/Options'));
+            const promiseSystemInfo = ApiClient.getSystemInfo();
             Promise.all([promiseConfig, promiseLanguageOptions, promiseSystemInfo]).then(function (responses) {
                 loadPage(view, responses[0], responses[1], responses[2]);
             });
@@ -121,5 +120,6 @@ define(['jQuery', 'loading', 'globalize', 'fnchecked', 'emby-checkbox', 'emby-te
                 view.querySelector('#txtCustomCss').value = config.CustomCss || '';
             });
         });
-    };
-});
+    }
+
+/* eslint-enable indent */
diff --git a/src/controllers/dashboard/librarydisplay.js b/src/controllers/dashboard/librarydisplay.js
index a820c37528..2269e19c44 100644
--- a/src/controllers/dashboard/librarydisplay.js
+++ b/src/controllers/dashboard/librarydisplay.js
@@ -1,5 +1,10 @@
-define(['globalize', 'loading', 'libraryMenu', 'emby-checkbox', 'emby-button', 'emby-button'], function(globalize, loading, libraryMenu) {
-    'use strict';
+import globalize from 'globalize';
+import loading from 'loading';
+import libraryMenu from 'libraryMenu';
+import 'emby-checkbox';
+import 'emby-button';
+
+/* eslint-disable indent */
 
     function getTabs() {
         return [{
@@ -17,7 +22,7 @@ define(['globalize', 'loading', 'libraryMenu', 'emby-checkbox', 'emby-button', '
         }];
     }
 
-    return function(view, params) {
+    export default function(view, params) {
         function loadData() {
             ApiClient.getServerConfiguration().then(function(config) {
                 view.querySelector('.chkFolderView').checked = config.EnableFolderView;
@@ -33,7 +38,7 @@ define(['globalize', 'loading', 'libraryMenu', 'emby-checkbox', 'emby-button', '
 
         view.querySelector('form').addEventListener('submit', function(e) {
             loading.show();
-            var form = this;
+            const form = this;
             ApiClient.getServerConfiguration().then(function(config) {
                 config.EnableFolderView = form.querySelector('.chkFolderView').checked;
                 config.EnableGroupingIntoCollections = form.querySelector('.chkGroupMoviesIntoCollections').checked;
@@ -63,5 +68,6 @@ define(['globalize', 'loading', 'libraryMenu', 'emby-checkbox', 'emby-button', '
                 }
             });
         });
-    };
-});
+    }
+
+/* eslint-enable indent */
diff --git a/src/controllers/dashboard/logs.js b/src/controllers/dashboard/logs.js
index e0b000a130..7bf2785d50 100644
--- a/src/controllers/dashboard/logs.js
+++ b/src/controllers/dashboard/logs.js
@@ -1,6 +1,12 @@
-define(['datetime', 'loading', 'apphost', 'listViewStyle', 'emby-button', 'flexStyles'], function(datetime, loading, appHost) {
-    'use strict';
-    return function(view, params) {
+import datetime from 'datetime';
+import loading from 'loading';
+import 'emby-button';
+import 'listViewStyle';
+import 'flexStyles';
+
+/* eslint-disable indent */
+
+    export default function(view, params) {
         view.addEventListener('viewbeforeshow', function() {
             loading.show();
             var apiClient = ApiClient;
@@ -29,5 +35,6 @@ define(['datetime', 'loading', 'apphost', 'listViewStyle', 'emby-button', 'flexS
                 loading.hide();
             });
         });
-    };
-});
+    }
+
+/* eslint-enable indent */
diff --git a/src/controllers/dashboard/mediaLibrary.js b/src/controllers/dashboard/mediaLibrary.js
index 06eba37cbd..b958e69d22 100644
--- a/src/controllers/dashboard/mediaLibrary.js
+++ b/src/controllers/dashboard/mediaLibrary.js
@@ -1,9 +1,20 @@
-define(['jQuery', 'apphost', 'scripts/taskbutton', 'loading', 'libraryMenu', 'globalize', 'dom', 'indicators', 'scripts/imagehelper', 'cardStyle', 'emby-itemrefreshindicator'], function ($, appHost, taskButton, loading, libraryMenu, globalize, dom, indicators, imageHelper) {
-    'use strict';
+import $ from 'jQuery';
+import appHost from 'apphost';
+import taskButton from 'scripts/taskbutton';
+import loading from 'loading';
+import libraryMenu from 'libraryMenu';
+import globalize from 'globalize';
+import dom from 'dom';
+import indicators from 'indicators';
+import imageHelper from 'scripts/imagehelper';
+import 'cardStyle';
+import 'emby-itemrefreshindicator';
+
+/* eslint-disable indent */
 
     function addVirtualFolder(page) {
-        require(['medialibrarycreator'], function (medialibrarycreator) {
-            new medialibrarycreator().show({
+        import('medialibrarycreator').then(({default: medialibrarycreator}) => {
+            new medialibrarycreator({
                 collectionTypeOptions: getCollectionTypeOptions().filter(function (f) {
                     return !f.hidden;
                 }),
@@ -17,8 +28,8 @@ define(['jQuery', 'apphost', 'scripts/taskbutton', 'loading', 'libraryMenu', 'gl
     }
 
     function editVirtualFolder(page, virtualFolder) {
-        require(['medialibraryeditor'], function (medialibraryeditor) {
-            new medialibraryeditor().show({
+        import('medialibraryeditor').then(({default: medialibraryeditor}) => {
+            new medialibraryeditor({
                 refresh: shouldRefreshLibraryAfterChanges(page),
                 library: virtualFolder
             }).then(function (hasChanges) {
@@ -30,23 +41,21 @@ define(['jQuery', 'apphost', 'scripts/taskbutton', 'loading', 'libraryMenu', 'gl
     }
 
     function deleteVirtualFolder(page, virtualFolder) {
-        var msg = globalize.translate('MessageAreYouSureYouWishToRemoveMediaFolder');
+        let msg = globalize.translate('MessageAreYouSureYouWishToRemoveMediaFolder');
 
         if (virtualFolder.Locations.length) {
             msg += '<br/><br/>' + globalize.translate('MessageTheFollowingLocationWillBeRemovedFromLibrary') + '<br/><br/>';
             msg += virtualFolder.Locations.join('<br/>');
         }
 
-        require(['confirm'], function (confirm) {
+        import('confirm').then(({default: confirm}) => {
             confirm({
-
                 text: msg,
                 title: globalize.translate('HeaderRemoveMediaFolder'),
                 confirmText: globalize.translate('Delete'),
                 primary: 'delete'
-
             }).then(function () {
-                var refreshAfterChange = shouldRefreshLibraryAfterChanges(page);
+                const refreshAfterChange = shouldRefreshLibraryAfterChanges(page);
                 ApiClient.removeVirtualFolder(virtualFolder.Name, refreshAfterChange).then(function () {
                     reloadLibrary(page);
                 });
@@ -55,7 +64,7 @@ define(['jQuery', 'apphost', 'scripts/taskbutton', 'loading', 'libraryMenu', 'gl
     }
 
     function refreshVirtualFolder(page, virtualFolder) {
-        require(['refreshDialog'], function (refreshDialog) {
+        import('refreshDialog').then(({default: refreshDialog}) => {
             new refreshDialog({
                 itemIds: [virtualFolder.ItemId],
                 serverId: ApiClient.serverId(),
@@ -65,13 +74,13 @@ define(['jQuery', 'apphost', 'scripts/taskbutton', 'loading', 'libraryMenu', 'gl
     }
 
     function renameVirtualFolder(page, virtualFolder) {
-        require(['prompt'], function (prompt) {
+        import('prompt').then(({default: prompt}) => {
             prompt({
                 label: globalize.translate('LabelNewName'),
                 confirmText: globalize.translate('ButtonRename')
             }).then(function (newName) {
                 if (newName && newName != virtualFolder.Name) {
-                    var refreshAfterChange = shouldRefreshLibraryAfterChanges(page);
+                    const refreshAfterChange = shouldRefreshLibraryAfterChanges(page);
                     ApiClient.renameVirtualFolder(virtualFolder.Name, newName, refreshAfterChange).then(function () {
                         reloadLibrary(page);
                     });
@@ -81,10 +90,10 @@ define(['jQuery', 'apphost', 'scripts/taskbutton', 'loading', 'libraryMenu', 'gl
     }
 
     function showCardMenu(page, elem, virtualFolders) {
-        var card = dom.parentWithClass(elem, 'card');
-        var index = parseInt(card.getAttribute('data-index'));
-        var virtualFolder = virtualFolders[index];
-        var menuItems = [];
+        const card = dom.parentWithClass(elem, 'card');
+        const index = parseInt(card.getAttribute('data-index'));
+        const virtualFolder = virtualFolders[index];
+        const menuItems = [];
         menuItems.push({
             name: globalize.translate('ButtonEditImages'),
             id: 'editimages',
@@ -111,7 +120,7 @@ define(['jQuery', 'apphost', 'scripts/taskbutton', 'loading', 'libraryMenu', 'gl
             icon: 'refresh'
         });
 
-        require(['actionsheet'], function (actionsheet) {
+        import('actionsheet').then(({default: actionsheet}) => {
             actionsheet.show({
                 items: menuItems,
                 positionTo: elem,
@@ -153,7 +162,7 @@ define(['jQuery', 'apphost', 'scripts/taskbutton', 'loading', 'libraryMenu', 'gl
     }
 
     function reloadVirtualFolders(page, virtualFolders) {
-        var html = '';
+        let html = '';
         virtualFolders.push({
             Name: globalize.translate('ButtonAddMediaLibrary'),
             icon: 'add_circle',
@@ -161,28 +170,28 @@ define(['jQuery', 'apphost', 'scripts/taskbutton', 'loading', 'libraryMenu', 'gl
             showType: false,
             showLocations: false,
             showMenu: false,
-            showNameWithIcon: true
+            showNameWithIcon: false
         });
 
-        for (var i = 0; i < virtualFolders.length; i++) {
-            var virtualFolder = virtualFolders[i];
+        for (let i = 0; i < virtualFolders.length; i++) {
+            const virtualFolder = virtualFolders[i];
             html += getVirtualFolderHtml(page, virtualFolder, i);
         }
 
-        var divVirtualFolders = page.querySelector('#divVirtualFolders');
+        const divVirtualFolders = page.querySelector('#divVirtualFolders');
         divVirtualFolders.innerHTML = html;
         divVirtualFolders.classList.add('itemsContainer');
         divVirtualFolders.classList.add('vertical-wrap');
         $('.btnCardMenu', divVirtualFolders).on('click', function () {
             showCardMenu(page, this, virtualFolders);
         });
-        divVirtualFolders.querySelector('.addLibrary').addEventListener('click', function () {
+        divVirtualFolders.querySelector('#addLibrary').addEventListener('click', function () {
             addVirtualFolder(page);
         });
         $('.editLibrary', divVirtualFolders).on('click', function () {
-            var card = $(this).parents('.card')[0];
-            var index = parseInt(card.getAttribute('data-index'));
-            var virtualFolder = virtualFolders[index];
+            const card = $(this).parents('.card')[0];
+            const index = parseInt(card.getAttribute('data-index'));
+            const virtualFolder = virtualFolders[index];
 
             if (virtualFolder.ItemId) {
                 editVirtualFolder(page, virtualFolder);
@@ -192,7 +201,7 @@ define(['jQuery', 'apphost', 'scripts/taskbutton', 'loading', 'libraryMenu', 'gl
     }
 
     function editImages(page, virtualFolder) {
-        require(['imageEditor'], function (imageEditor) {
+        import('imageEditor').then(({default: imageEditor}) => {
             imageEditor.show({
                 itemId: virtualFolder.ItemId,
                 serverId: ApiClient.serverId()
@@ -240,19 +249,24 @@ define(['jQuery', 'apphost', 'scripts/taskbutton', 'loading', 'libraryMenu', 'gl
     }
 
     function getVirtualFolderHtml(page, virtualFolder, index) {
-        var html = '';
-        var style = '';
+        let html = '';
+        let style = '';
 
         if (page.classList.contains('wizardPage')) {
             style += 'min-width:33.3%;';
         }
 
-        html += '<div class="card backdropCard scalableCard backdropCard-scalable" style="' + style + '" data-index="' + index + '" data-id="' + virtualFolder.ItemId + '">';
+        if (virtualFolder.Locations.length == 0) {
+            html += '<div id="addLibrary" class="card backdropCard scalableCard backdropCard-scalable" style="' + style + '" data-index="' + index + '" data-id="' + virtualFolder.ItemId + '">';
+        } else {
+            html += '<div class="card backdropCard scalableCard backdropCard-scalable" style="' + style + '" data-index="' + index + '" data-id="' + virtualFolder.ItemId + '">';
+        }
+
         html += '<div class="cardBox visualCardBox">';
         html += '<div class="cardScalable visualCardBox-cardScalable">';
         html += '<div class="cardPadder cardPadder-backdrop"></div>';
         html += '<div class="cardContent">';
-        var imgUrl = '';
+        let imgUrl = '';
 
         if (virtualFolder.PrimaryImageItemId) {
             imgUrl = ApiClient.getScaledImageUrl(virtualFolder.PrimaryImageItemId, {
@@ -261,7 +275,7 @@ define(['jQuery', 'apphost', 'scripts/taskbutton', 'loading', 'libraryMenu', 'gl
             });
         }
 
-        var hasCardImageContainer;
+        let hasCardImageContainer;
 
         if (imgUrl) {
             html += '<div class="cardImageContainer editLibrary" style="cursor:pointer;background-image:url(\'' + imgUrl + "');\">";
@@ -311,7 +325,7 @@ define(['jQuery', 'apphost', 'scripts/taskbutton', 'loading', 'libraryMenu', 'gl
         }
 
         html += '</div>';
-        var typeName = getCollectionTypeOptions().filter(function (t) {
+        let typeName = getCollectionTypeOptions().filter(function (t) {
             return t.value == virtualFolder.CollectionType;
         })[0];
         typeName = typeName ? typeName.name : globalize.translate('FolderTypeUnset');
@@ -371,7 +385,8 @@ define(['jQuery', 'apphost', 'scripts/taskbutton', 'loading', 'libraryMenu', 'gl
     });
     pageIdOn('pageshow', 'mediaLibraryPage', function () {
         libraryMenu.setTabs('librarysetup', 0, getTabs);
-        var page = this;
+
+        const page = this;
         taskButton({
             mode: 'on',
             progressElem: page.querySelector('.refreshProgress'),
@@ -380,7 +395,8 @@ define(['jQuery', 'apphost', 'scripts/taskbutton', 'loading', 'libraryMenu', 'gl
         });
     });
     pageIdOn('pagebeforehide', 'mediaLibraryPage', function () {
-        var page = this;
+
+        const page = this;
         taskButton({
             mode: 'off',
             progressElem: page.querySelector('.refreshProgress'),
@@ -388,4 +404,5 @@ define(['jQuery', 'apphost', 'scripts/taskbutton', 'loading', 'libraryMenu', 'gl
             button: page.querySelector('.btnRefresh')
         });
     });
-});
+
+/* eslint-enable indent */
diff --git a/src/controllers/dashboard/metadataImages.js b/src/controllers/dashboard/metadataImages.js
index 277eecb42a..cbfe05419c 100644
--- a/src/controllers/dashboard/metadataImages.js
+++ b/src/controllers/dashboard/metadataImages.js
@@ -1,12 +1,18 @@
-define(['jQuery', 'dom', 'loading', 'libraryMenu', 'globalize', 'listViewStyle'], function($, dom, loading, libraryMenu, globalize) {
-    'use strict';
+import $ from 'jQuery';
+import dom from 'dom';
+import loading from 'loading';
+import libraryMenu from 'libraryMenu';
+import globalize from 'globalize';
+import 'listViewStyle';
+
+/* eslint-disable indent */
 
     function populateLanguages(select) {
         return ApiClient.getCultures().then(function(languages) {
-            var html = '';
+            let html = '';
             html += "<option value=''></option>";
-            for (var i = 0, length = languages.length; i < length; i++) {
-                var culture = languages[i];
+            for (let i = 0, length = languages.length; i < length; i++) {
+                const culture = languages[i];
                 html += "<option value='" + culture.TwoLetterISOLanguageName + "'>" + culture.DisplayName + '</option>';
             }
             select.innerHTML = html;
@@ -15,10 +21,10 @@ define(['jQuery', 'dom', 'loading', 'libraryMenu', 'globalize', 'listViewStyle']
 
     function populateCountries(select) {
         return ApiClient.getCountries().then(function(allCountries) {
-            var html = '';
+            let html = '';
             html += "<option value=''></option>";
-            for (var i = 0, length = allCountries.length; i < length; i++) {
-                var culture = allCountries[i];
+            for (let i = 0, length = allCountries.length; i < length; i++) {
+                const culture = allCountries[i];
                 html += "<option value='" + culture.TwoLetterISORegionName + "'>" + culture.DisplayName + '</option>';
             }
             select.innerHTML = html;
@@ -26,17 +32,21 @@ define(['jQuery', 'dom', 'loading', 'libraryMenu', 'globalize', 'listViewStyle']
     }
 
     function loadPage(page) {
-        var promises = [ApiClient.getServerConfiguration(), populateLanguages(page.querySelector('#selectLanguage')), populateCountries(page.querySelector('#selectCountry'))];
+        const promises = [ApiClient.getServerConfiguration(), populateLanguages(page.querySelector('#selectLanguage')), populateCountries(page.querySelector('#selectCountry'))];
         Promise.all(promises).then(function(responses) {
-            var config = responses[0];
-            page.querySelector('#selectLanguage').value = config.PreferredMetadataLanguage || '', page.querySelector('#selectCountry').value = config.MetadataCountryCode || '', loading.hide();
+            const config = responses[0];
+            page.querySelector('#selectLanguage').value = config.PreferredMetadataLanguage || '';
+            page.querySelector('#selectCountry').value = config.MetadataCountryCode || '';
+            loading.hide();
         });
     }
 
     function onSubmit() {
-        var form = this;
+        const form = this;
         return loading.show(), ApiClient.getServerConfiguration().then(function(config) {
-            config.PreferredMetadataLanguage = form.querySelector('#selectLanguage').value, config.MetadataCountryCode = form.querySelector('#selectCountry').value, ApiClient.updateServerConfiguration(config).then(Dashboard.processServerConfigurationUpdateResult);
+            config.PreferredMetadataLanguage = form.querySelector('#selectLanguage').value;
+            config.MetadataCountryCode = form.querySelector('#selectCountry').value;
+            ApiClient.updateServerConfiguration(config).then(Dashboard.processServerConfigurationUpdateResult);
         }), !1;
     }
 
@@ -59,6 +69,9 @@ define(['jQuery', 'dom', 'loading', 'libraryMenu', 'globalize', 'listViewStyle']
     $(document).on('pageinit', '#metadataImagesConfigurationPage', function() {
         $('.metadataImagesConfigurationForm').off('submit', onSubmit).on('submit', onSubmit);
     }).on('pageshow', '#metadataImagesConfigurationPage', function() {
-        libraryMenu.setTabs('metadata', 2, getTabs), loading.show(), loadPage(this);
+        libraryMenu.setTabs('metadata', 2, getTabs);
+        loading.show();
+        loadPage(this);
     });
-});
+
+/* eslint-enable indent */
diff --git a/src/controllers/dashboard/metadatanfo.js b/src/controllers/dashboard/metadatanfo.js
index a936192618..f1b768d18b 100644
--- a/src/controllers/dashboard/metadatanfo.js
+++ b/src/controllers/dashboard/metadatanfo.js
@@ -1,8 +1,12 @@
-define(['jQuery', 'loading', 'libraryMenu', 'globalize'], function ($, loading, libraryMenu, globalize) {
-    'use strict';
+import $ from 'jQuery';
+import loading from 'loading';
+import libraryMenu from 'libraryMenu';
+import globalize from 'globalize';
+
+/* eslint-disable indent */
 
     function loadPage(page, config, users) {
-        var html = '<option value="" selected="selected">' + globalize.translate('OptionNone') + '</option>';
+        let html = '<option value="" selected="selected">' + globalize.translate('OptionNone') + '</option>';
         html += users.map(function (user) {
             return '<option value="' + user.Id + '">' + user.Name + '</option>';
         }).join('');
@@ -16,7 +20,7 @@ define(['jQuery', 'loading', 'libraryMenu', 'globalize'], function ($, loading,
 
     function onSubmit() {
         loading.show();
-        var form = this;
+        const form = this;
         ApiClient.getNamedConfiguration(metadataKey).then(function (config) {
             config.UserId = $('#selectUser', form).val() || null;
             config.ReleaseDateFormat = $('#selectReleaseDateFormat', form).val();
@@ -32,10 +36,10 @@ define(['jQuery', 'loading', 'libraryMenu', 'globalize'], function ($, loading,
     }
 
     function showConfirmMessage(config) {
-        var msg = [];
+        const msg = [];
         msg.push(globalize.translate('MetadataSettingChangeHelp'));
 
-        require(['alert'], function (alert) {
+        import('alert').then(({default: alert}) => {
             alert({
                 text: msg.join('<br/><br/>')
             });
@@ -58,17 +62,18 @@ define(['jQuery', 'loading', 'libraryMenu', 'globalize'], function ($, loading,
         }];
     }
 
-    var metadataKey = 'xbmcmetadata';
+    const metadataKey = 'xbmcmetadata';
     $(document).on('pageinit', '#metadataNfoPage', function () {
         $('.metadataNfoForm').off('submit', onSubmit).on('submit', onSubmit);
     }).on('pageshow', '#metadataNfoPage', function () {
         libraryMenu.setTabs('metadata', 3, getTabs);
         loading.show();
-        var page = this;
-        var promise1 = ApiClient.getUsers();
-        var promise2 = ApiClient.getNamedConfiguration(metadataKey);
+        const page = this;
+        const promise1 = ApiClient.getUsers();
+        const promise2 = ApiClient.getNamedConfiguration(metadataKey);
         Promise.all([promise1, promise2]).then(function (responses) {
             loadPage(page, responses[1], responses[0]);
         });
     });
-});
+
+/* eslint-enable indent */
diff --git a/src/controllers/dashboard/networking.js b/src/controllers/dashboard/networking.js
index 4ddde7f24c..367ab8335c 100644
--- a/src/controllers/dashboard/networking.js
+++ b/src/controllers/dashboard/networking.js
@@ -1,12 +1,17 @@
-define(['loading', 'libraryMenu', 'globalize', 'emby-checkbox', 'emby-select'], function (loading, libraryMenu, globalize) {
-    'use strict';
+import loading from 'loading';
+import libraryMenu from 'libraryMenu';
+import globalize from 'globalize';
+import 'emby-checkbox';
+import 'emby-select';
+
+/* eslint-disable indent */
 
     function onSubmit(e) {
-        var form = this;
-        var localAddress = form.querySelector('#txtLocalAddress').value;
-        var enableUpnp = form.querySelector('#chkEnableUpnp').checked;
+        const form = this;
+        const localAddress = form.querySelector('#txtLocalAddress').value;
+        const enableUpnp = form.querySelector('#chkEnableUpnp').checked;
         confirmSelections(localAddress, enableUpnp, function () {
-            var validationResult = getValidationAlert(form);
+            const validationResult = getValidationAlert(form);
 
             if (validationResult) {
                 showAlertText(validationResult);
@@ -47,7 +52,7 @@ define(['loading', 'libraryMenu', 'globalize', 'emby-checkbox', 'emby-select'],
     }
 
     function triggerChange(select) {
-        var evt = document.createEvent('HTMLEvents');
+        const evt = document.createEvent('HTMLEvents');
         evt.initEvent('change', false, true);
         select.dispatchEvent(evt);
     }
@@ -65,8 +70,8 @@ define(['loading', 'libraryMenu', 'globalize', 'emby-checkbox', 'emby-select'],
     }
 
     function validateHttps(form) {
-        var certPath = form.querySelector('#txtCertificatePath').value || null;
-        var httpsEnabled = form.querySelector('#chkEnableHttps').checked;
+        const certPath = form.querySelector('#txtCertificatePath').value || null;
+        const httpsEnabled = form.querySelector('#chkEnableHttps').checked;
 
         if (httpsEnabled && !certPath) {
             return showAlertText({
@@ -80,7 +85,7 @@ define(['loading', 'libraryMenu', 'globalize', 'emby-checkbox', 'emby-select'],
 
     function showAlertText(options) {
         return new Promise(function (resolve, reject) {
-            require(['alert'], function (alert) {
+            import('alert').then(({default: alert}) => {
                 alert(options).then(resolve, reject);
             });
         });
@@ -97,7 +102,7 @@ define(['loading', 'libraryMenu', 'globalize', 'emby-checkbox', 'emby-select'],
         }
     }
 
-    return function (view, params) {
+    export default function (view, params) {
         function loadPage(page, config) {
             page.querySelector('#txtPortNumber').value = config.HttpServerPortNumber;
             page.querySelector('#txtPublicPort').value = config.PublicPort;
@@ -111,7 +116,7 @@ define(['loading', 'libraryMenu', 'globalize', 'emby-checkbox', 'emby-select'],
             page.querySelector('#chkEnableHttps').checked = config.EnableHttps;
             page.querySelector('#chkRequireHttps').checked = config.RequireHttps;
             page.querySelector('#txtBaseUrl').value = config.BaseUrl || '';
-            var txtCertificatePath = page.querySelector('#txtCertificatePath');
+            const txtCertificatePath = page.querySelector('#txtCertificatePath');
             txtCertificatePath.value = config.CertificatePath || '';
             page.querySelector('#txtCertPassword').value = config.CertificatePassword || '';
             page.querySelector('#chkEnableUpnp').checked = config.EnableUPnP;
@@ -135,8 +140,8 @@ define(['loading', 'libraryMenu', 'globalize', 'emby-checkbox', 'emby-select'],
             }
         });
         view.querySelector('#btnSelectCertPath').addEventListener('click', function () {
-            require(['directorybrowser'], function (directoryBrowser) {
-                var picker = new directoryBrowser();
+            import('directorybrowser').then(({default: directoryBrowser}) => {
+                const picker = new directoryBrowser();
                 picker.show({
                     includeFiles: true,
                     includeDirectories: true,
@@ -158,5 +163,6 @@ define(['loading', 'libraryMenu', 'globalize', 'emby-checkbox', 'emby-select'],
                 loadPage(view, config);
             });
         });
-    };
-});
+    }
+
+/* eslint-enable indent */
diff --git a/src/notificationsetting.html b/src/controllers/dashboard/notifications/notification/index.html
similarity index 100%
rename from src/notificationsetting.html
rename to src/controllers/dashboard/notifications/notification/index.html
diff --git a/src/controllers/dashboard/notifications/notification.js b/src/controllers/dashboard/notifications/notification/index.js
similarity index 94%
rename from src/controllers/dashboard/notifications/notification.js
rename to src/controllers/dashboard/notifications/notification/index.js
index 90d453cdae..af9301c13f 100644
--- a/src/controllers/dashboard/notifications/notification.js
+++ b/src/controllers/dashboard/notifications/notification/index.js
@@ -1,4 +1,4 @@
-define(['jQuery', 'emby-checkbox', 'fnchecked'], function ($) {
+define(['jQuery', 'emby-checkbox'], function ($) {
     'use strict';
 
     function fillItems(elem, items, cssClass, idPrefix, currentList, isEnabledList) {
@@ -50,7 +50,7 @@ define(['jQuery', 'emby-checkbox', 'fnchecked'], function ($) {
             fillItems($('.monitorUsersList', page), users, 'chkMonitor', 'chkMonitor', notificationConfig.DisabledMonitorUsers);
             fillItems($('.sendToUsersList', page), users, 'chkSendTo', 'chkSendTo', notificationConfig.SendToUsers, true);
             fillItems($('.servicesList', page), services, 'chkService', 'chkService', notificationConfig.DisabledServices);
-            $('#chkEnabled', page).checked(notificationConfig.Enabled || false);
+            $('#chkEnabled', page).prop('checked', notificationConfig.Enabled || false);
             $('#selectUsers', page).val(notificationConfig.SendToUserMode).trigger('change');
         });
     }
@@ -58,10 +58,10 @@ define(['jQuery', 'emby-checkbox', 'fnchecked'], function ($) {
     function save(page) {
         var type = getParameterByName('type');
         var promise1 = ApiClient.getNamedConfiguration(notificationsConfigurationKey);
+        // TODO: Check if this promise is really needed, as it's unused.
         var promise2 = ApiClient.getJSON(ApiClient.getUrl('Notifications/Types'));
         Promise.all([promise1, promise2]).then(function (responses) {
             var notificationOptions = responses[0];
-            var types = responses[1];
             var notificationConfig = notificationOptions.Options.filter(function (n) {
                 return n.Type == type;
             })[0];
@@ -73,10 +73,7 @@ define(['jQuery', 'emby-checkbox', 'fnchecked'], function ($) {
                 notificationOptions.Options.push(notificationConfig);
             }
 
-            types.filter(function (n) {
-                return n.Type == type;
-            })[0];
-            notificationConfig.Enabled = $('#chkEnabled', page).checked();
+            notificationConfig.Enabled = $('#chkEnabled', page).is(':checked');
             notificationConfig.SendToUserMode = $('#selectUsers', page).val();
             notificationConfig.DisabledMonitorUsers = $('.chkMonitor', page).get().filter(function (c) {
                 return !c.checked;
diff --git a/src/notificationsettings.html b/src/controllers/dashboard/notifications/notifications/index.html
similarity index 100%
rename from src/notificationsettings.html
rename to src/controllers/dashboard/notifications/notifications/index.html
diff --git a/src/controllers/dashboard/notifications/notifications.js b/src/controllers/dashboard/notifications/notifications/index.js
similarity index 100%
rename from src/controllers/dashboard/notifications/notifications.js
rename to src/controllers/dashboard/notifications/notifications/index.js
diff --git a/src/controllers/dashboard/playback.js b/src/controllers/dashboard/playback.js
index d5b67a2961..0406c21926 100644
--- a/src/controllers/dashboard/playback.js
+++ b/src/controllers/dashboard/playback.js
@@ -1,5 +1,9 @@
-define(['jQuery', 'loading', 'libraryMenu', 'globalize'], function ($, loading, libraryMenu, globalize) {
-    'use strict';
+import $ from 'jQuery';
+import loading from 'loading';
+import libraryMenu from 'libraryMenu';
+import globalize from 'globalize';
+
+/* eslint-disable indent */
 
     function loadPage(page, config) {
         $('#txtMinResumePct', page).val(config.MinResumePct);
@@ -10,7 +14,7 @@ define(['jQuery', 'loading', 'libraryMenu', 'globalize'], function ($, loading,
 
     function onSubmit() {
         loading.show();
-        var form = this;
+        const form = this;
         ApiClient.getServerConfiguration().then(function (config) {
             config.MinResumePct = $('#txtMinResumePct', form).val();
             config.MaxResumePct = $('#txtMaxResumePct', form).val();
@@ -40,9 +44,10 @@ define(['jQuery', 'loading', 'libraryMenu', 'globalize'], function ($, loading,
     }).on('pageshow', '#playbackConfigurationPage', function () {
         loading.show();
         libraryMenu.setTabs('playback', 1, getTabs);
-        var page = this;
+        const page = this;
         ApiClient.getServerConfiguration().then(function (config) {
             loadPage(page, config);
         });
     });
-});
+
+/* eslint-enable indent */
diff --git a/src/addplugin.html b/src/controllers/dashboard/plugins/add/index.html
similarity index 100%
rename from src/addplugin.html
rename to src/controllers/dashboard/plugins/add/index.html
diff --git a/src/controllers/dashboard/plugins/add.js b/src/controllers/dashboard/plugins/add/index.js
similarity index 97%
rename from src/controllers/dashboard/plugins/add.js
rename to src/controllers/dashboard/plugins/add/index.js
index 8b1deb804d..375a0c0ec7 100644
--- a/src/controllers/dashboard/plugins/add.js
+++ b/src/controllers/dashboard/plugins/add/index.js
@@ -91,7 +91,7 @@ define(['jQuery', 'loading', 'libraryMenu', 'globalize', 'connectionManager', 'e
             msg += globalize.translate('PleaseConfirmPluginInstallation');
 
             require(['confirm'], function (confirm) {
-                confirm(msg, globalize.translate('HeaderConfirmPluginInstallation')).then(function () {
+                confirm.default(msg, globalize.translate('HeaderConfirmPluginInstallation')).then(function () {
                     alertCallback();
                 }, function () {
                     console.debug('plugin not installed');
diff --git a/src/availableplugins.html b/src/controllers/dashboard/plugins/available/index.html
similarity index 100%
rename from src/availableplugins.html
rename to src/controllers/dashboard/plugins/available/index.html
diff --git a/src/controllers/dashboard/plugins/available.js b/src/controllers/dashboard/plugins/available/index.js
similarity index 97%
rename from src/controllers/dashboard/plugins/available.js
rename to src/controllers/dashboard/plugins/available/index.js
index 82fea00b58..37df8801b5 100644
--- a/src/controllers/dashboard/plugins/available.js
+++ b/src/controllers/dashboard/plugins/available/index.js
@@ -123,6 +123,9 @@ define(['loading', 'libraryMenu', 'globalize', 'cardStyle', 'emby-button', 'emby
         }, {
             href: 'availableplugins.html',
             name: globalize.translate('TabCatalog')
+        }, {
+            href: 'repositories.html',
+            name: globalize.translate('TabRepositories')
         }];
     }
 
diff --git a/src/installedplugins.html b/src/controllers/dashboard/plugins/installed/index.html
similarity index 100%
rename from src/installedplugins.html
rename to src/controllers/dashboard/plugins/installed/index.html
diff --git a/src/controllers/dashboard/plugins/installed.js b/src/controllers/dashboard/plugins/installed/index.js
similarity index 86%
rename from src/controllers/dashboard/plugins/installed.js
rename to src/controllers/dashboard/plugins/installed/index.js
index 5ca739f711..d28a04cb2b 100644
--- a/src/controllers/dashboard/plugins/installed.js
+++ b/src/controllers/dashboard/plugins/installed/index.js
@@ -5,7 +5,7 @@ define(['loading', 'libraryMenu', 'dom', 'globalize', 'cardStyle', 'emby-button'
         var msg = globalize.translate('UninstallPluginConfirmation', name);
 
         require(['confirm'], function (confirm) {
-            confirm({
+            confirm.default({
                 title: globalize.translate('UninstallPluginHeader'),
                 text: msg,
                 primary: 'delete',
@@ -37,20 +37,24 @@ define(['loading', 'libraryMenu', 'dom', 'globalize', 'cardStyle', 'emby-button'
         })[0];
         var configPageUrl = configPage ? Dashboard.getConfigurationPageUrl(configPage.Name) : null;
         var html = '';
-        html += "<div data-id='" + plugin.Id + "' data-name='" + plugin.Name + "' class='card backdropCard'>";
+        html += "<div data-id='" + plugin.Id + "' data-name='" + plugin.Name + "' data-removable='" + plugin.CanUninstall + "' class='card backdropCard'>";
         html += '<div class="cardBox visualCardBox">';
         html += '<div class="cardScalable">';
         html += '<div class="cardPadder cardPadder-backdrop"></div>';
-        html += configPageUrl ? '<a class="cardContent cardImageContainer" is="emby-linkbutton" href="' + configPageUrl + '">' : '<div class="cardContent noConfigPluginCard noHoverEffect cardImageContainer">';
+        html += configPageUrl ? '<a class="cardContent cardImageContainer" is="emby-linkbutton" href="' + configPageUrl + '">' : '<div class="cardContent noConfigPluginCard noHoverEffect cardImageContainer emby-button">';
         html += '<span class="cardImageIcon material-icons folder"></span>';
         html += configPageUrl ? '</a>' : '</div>';
         html += '</div>';
         html += '<div class="cardFooter">';
-        html += '<div style="text-align:right; float:right;padding-top:5px;">';
-        html += '<button type="button" is="paper-icon-button-light" class="btnCardMenu autoSize"><span class="material-icons more_vert"></span></button>';
-        html += '</div>';
+
+        if (configPage || plugin.CanUninstall) {
+            html += '<div style="text-align:right; float:right;padding-top:5px;">';
+            html += '<button type="button" is="paper-icon-button-light" class="btnCardMenu autoSize"><span class="material-icons more_vert"></span></button>';
+            html += '</div>';
+        }
+
         html += "<div class='cardText'>";
-        html += configPage.DisplayName || plugin.Name;
+        html += configPage && configPage.DisplayName ? configPage.DisplayName : plugin.Name;
         html += '</div>';
         html += "<div class='cardText cardText-secondary'>";
         html += plugin.Version;
@@ -104,6 +108,7 @@ define(['loading', 'libraryMenu', 'dom', 'globalize', 'cardStyle', 'emby-button'
         var card = dom.parentWithClass(elem, 'card');
         var id = card.getAttribute('data-id');
         var name = card.getAttribute('data-name');
+        var removable = card.getAttribute('data-removable');
         var configHref = card.querySelector('.cardContent').getAttribute('href');
         var menuItems = [];
 
@@ -115,11 +120,13 @@ define(['loading', 'libraryMenu', 'dom', 'globalize', 'cardStyle', 'emby-button'
             });
         }
 
-        menuItems.push({
-            name: globalize.translate('ButtonUninstall'),
-            id: 'delete',
-            icon: 'delete'
-        });
+        if (removable === 'true') {
+            menuItems.push({
+                name: globalize.translate('ButtonUninstall'),
+                id: 'delete',
+                icon: 'delete'
+            });
+        }
 
         require(['actionsheet'], function (actionsheet) {
             actionsheet.show({
@@ -153,6 +160,9 @@ define(['loading', 'libraryMenu', 'dom', 'globalize', 'cardStyle', 'emby-button'
         }, {
             href: 'availableplugins.html',
             name: globalize.translate('TabCatalog')
+        }, {
+            href: 'repositories.html',
+            name: globalize.translate('TabRepositories')
         }];
     }
 
diff --git a/src/controllers/dashboard/plugins/repositories/index.html b/src/controllers/dashboard/plugins/repositories/index.html
new file mode 100644
index 0000000000..ff3406fb95
--- /dev/null
+++ b/src/controllers/dashboard/plugins/repositories/index.html
@@ -0,0 +1,19 @@
+<div id="repositories" data-role="page" class="page type-interior withTabs fullWidthContent">
+    <div>
+        <div class="content-primary">
+            <div class="sectionTitleContainer flex align-items-center">
+                <h2 class="sectionTitle">${TabRepositories}</h2>
+                <button is="emby-button" type="button" class="fab btnNewRepository submit" style="margin-left:1em;" title="${ButtonAdd}">
+                    <span class="material-icons add" aria-hidden="true"></span>
+                </button>
+            </div>
+
+            <div id="repositories"></div>
+
+            <div id="none" class="noItemsMessage centerMessage hide">
+                <h1>${MessageNoRepositories}</h1>
+                <p>${MessageAddRepository}</p>
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/src/controllers/dashboard/plugins/repositories/index.js b/src/controllers/dashboard/plugins/repositories/index.js
new file mode 100644
index 0000000000..3087cdd927
--- /dev/null
+++ b/src/controllers/dashboard/plugins/repositories/index.js
@@ -0,0 +1,153 @@
+import loading from 'loading';
+import libraryMenu from 'libraryMenu';
+import globalize from 'globalize';
+import dialogHelper from 'dialogHelper';
+import 'emby-button';
+import 'emby-checkbox';
+import 'emby-select';
+import 'formDialogStyle';
+import 'listViewStyle';
+
+let repositories = [];
+
+function reloadList(page) {
+    loading.show();
+    ApiClient.getJSON(ApiClient.getUrl('Repositories')).then(list => {
+        repositories = list;
+        populateList({
+            listElement: page.querySelector('#repositories'),
+            noneElement: page.querySelector('#none'),
+            repositories: repositories
+        });
+    }).catch(error => {
+        console.error('error loading repositories');
+        page.querySelector('#none').classList.remove('hide');
+        loading.hide();
+    });
+}
+
+function saveList(page) {
+    loading.show();
+    ApiClient.ajax({
+        type: 'POST',
+        url: ApiClient.getUrl('Repositories'),
+        data: JSON.stringify(repositories),
+        contentType: 'application/json'
+    }).then(response => {
+        reloadList(page);
+    }).catch(error => {
+        console.error('error saving repositories');
+        loading.hide();
+    });
+}
+
+function populateList(options) {
+    var html = '';
+
+    html += '<div class="paperList">';
+    for (var i = 0; i < options.repositories.length; i++) {
+        html += getRepositoryHtml(options.repositories[i]);
+    }
+
+    html += '</div>';
+    if (!options.repositories.length) {
+        options.noneElement.classList.remove('hide');
+    }
+
+    options.listElement.innerHTML = html;
+    loading.hide();
+}
+
+function getRepositoryHtml(repository) {
+    var html = '';
+
+    html += '<div class="listItem listItem-border">';
+    html += `<a is="emby-linkbutton" style="margin:0;padding:0" class="clearLink listItemIconContainer" href="${repository.Url}">`;
+    html += '<span class="material-icons listItemIcon open_in_new"></span>';
+    html += '</a>';
+    html += '<div class="listItemBody two-line">';
+    html += `<h3 class="listItemBodyText">${repository.Name}</h3>`;
+    html += `<div class="listItemBodyText secondary">${repository.Url}</div>`;
+    html += '</div>';
+    html += `<button type="button" is="paper-icon-button-light" id="${repository.Url}" class="btnDelete" title="${globalize.translate('ButtonDelete')}"><span class="material-icons delete"></span></button>`;
+    html += '</div>';
+
+    return html;
+}
+
+function getTabs() {
+    return [{
+        href: 'installedplugins.html',
+        name: globalize.translate('TabMyPlugins')
+    }, {
+        href: 'availableplugins.html',
+        name: globalize.translate('TabCatalog')
+    }, {
+        href: 'repositories.html',
+        name: globalize.translate('TabRepositories')
+    }];
+}
+
+export default function(view, params) {
+    view.addEventListener('viewshow', function () {
+        libraryMenu.setTabs('plugins', 2, getTabs);
+        reloadList(this);
+
+        var save = this;
+        $('#repositories', view).on('click', '.btnDelete', function() {
+            var button = this;
+            repositories = repositories.filter(function (r) {
+                return r.Url !== button.id;
+            });
+
+            saveList(save);
+        });
+    });
+
+    view.querySelector('.btnNewRepository').addEventListener('click', () => {
+        let dialog = dialogHelper.createDialog({
+            scrollY: false,
+            size: 'large',
+            modal: false,
+            removeOnClose: true
+        });
+
+        let html = '';
+
+        html += '<div class="formDialogHeader">';
+        html += '<button type="button" is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><span class="material-icons arrow_back"></span></button>';
+        html += `<h3 class="formDialogHeaderTitle">${globalize.translate('HeaderNewRepository')}</h3>`;
+        html += '</div>';
+        html += '<form class="newPluginForm" style="margin:4em">';
+        html += '<div class="inputContainer">';
+        html += `<input is="emby-input" id="txtRepositoryName" label="${globalize.translate('LabelRepositoryName')}" type="text" required />`;
+        html += `<div class="fieldDescription">${globalize.translate('LabelRepositoryNameHelp')}</div>`;
+        html += '</div>';
+        html += '<div class="inputContainer">';
+        html += `<input is="emby-input" id="txtRepositoryUrl" label="${globalize.translate('LabelRepositoryUrl')}" type="url" required />`;
+        html += `<div class="fieldDescription">${globalize.translate('LabelRepositoryUrlHelp')}</div>`;
+        html += '</div>';
+        html += `<button is="emby-button" type="submit" class="raised button-submit block"><span>${globalize.translate('ButtonSave')}</span></button>`;
+        html += '</div>';
+        html += '</form>';
+
+        dialog.innerHTML = html;
+        dialog.querySelector('.btnCancel').addEventListener('click', () => {
+            dialogHelper.close(dialog);
+        });
+
+        dialog.querySelector('.newPluginForm').addEventListener('submit', () => {
+            repositories.push({
+                Name: dialog.querySelector('#txtRepositoryName').value,
+                Url: dialog.querySelector('#txtRepositoryUrl').value,
+                Enabled: true
+            });
+
+            saveList(view);
+            dialogHelper.close(dialog);
+            return false;
+        });
+
+        dialogHelper.open(dialog);
+    });
+}
diff --git a/src/controllers/dashboard/scheduledtasks/scheduledtask.js b/src/controllers/dashboard/scheduledtasks/scheduledtask.js
index 52050d1f80..fe214fef63 100644
--- a/src/controllers/dashboard/scheduledtasks/scheduledtask.js
+++ b/src/controllers/dashboard/scheduledtasks/scheduledtask.js
@@ -1,11 +1,19 @@
-define(['jQuery', 'loading', 'datetime', 'dom', 'globalize', 'emby-input', 'emby-button', 'emby-select'], function ($, loading, datetime, dom, globalize) {
-    'use strict';
+import $ from 'jQuery';
+import loading from 'loading';
+import datetime from 'datetime';
+import dom from 'dom';
+import globalize from 'globalize';
+import 'emby-input';
+import 'emby-button';
+import 'emby-select';
+
+/* eslint-disable indent */
 
     function fillTimeOfDay(select) {
 
-        var options = [];
+        const options = [];
 
-        for (var i = 0; i < 86400000; i += 900000) {
+        for (let i = 0; i < 86400000; i += 900000) {
             options.push({
                 name: ScheduledTaskPage.getDisplayTime(i * 10000),
                 value: i * 10000
@@ -18,15 +26,15 @@ define(['jQuery', 'loading', 'datetime', 'dom', 'globalize', 'emby-input', 'emby
     }
 
     Array.prototype.remove = function (from, to) {
-        var rest = this.slice((to || from) + 1 || this.length);
+        const rest = this.slice((to || from) + 1 || this.length);
         this.length = from < 0 ? this.length + from : from;
         return this.push.apply(this, rest);
     };
 
-    var ScheduledTaskPage = {
+    const ScheduledTaskPage = {
         refreshScheduledTask: function (view) {
             loading.show();
-            var id = getParameterByName('id');
+            let id = getParameterByName('id');
             ApiClient.getScheduledTask(id).then(function (task) {
                 ScheduledTaskPage.loadScheduledTask(view, task);
             });
@@ -35,18 +43,18 @@ define(['jQuery', 'loading', 'datetime', 'dom', 'globalize', 'emby-input', 'emby
             $('.taskName', view).html(task.Name);
             $('#pTaskDescription', view).html(task.Description);
 
-            require(['listViewStyle'], function () {
+            import('listViewStyle').then(() => {
                 ScheduledTaskPage.loadTaskTriggers(view, task);
             });
 
             loading.hide();
         },
         loadTaskTriggers: function (context, task) {
-            var html = '';
+            let html = '';
             html += '<div class="paperList">';
 
-            for (var i = 0, length = task.Triggers.length; i < length; i++) {
-                var trigger = task.Triggers[i];
+            for (let i = 0, length = task.Triggers.length; i < length; i++) {
+                const trigger = task.Triggers[i];
 
                 html += '<div class="listItem listItem-border">';
                 html += '<span class="material-icons listItemIcon schedule"></span>';
@@ -58,7 +66,7 @@ define(['jQuery', 'loading', 'datetime', 'dom', 'globalize', 'emby-input', 'emby
                 html += "<div class='listItemBodyText'>" + ScheduledTaskPage.getTriggerFriendlyName(trigger) + '</div>';
                 if (trigger.MaxRuntimeMs) {
                     html += '<div class="listItemBodyText secondary">';
-                    var hours = trigger.MaxRuntimeTicks / 36e9;
+                    const hours = trigger.MaxRuntimeTicks / 36e9;
                     if (hours == 1) {
                         html += globalize.translate('ValueTimeLimitSingleHour');
                     } else {
@@ -92,7 +100,7 @@ define(['jQuery', 'loading', 'datetime', 'dom', 'globalize', 'emby-input', 'emby
 
             if (trigger.Type == 'IntervalTrigger') {
 
-                var hours = trigger.IntervalTicks / 36e9;
+                const hours = trigger.IntervalTicks / 36e9;
 
                 if (hours == 0.25) {
                     return globalize.translate('EveryXMinutes', '15');
@@ -117,8 +125,8 @@ define(['jQuery', 'loading', 'datetime', 'dom', 'globalize', 'emby-input', 'emby
             return trigger.Type;
         },
         getDisplayTime: function (ticks) {
-            var ms = ticks / 1e4;
-            var now = new Date();
+            const ms = ticks / 1e4;
+            const now = new Date();
             now.setHours(0, 0, 0, 0);
             now.setTime(now.getTime() + ms);
             return datetime.getDisplayTime(now);
@@ -129,15 +137,15 @@ define(['jQuery', 'loading', 'datetime', 'dom', 'globalize', 'emby-input', 'emby
             $('#popupAddTrigger', view).removeClass('hide');
         },
         confirmDeleteTrigger: function (view, index) {
-            require(['confirm'], function (confirm) {
-                confirm(globalize.translate('MessageDeleteTaskTrigger'), globalize.translate('HeaderDeleteTaskTrigger')).then(function () {
+            import('confirm').then(({default: confirm}) => {
+                confirm.default(globalize.translate('MessageDeleteTaskTrigger'), globalize.translate('HeaderDeleteTaskTrigger')).then(function () {
                     ScheduledTaskPage.deleteTrigger(view, index);
                 });
             });
         },
         deleteTrigger: function (view, index) {
             loading.show();
-            var id = getParameterByName('id');
+            let id = getParameterByName('id');
             ApiClient.getScheduledTask(id).then(function (task) {
                 task.Triggers.remove(index);
                 ApiClient.updateScheduledTaskTriggers(task.Id, task.Triggers).then(function () {
@@ -179,7 +187,7 @@ define(['jQuery', 'loading', 'datetime', 'dom', 'globalize', 'emby-input', 'emby
             }
         },
         getTriggerToAdd: function (page) {
-            var trigger = {
+            const trigger = {
                 Type: $('#selectTriggerType', page).val()
             };
 
@@ -194,7 +202,7 @@ define(['jQuery', 'loading', 'datetime', 'dom', 'globalize', 'emby-input', 'emby
                 trigger.IntervalTicks = $('#selectInterval', page).val();
             }
 
-            var timeLimit = $('#txtTimeLimit', page).val() || '0';
+            let timeLimit = $('#txtTimeLimit', page).val() || '0';
             timeLimit = parseFloat(timeLimit) * 3600000;
 
             trigger.MaxRuntimeMs = timeLimit || null;
@@ -202,10 +210,10 @@ define(['jQuery', 'loading', 'datetime', 'dom', 'globalize', 'emby-input', 'emby
             return trigger;
         }
     };
-    return function (view, params) {
+    export default function (view, params) {
         function onSubmit(e) {
             loading.show();
-            var id = getParameterByName('id');
+            let id = getParameterByName('id');
             ApiClient.getScheduledTask(id).then(function (task) {
                 task.Triggers.push(ScheduledTaskPage.getTriggerToAdd(view));
                 ApiClient.updateScheduledTaskTriggers(task.Id, task.Triggers).then(function () {
@@ -226,7 +234,7 @@ define(['jQuery', 'loading', 'datetime', 'dom', 'globalize', 'emby-input', 'emby
             ScheduledTaskPage.showAddTriggerPopup(view);
         });
         view.addEventListener('click', function (e) {
-            var btnDeleteTrigger = dom.parentWithClass(e.target, 'btnDeleteTrigger');
+            const btnDeleteTrigger = dom.parentWithClass(e.target, 'btnDeleteTrigger');
 
             if (btnDeleteTrigger) {
                 ScheduledTaskPage.confirmDeleteTrigger(view, parseInt(btnDeleteTrigger.getAttribute('data-index')));
@@ -235,5 +243,6 @@ define(['jQuery', 'loading', 'datetime', 'dom', 'globalize', 'emby-input', 'emby
         view.addEventListener('viewshow', function () {
             ScheduledTaskPage.refreshScheduledTask(view);
         });
-    };
-});
+    }
+
+/* eslint-enable indent */
diff --git a/src/controllers/dashboard/scheduledtasks/scheduledtasks.js b/src/controllers/dashboard/scheduledtasks/scheduledtasks.js
index 5ce53cf6fe..af96f34c15 100644
--- a/src/controllers/dashboard/scheduledtasks/scheduledtasks.js
+++ b/src/controllers/dashboard/scheduledtasks/scheduledtasks.js
@@ -1,5 +1,14 @@
-define(['jQuery', 'loading', 'events', 'globalize', 'serverNotifications', 'date-fns', 'dfnshelper', 'listViewStyle', 'emby-button'], function ($, loading, events, globalize, serverNotifications, datefns, dfnshelper) {
-    'use strict';
+import $ from 'jQuery';
+import loading from 'loading';
+import events from 'events';
+import globalize from 'globalize';
+import serverNotifications from 'serverNotifications';
+import * as datefns from 'date-fns';
+import dfnshelper from 'dfnshelper';
+import 'listViewStyle';
+import 'emby-button';
+
+/* eslint-disable indent */
 
     function reloadList(page) {
         ApiClient.getScheduledTasks({
@@ -17,10 +26,10 @@ define(['jQuery', 'loading', 'events', 'globalize', 'serverNotifications', 'date
             return a == b ? 0 : a < b ? -1 : 1;
         });
 
-        var currentCategory;
-        var html = '';
-        for (var i = 0; i < tasks.length; i++) {
-            var task = tasks[i];
+        let currentCategory;
+        let html = '';
+        for (let i = 0; i < tasks.length; i++) {
+            const task = tasks[i];
             if (task.Category != currentCategory) {
                 currentCategory = task.Category;
                 if (currentCategory) {
@@ -63,11 +72,11 @@ define(['jQuery', 'loading', 'events', 'globalize', 'serverNotifications', 'date
     }
 
     function getTaskProgressHtml(task) {
-        var html = '';
+        let html = '';
         if (task.State === 'Idle') {
             if (task.LastExecutionResult) {
-                var endtime = Date.parse(task.LastExecutionResult.EndTimeUtc);
-                var starttime = Date.parse(task.LastExecutionResult.StartTimeUtc);
+                const endtime = Date.parse(task.LastExecutionResult.EndTimeUtc);
+                const starttime = Date.parse(task.LastExecutionResult.StartTimeUtc);
                 html += globalize.translate('LabelScheduledTaskLastRan', datefns.formatDistanceToNow(endtime, dfnshelper.localeWithSuffix),
                     datefns.formatDistance(starttime, endtime, { locale: dfnshelper.getLocale() }));
                 if (task.LastExecutionResult.Status === 'Failed') {
@@ -79,7 +88,7 @@ define(['jQuery', 'loading', 'events', 'globalize', 'serverNotifications', 'date
                 }
             }
         } else if (task.State === 'Running') {
-            var progress = (task.CurrentProgressPercentage || 0).toFixed(1);
+            const progress = (task.CurrentProgressPercentage || 0).toFixed(1);
             html += '<div style="display:flex;align-items:center;">';
             html += '<div class="taskProgressOuter" title="' + progress + '%" style="flex-grow:1;">';
             html += '<div class="taskProgressInner" style="width:' + progress + '%;">';
@@ -94,7 +103,7 @@ define(['jQuery', 'loading', 'events', 'globalize', 'serverNotifications', 'date
     }
 
     function setTaskButtonIcon(button, icon) {
-        var inner = button.querySelector('.material-icons');
+        let inner = button.querySelector('.material-icons');
         inner.classList.remove('stop', 'play_arrow');
         inner.classList.add(icon);
     }
@@ -114,10 +123,10 @@ define(['jQuery', 'loading', 'events', 'globalize', 'serverNotifications', 'date
         $(elem).parents('.listItem')[0].setAttribute('data-status', state);
     }
 
-    return function(view, params) {
+    export default function(view, params) {
         function updateTasks(tasks) {
-            for (var i = 0; i < tasks.length; i++) {
-                var task = tasks[i];
+            for (let i = 0; i < tasks.length; i++) {
+                const task = tasks[i];
                 view.querySelector('#taskProgress' + task.Id).innerHTML = getTaskProgressHtml(task);
                 updateTaskButton(view.querySelector('#btnTask' + task.Id), task.State);
             }
@@ -146,12 +155,12 @@ define(['jQuery', 'loading', 'events', 'globalize', 'serverNotifications', 'date
             pollInterval && clearInterval(pollInterval);
         }
 
-        var pollInterval;
-        var serverId = ApiClient.serverId();
+        let pollInterval;
+        const serverId = ApiClient.serverId();
 
         $('.divScheduledTasks', view).on('click', '.btnStartTask', function() {
-            var button = this;
-            var id = button.getAttribute('data-taskid');
+            const button = this;
+            let id = button.getAttribute('data-taskid');
             ApiClient.startScheduledTask(id).then(function() {
                 updateTaskButton(button, 'Running');
                 reloadList(view);
@@ -159,8 +168,8 @@ define(['jQuery', 'loading', 'events', 'globalize', 'serverNotifications', 'date
         });
 
         $('.divScheduledTasks', view).on('click', '.btnStopTask', function() {
-            var button = this;
-            var id = button.getAttribute('data-taskid');
+            const button = this;
+            let id = button.getAttribute('data-taskid');
             ApiClient.stopScheduledTask(id).then(function() {
                 updateTaskButton(button, '');
                 reloadList(view);
@@ -178,5 +187,6 @@ define(['jQuery', 'loading', 'events', 'globalize', 'serverNotifications', 'date
             reloadList(view);
             events.on(serverNotifications, 'ScheduledTasksInfo', onScheduledTasksUpdate);
         });
-    };
-});
+    }
+
+/* eslint-enable indent */
diff --git a/src/controllers/dashboard/serveractivity.js b/src/controllers/dashboard/serveractivity.js
index c48a2903ae..ed56126267 100644
--- a/src/controllers/dashboard/serveractivity.js
+++ b/src/controllers/dashboard/serveractivity.js
@@ -1,8 +1,10 @@
-define(['components/activitylog', 'globalize'], function (ActivityLog, globalize) {
-    'use strict';
+import ActivityLog from 'components/activitylog';
+import globalize from 'globalize';
 
-    return function (view, params) {
-        var activityLog;
+/* eslint-disable indent */
+
+    export default function (view, params) {
+        let activityLog;
 
         if (params.useractivity !== 'false') {
             view.querySelector('.activityItems').setAttribute('data-useractivity', 'true');
@@ -27,5 +29,6 @@ define(['components/activitylog', 'globalize'], function (ActivityLog, globalize
 
             activityLog = null;
         });
-    };
-});
+    }
+
+/* eslint-enable indent */
diff --git a/src/controllers/dashboard/streaming.js b/src/controllers/dashboard/streaming.js
index 37afe5a054..c54fbea472 100644
--- a/src/controllers/dashboard/streaming.js
+++ b/src/controllers/dashboard/streaming.js
@@ -1,5 +1,9 @@
-define(['jQuery', 'libraryMenu', 'loading', 'globalize'], function ($, libraryMenu, loading, globalize) {
-    'use strict';
+import $ from 'jQuery';
+import libraryMenu from 'libraryMenu';
+import loading from 'loading';
+import globalize from 'globalize';
+
+/* eslint-disable indent */
 
     function loadPage(page, config) {
         $('#txtRemoteClientBitrateLimit', page).val(config.RemoteClientBitrateLimit / 1e6 || '');
@@ -8,7 +12,7 @@ define(['jQuery', 'libraryMenu', 'loading', 'globalize'], function ($, libraryMe
 
     function onSubmit() {
         loading.show();
-        var form = this;
+        const form = this;
         ApiClient.getServerConfiguration().then(function (config) {
             config.RemoteClientBitrateLimit = parseInt(1e6 * parseFloat($('#txtRemoteClientBitrateLimit', form).val() || '0'));
             ApiClient.updateServerConfiguration(config).then(Dashboard.processServerConfigurationUpdateResult);
@@ -35,9 +39,10 @@ define(['jQuery', 'libraryMenu', 'loading', 'globalize'], function ($, libraryMe
     }).on('pageshow', '#streamingSettingsPage', function () {
         loading.show();
         libraryMenu.setTabs('playback', 2, getTabs);
-        var page = this;
+        const page = this;
         ApiClient.getServerConfiguration().then(function (config) {
             loadPage(page, config);
         });
     });
-});
+
+/* eslint-enable indent */
diff --git a/src/controllers/dashboard/users/useredit.js b/src/controllers/dashboard/users/useredit.js
index 125c571362..866e940e54 100644
--- a/src/controllers/dashboard/users/useredit.js
+++ b/src/controllers/dashboard/users/useredit.js
@@ -1,33 +1,32 @@
-define(['jQuery', 'loading', 'libraryMenu', 'globalize', 'fnchecked'], function ($, loading, libraryMenu, globalize) {
-    'use strict';
+import $ from 'jQuery';
+import loading from 'loading';
+import libraryMenu from 'libraryMenu';
+import globalize from 'globalize';
+
+/* eslint-disable indent */
 
     function loadDeleteFolders(page, user, mediaFolders) {
         ApiClient.getJSON(ApiClient.getUrl('Channels', {
             SupportsMediaDeletion: true
         })).then(function (channelsResult) {
-            var i;
-            var length;
-            var folder;
-            var isChecked;
-            var checkedAttribute;
-            var html = '';
+            let isChecked;
+            let checkedAttribute;
+            let html = '';
 
-            for (i = 0, length = mediaFolders.length; i < length; i++) {
-                folder = mediaFolders[i];
+            for (const folder of mediaFolders) {
                 isChecked = user.Policy.EnableContentDeletion || -1 != user.Policy.EnableContentDeletionFromFolders.indexOf(folder.Id);
                 checkedAttribute = isChecked ? ' checked="checked"' : '';
                 html += '<label><input type="checkbox" is="emby-checkbox" class="chkFolder" data-id="' + folder.Id + '" ' + checkedAttribute + '><span>' + folder.Name + '</span></label>';
             }
 
-            for (i = 0, length = channelsResult.Items.length; i < length; i++) {
-                folder = channelsResult.Items[i];
+            for (const folder of channelsResult.Items) {
                 isChecked = user.Policy.EnableContentDeletion || -1 != user.Policy.EnableContentDeletionFromFolders.indexOf(folder.Id);
                 checkedAttribute = isChecked ? ' checked="checked"' : '';
                 html += '<label><input type="checkbox" is="emby-checkbox" class="chkFolder" data-id="' + folder.Id + '" ' + checkedAttribute + '><span>' + folder.Name + '</span></label>';
             }
 
             $('.deleteAccess', page).html(html).trigger('create');
-            $('#chkEnableDeleteAllFolders', page).checked(user.Policy.EnableContentDeletion).trigger('change');
+            $('#chkEnableDeleteAllFolders', page).prop('checked', user.Policy.EnableContentDeletion);
         });
     }
 
@@ -38,9 +37,9 @@ define(['jQuery', 'loading', 'libraryMenu', 'globalize', 'fnchecked'], function
             page.querySelector('.fldSelectLoginProvider').classList.add('hide');
         }
 
-        var currentProviderId = user.Policy.AuthenticationProviderId;
+        const currentProviderId = user.Policy.AuthenticationProviderId;
         page.querySelector('.selectLoginProvider').innerHTML = providers.map(function (provider) {
-            var selected = provider.Id === currentProviderId || providers.length < 2 ? ' selected' : '';
+            const selected = provider.Id === currentProviderId || providers.length < 2 ? ' selected' : '';
             return '<option value="' + provider.Id + '"' + selected + '>' + provider.Name + '</option>';
         });
     }
@@ -52,15 +51,14 @@ define(['jQuery', 'loading', 'libraryMenu', 'globalize', 'fnchecked'], function
             page.querySelector('.fldSelectPasswordResetProvider').classList.add('hide');
         }
 
-        var currentProviderId = user.Policy.PasswordResetProviderId;
+        const currentProviderId = user.Policy.PasswordResetProviderId;
         page.querySelector('.selectPasswordResetProvider').innerHTML = providers.map(function (provider) {
-            var selected = provider.Id === currentProviderId || providers.length < 2 ? ' selected' : '';
+            const selected = provider.Id === currentProviderId || providers.length < 2 ? ' selected' : '';
             return '<option value="' + provider.Id + '"' + selected + '>' + provider.Name + '</option>';
         });
     }
 
     function loadUser(page, user) {
-        currentUser = user;
         ApiClient.getJSON(ApiClient.getUrl('Auth/Providers')).then(function (providers) {
             loadAuthProviders(page, user, providers);
         });
@@ -85,26 +83,28 @@ define(['jQuery', 'loading', 'libraryMenu', 'globalize', 'fnchecked'], function
         libraryMenu.setTitle(user.Name);
         page.querySelector('.username').innerHTML = user.Name;
         $('#txtUserName', page).val(user.Name);
-        $('#chkIsAdmin', page).checked(user.Policy.IsAdministrator);
-        $('#chkDisabled', page).checked(user.Policy.IsDisabled);
-        $('#chkIsHidden', page).checked(user.Policy.IsHidden);
-        $('#chkRemoteControlSharedDevices', page).checked(user.Policy.EnableSharedDeviceControl);
-        $('#chkEnableRemoteControlOtherUsers', page).checked(user.Policy.EnableRemoteControlOfOtherUsers);
-        $('#chkEnableDownloading', page).checked(user.Policy.EnableContentDownloading);
-        $('#chkManageLiveTv', page).checked(user.Policy.EnableLiveTvManagement);
-        $('#chkEnableLiveTvAccess', page).checked(user.Policy.EnableLiveTvAccess);
-        $('#chkEnableMediaPlayback', page).checked(user.Policy.EnableMediaPlayback);
-        $('#chkEnableAudioPlaybackTranscoding', page).checked(user.Policy.EnableAudioPlaybackTranscoding);
-        $('#chkEnableVideoPlaybackTranscoding', page).checked(user.Policy.EnableVideoPlaybackTranscoding);
-        $('#chkEnableVideoPlaybackRemuxing', page).checked(user.Policy.EnablePlaybackRemuxing);
-        $('#chkForceRemoteSourceTranscoding', page).checked(user.Policy.ForceRemoteSourceTranscoding);
-        $('#chkRemoteAccess', page).checked(null == user.Policy.EnableRemoteAccess || user.Policy.EnableRemoteAccess);
-        $('#chkEnableSyncTranscoding', page).checked(user.Policy.EnableSyncTranscoding);
-        $('#chkEnableConversion', page).checked(user.Policy.EnableMediaConversion || false);
-        $('#chkEnableSharing', page).checked(user.Policy.EnablePublicSharing);
+        $('#chkIsAdmin', page).prop('checked', user.Policy.IsAdministrator);
+        $('#chkDisabled', page).prop('checked', user.Policy.IsDisabled);
+        $('#chkIsHidden', page).prop('checked', user.Policy.IsHidden);
+        $('#chkRemoteControlSharedDevices', page).prop('checked', user.Policy.EnableSharedDeviceControl);
+        $('#chkEnableRemoteControlOtherUsers', page).prop('checked', user.Policy.EnableRemoteControlOfOtherUsers);
+        $('#chkEnableDownloading', page).prop('checked', user.Policy.EnableContentDownloading);
+        $('#chkManageLiveTv', page).prop('checked', user.Policy.EnableLiveTvManagement);
+        $('#chkEnableLiveTvAccess', page).prop('checked', user.Policy.EnableLiveTvAccess);
+        $('#chkEnableMediaPlayback', page).prop('checked', user.Policy.EnableMediaPlayback);
+        $('#chkEnableAudioPlaybackTranscoding', page).prop('checked', user.Policy.EnableAudioPlaybackTranscoding);
+        $('#chkEnableVideoPlaybackTranscoding', page).prop('checked', user.Policy.EnableVideoPlaybackTranscoding);
+        $('#chkEnableVideoPlaybackRemuxing', page).prop('checked', user.Policy.EnablePlaybackRemuxing);
+        $('#chkForceRemoteSourceTranscoding', page).prop('checked', user.Policy.ForceRemoteSourceTranscoding);
+        $('#chkRemoteAccess', page).prop('checked', null == user.Policy.EnableRemoteAccess || user.Policy.EnableRemoteAccess);
+        $('#chkEnableSyncTranscoding', page).prop('checked', user.Policy.EnableSyncTranscoding);
+        $('#chkEnableConversion', page).prop('checked', user.Policy.EnableMediaConversion || false);
+        $('#chkEnableSharing', page).prop('checked', user.Policy.EnablePublicSharing);
         $('#txtRemoteClientBitrateLimit', page).val(user.Policy.RemoteClientBitrateLimit / 1e6 || '');
         $('#txtLoginAttemptsBeforeLockout', page).val(user.Policy.LoginAttemptsBeforeLockout || '0');
-        $('#selectSyncPlayAccess').val(user.Policy.SyncPlayAccess);
+        if (ApiClient.isMinServerVersion('10.6.0')) {
+            $('#selectSyncPlayAccess').val(user.Policy.SyncPlayAccess);
+        }
         loading.hide();
     }
 
@@ -112,41 +112,43 @@ define(['jQuery', 'loading', 'libraryMenu', 'globalize', 'fnchecked'], function
         Dashboard.navigate('userprofiles.html');
         loading.hide();
 
-        require(['toast'], function (toast) {
+        import('toast').then(({default: toast}) => {
             toast(globalize.translate('SettingsSaved'));
         });
     }
 
     function saveUser(user, page) {
         user.Name = $('#txtUserName', page).val();
-        user.Policy.IsAdministrator = $('#chkIsAdmin', page).checked();
-        user.Policy.IsHidden = $('#chkIsHidden', page).checked();
-        user.Policy.IsDisabled = $('#chkDisabled', page).checked();
-        user.Policy.EnableRemoteControlOfOtherUsers = $('#chkEnableRemoteControlOtherUsers', page).checked();
-        user.Policy.EnableLiveTvManagement = $('#chkManageLiveTv', page).checked();
-        user.Policy.EnableLiveTvAccess = $('#chkEnableLiveTvAccess', page).checked();
-        user.Policy.EnableSharedDeviceControl = $('#chkRemoteControlSharedDevices', page).checked();
-        user.Policy.EnableMediaPlayback = $('#chkEnableMediaPlayback', page).checked();
-        user.Policy.EnableAudioPlaybackTranscoding = $('#chkEnableAudioPlaybackTranscoding', page).checked();
-        user.Policy.EnableVideoPlaybackTranscoding = $('#chkEnableVideoPlaybackTranscoding', page).checked();
-        user.Policy.EnablePlaybackRemuxing = $('#chkEnableVideoPlaybackRemuxing', page).checked();
-        user.Policy.ForceRemoteSourceTranscoding = $('#chkForceRemoteSourceTranscoding', page).checked();
-        user.Policy.EnableContentDownloading = $('#chkEnableDownloading', page).checked();
-        user.Policy.EnableSyncTranscoding = $('#chkEnableSyncTranscoding', page).checked();
-        user.Policy.EnableMediaConversion = $('#chkEnableConversion', page).checked();
-        user.Policy.EnablePublicSharing = $('#chkEnableSharing', page).checked();
-        user.Policy.EnableRemoteAccess = $('#chkRemoteAccess', page).checked();
+        user.Policy.IsAdministrator = $('#chkIsAdmin', page).is(':checked');
+        user.Policy.IsHidden = $('#chkIsHidden', page).is(':checked');
+        user.Policy.IsDisabled = $('#chkDisabled', page).is(':checked');
+        user.Policy.EnableRemoteControlOfOtherUsers = $('#chkEnableRemoteControlOtherUsers', page).is(':checked');
+        user.Policy.EnableLiveTvManagement = $('#chkManageLiveTv', page).is(':checked');
+        user.Policy.EnableLiveTvAccess = $('#chkEnableLiveTvAccess', page).is(':checked');
+        user.Policy.EnableSharedDeviceControl = $('#chkRemoteControlSharedDevices', page).is(':checked');
+        user.Policy.EnableMediaPlayback = $('#chkEnableMediaPlayback', page).is(':checked');
+        user.Policy.EnableAudioPlaybackTranscoding = $('#chkEnableAudioPlaybackTranscoding', page).is(':checked');
+        user.Policy.EnableVideoPlaybackTranscoding = $('#chkEnableVideoPlaybackTranscoding', page).is(':checked');
+        user.Policy.EnablePlaybackRemuxing = $('#chkEnableVideoPlaybackRemuxing', page).is(':checked');
+        user.Policy.ForceRemoteSourceTranscoding = $('#chkForceRemoteSourceTranscoding', page).is(':checked');
+        user.Policy.EnableContentDownloading = $('#chkEnableDownloading', page).is(':checked');
+        user.Policy.EnableSyncTranscoding = $('#chkEnableSyncTranscoding', page).is(':checked');
+        user.Policy.EnableMediaConversion = $('#chkEnableConversion', page).is(':checked');
+        user.Policy.EnablePublicSharing = $('#chkEnableSharing', page).is(':checked');
+        user.Policy.EnableRemoteAccess = $('#chkRemoteAccess', page).is(':checked');
         user.Policy.RemoteClientBitrateLimit = parseInt(1e6 * parseFloat($('#txtRemoteClientBitrateLimit', page).val() || '0'));
         user.Policy.LoginAttemptsBeforeLockout = parseInt($('#txtLoginAttemptsBeforeLockout', page).val() || '0');
         user.Policy.AuthenticationProviderId = page.querySelector('.selectLoginProvider').value;
         user.Policy.PasswordResetProviderId = page.querySelector('.selectPasswordResetProvider').value;
-        user.Policy.EnableContentDeletion = $('#chkEnableDeleteAllFolders', page).checked();
+        user.Policy.EnableContentDeletion = $('#chkEnableDeleteAllFolders', page).is(':checked');
         user.Policy.EnableContentDeletionFromFolders = user.Policy.EnableContentDeletion ? [] : $('.chkFolder', page).get().filter(function (c) {
             return c.checked;
         }).map(function (c) {
             return c.getAttribute('data-id');
         });
-        user.Policy.SyncPlayAccess = page.querySelector('#selectSyncPlayAccess').value;
+        if (ApiClient.isMinServerVersion('10.6.0')) {
+            user.Policy.SyncPlayAccess = page.querySelector('#selectSyncPlayAccess').value;
+        }
         ApiClient.updateUser(user).then(function () {
             ApiClient.updateUserPolicy(user.Id, user.Policy).then(function () {
                 onSaveComplete(page, user);
@@ -155,7 +157,7 @@ define(['jQuery', 'loading', 'libraryMenu', 'globalize', 'fnchecked'], function
     }
 
     function onSubmit() {
-        var page = $(this).parents('.page')[0];
+        const page = $(this).parents('.page')[0];
         loading.show();
         getUser().then(function (result) {
             saveUser(result, page);
@@ -164,7 +166,7 @@ define(['jQuery', 'loading', 'libraryMenu', 'globalize', 'fnchecked'], function
     }
 
     function getUser() {
-        var userId = getParameterByName('userId');
+        const userId = getParameterByName('userId');
         return ApiClient.getUser(userId);
     }
 
@@ -175,11 +177,10 @@ define(['jQuery', 'loading', 'libraryMenu', 'globalize', 'fnchecked'], function
         });
     }
 
-    var currentUser;
     $(document).on('pageinit', '#editUserPage', function () {
         $('.editUserProfileForm').off('submit', onSubmit).on('submit', onSubmit);
         this.querySelector('.sharingHelp').innerHTML = globalize.translate('OptionAllowLinkSharingHelp', 30);
-        var page = this;
+        const page = this;
         $('#chkEnableDeleteAllFolders', this).on('change', function () {
             if (this.checked) {
                 $('.deleteAccess', page).hide();
@@ -197,4 +198,5 @@ define(['jQuery', 'loading', 'libraryMenu', 'globalize', 'fnchecked'], function
     }).on('pagebeforeshow', '#editUserPage', function () {
         loadData(this);
     });
-});
+
+/* eslint-enable indent */
diff --git a/src/controllers/dashboard/users/userlibraryaccess.js b/src/controllers/dashboard/users/userlibraryaccess.js
index 95664c1eb3..df42733f0c 100644
--- a/src/controllers/dashboard/users/userlibraryaccess.js
+++ b/src/controllers/dashboard/users/userlibraryaccess.js
@@ -1,40 +1,44 @@
-define(['jQuery', 'loading', 'libraryMenu', 'globalize', 'fnchecked'], function ($, loading, libraryMenu, globalize) {
-    'use strict';
+import $ from 'jQuery';
+import loading from 'loading';
+import libraryMenu from 'libraryMenu';
+import globalize from 'globalize';
+
+/* eslint-disable indent */
 
     function triggerChange(select) {
-        var evt = document.createEvent('HTMLEvents');
+        const evt = document.createEvent('HTMLEvents');
         evt.initEvent('change', false, true);
         select.dispatchEvent(evt);
     }
 
     function loadMediaFolders(page, user, mediaFolders) {
-        var html = '';
+        let html = '';
         html += '<h3 class="checkboxListLabel">' + globalize.translate('HeaderLibraries') + '</h3>';
         html += '<div class="checkboxList paperList checkboxList-paperList">';
 
-        for (var i = 0, length = mediaFolders.length; i < length; i++) {
-            var folder = mediaFolders[i];
-            var isChecked = user.Policy.EnableAllFolders || -1 != user.Policy.EnabledFolders.indexOf(folder.Id);
-            var checkedAttribute = isChecked ? ' checked="checked"' : '';
+        for (let i = 0, length = mediaFolders.length; i < length; i++) {
+            const folder = mediaFolders[i];
+            const isChecked = user.Policy.EnableAllFolders || -1 != user.Policy.EnabledFolders.indexOf(folder.Id);
+            const checkedAttribute = isChecked ? ' checked="checked"' : '';
             html += '<label><input type="checkbox" is="emby-checkbox" class="chkFolder" data-id="' + folder.Id + '" ' + checkedAttribute + '><span>' + folder.Name + '</span></label>';
         }
 
         html += '</div>';
         page.querySelector('.folderAccess').innerHTML = html;
-        var chkEnableAllFolders = page.querySelector('#chkEnableAllFolders');
+        const chkEnableAllFolders = page.querySelector('#chkEnableAllFolders');
         chkEnableAllFolders.checked = user.Policy.EnableAllFolders;
         triggerChange(chkEnableAllFolders);
     }
 
     function loadChannels(page, user, channels) {
-        var html = '';
+        let html = '';
         html += '<h3 class="checkboxListLabel">' + globalize.translate('HeaderChannels') + '</h3>';
         html += '<div class="checkboxList paperList checkboxList-paperList">';
 
-        for (var i = 0, length = channels.length; i < length; i++) {
-            var folder = channels[i];
-            var isChecked = user.Policy.EnableAllChannels || -1 != user.Policy.EnabledChannels.indexOf(folder.Id);
-            var checkedAttribute = isChecked ? ' checked="checked"' : '';
+        for (let i = 0, length = channels.length; i < length; i++) {
+            const folder = channels[i];
+            const isChecked = user.Policy.EnableAllChannels || -1 != user.Policy.EnabledChannels.indexOf(folder.Id);
+            const checkedAttribute = isChecked ? ' checked="checked"' : '';
             html += '<label><input type="checkbox" is="emby-checkbox" class="chkChannel" data-id="' + folder.Id + '" ' + checkedAttribute + '><span>' + folder.Name + '</span></label>';
         }
 
@@ -47,23 +51,23 @@ define(['jQuery', 'loading', 'libraryMenu', 'globalize', 'fnchecked'], function
             $('.channelAccessContainer', page).hide();
         }
 
-        $('#chkEnableAllChannels', page).checked(user.Policy.EnableAllChannels).trigger('change');
+        $('#chkEnableAllChannels', page).prop('checked', user.Policy.EnableAllChannels);
     }
 
     function loadDevices(page, user, devices) {
-        var html = '';
+        let html = '';
         html += '<h3 class="checkboxListLabel">' + globalize.translate('HeaderDevices') + '</h3>';
         html += '<div class="checkboxList paperList checkboxList-paperList">';
 
-        for (var i = 0, length = devices.length; i < length; i++) {
-            var device = devices[i];
-            var checkedAttribute = user.Policy.EnableAllDevices || -1 != user.Policy.EnabledDevices.indexOf(device.Id) ? ' checked="checked"' : '';
+        for (let i = 0, length = devices.length; i < length; i++) {
+            const device = devices[i];
+            const checkedAttribute = user.Policy.EnableAllDevices || -1 != user.Policy.EnabledDevices.indexOf(device.Id) ? ' checked="checked"' : '';
             html += '<label><input type="checkbox" is="emby-checkbox" class="chkDevice" data-id="' + device.Id + '" ' + checkedAttribute + '><span>' + device.Name + ' - ' + device.AppName + '</span></label>';
         }
 
         html += '</div>';
         $('.deviceAccess', page).show().html(html);
-        $('#chkEnableAllDevices', page).checked(user.Policy.EnableAllDevices).trigger('change');
+        $('#chkEnableAllDevices', page).prop('checked', user.Policy.EnableAllDevices);
 
         if (user.Policy.IsAdministrator) {
             page.querySelector('.deviceAccessContainer').classList.add('hide');
@@ -84,25 +88,25 @@ define(['jQuery', 'loading', 'libraryMenu', 'globalize', 'fnchecked'], function
     function onSaveComplete(page) {
         loading.hide();
 
-        require(['toast'], function (toast) {
+        import('toast').then(({default: toast}) => {
             toast(globalize.translate('SettingsSaved'));
         });
     }
 
     function saveUser(user, page) {
-        user.Policy.EnableAllFolders = $('#chkEnableAllFolders', page).checked();
+        user.Policy.EnableAllFolders = $('#chkEnableAllFolders', page).is(':checked');
         user.Policy.EnabledFolders = user.Policy.EnableAllFolders ? [] : $('.chkFolder', page).get().filter(function (c) {
             return c.checked;
         }).map(function (c) {
             return c.getAttribute('data-id');
         });
-        user.Policy.EnableAllChannels = $('#chkEnableAllChannels', page).checked();
+        user.Policy.EnableAllChannels = $('#chkEnableAllChannels', page).is(':checked');
         user.Policy.EnabledChannels = user.Policy.EnableAllChannels ? [] : $('.chkChannel', page).get().filter(function (c) {
             return c.checked;
         }).map(function (c) {
             return c.getAttribute('data-id');
         });
-        user.Policy.EnableAllDevices = $('#chkEnableAllDevices', page).checked();
+        user.Policy.EnableAllDevices = $('#chkEnableAllDevices', page).is(':checked');
         user.Policy.EnabledDevices = user.Policy.EnableAllDevices ? [] : $('.chkDevice', page).get().filter(function (c) {
             return c.checked;
         }).map(function (c) {
@@ -116,9 +120,9 @@ define(['jQuery', 'loading', 'libraryMenu', 'globalize', 'fnchecked'], function
     }
 
     function onSubmit() {
-        var page = $(this).parents('.page');
+        const page = $(this).parents('.page');
         loading.show();
-        var userId = getParameterByName('userId');
+        const userId = getParameterByName('userId');
         ApiClient.getUser(userId).then(function (result) {
             saveUser(result, page);
         });
@@ -126,7 +130,7 @@ define(['jQuery', 'loading', 'libraryMenu', 'globalize', 'fnchecked'], function
     }
 
     $(document).on('pageinit', '#userLibraryAccessPage', function () {
-        var page = this;
+        const page = this;
         $('#chkEnableAllDevices', page).on('change', function () {
             if (this.checked) {
                 $('.deviceAccessListContainer', page).hide();
@@ -150,29 +154,30 @@ define(['jQuery', 'loading', 'libraryMenu', 'globalize', 'fnchecked'], function
         });
         $('.userLibraryAccessForm').off('submit', onSubmit).on('submit', onSubmit);
     }).on('pageshow', '#userLibraryAccessPage', function () {
-        var page = this;
+        const page = this;
         loading.show();
-        var promise1;
-        var userId = getParameterByName('userId');
+        let promise1;
+        const userId = getParameterByName('userId');
 
         if (userId) {
             promise1 = ApiClient.getUser(userId);
         } else {
-            var deferred = $.Deferred();
+            const deferred = $.Deferred();
             deferred.resolveWith(null, [{
                 Configuration: {}
             }]);
             promise1 = deferred.promise();
         }
 
-        var promise2 = Dashboard.getCurrentUser();
-        var promise4 = ApiClient.getJSON(ApiClient.getUrl('Library/MediaFolders', {
+        const promise2 = Dashboard.getCurrentUser();
+        const promise4 = ApiClient.getJSON(ApiClient.getUrl('Library/MediaFolders', {
             IsHidden: false
         }));
-        var promise5 = ApiClient.getJSON(ApiClient.getUrl('Channels'));
-        var promise6 = ApiClient.getJSON(ApiClient.getUrl('Devices'));
+        const promise5 = ApiClient.getJSON(ApiClient.getUrl('Channels'));
+        const promise6 = ApiClient.getJSON(ApiClient.getUrl('Devices'));
         Promise.all([promise1, promise2, promise4, promise5, promise6]).then(function (responses) {
             loadUser(page, responses[0], responses[1], responses[2].Items, responses[3].Items, responses[4].Items);
         });
     });
-});
+
+/* eslint-enable indent */
diff --git a/src/controllers/dashboard/users/usernew.js b/src/controllers/dashboard/users/usernew.js
index 5646b239d0..f45cbf8ca8 100644
--- a/src/controllers/dashboard/users/usernew.js
+++ b/src/controllers/dashboard/users/usernew.js
@@ -1,28 +1,32 @@
-define(['jQuery', 'loading', 'globalize', 'fnchecked', 'emby-checkbox'], function ($, loading, globalize) {
-    'use strict';
+import $ from 'jQuery';
+import loading from 'loading';
+import globalize from 'globalize';
+import 'emby-checkbox';
+
+/* eslint-disable indent */
 
     function loadMediaFolders(page, mediaFolders) {
-        var html = '';
+        let html = '';
         html += '<h3 class="checkboxListLabel">' + globalize.translate('HeaderLibraries') + '</h3>';
         html += '<div class="checkboxList paperList" style="padding:.5em 1em;">';
 
-        for (var i = 0; i < mediaFolders.length; i++) {
-            var folder = mediaFolders[i];
+        for (let i = 0; i < mediaFolders.length; i++) {
+            const folder = mediaFolders[i];
             html += '<label><input type="checkbox" is="emby-checkbox" class="chkFolder" data-id="' + folder.Id + '"/><span>' + folder.Name + '</span></label>';
         }
 
         html += '</div>';
         $('.folderAccess', page).html(html).trigger('create');
-        $('#chkEnableAllFolders', page).checked(false).trigger('change');
+        $('#chkEnableAllFolders', page).prop('checked', false);
     }
 
     function loadChannels(page, channels) {
-        var html = '';
+        let html = '';
         html += '<h3 class="checkboxListLabel">' + globalize.translate('HeaderChannels') + '</h3>';
         html += '<div class="checkboxList paperList" style="padding:.5em 1em;">';
 
-        for (var i = 0; i < channels.length; i++) {
-            var folder = channels[i];
+        for (let i = 0; i < channels.length; i++) {
+            const folder = channels[i];
             html += '<label><input type="checkbox" is="emby-checkbox" class="chkChannel" data-id="' + folder.Id + '"/><span>' + folder.Name + '</span></label>';
         }
 
@@ -35,17 +39,17 @@ define(['jQuery', 'loading', 'globalize', 'fnchecked', 'emby-checkbox'], functio
             $('.channelAccessContainer', page).hide();
         }
 
-        $('#chkEnableAllChannels', page).checked(false).trigger('change');
+        $('#chkEnableAllChannels', page).prop('checked', false);
     }
 
     function loadUser(page) {
         $('#txtUsername', page).val('');
         $('#txtPassword', page).val('');
         loading.show();
-        var promiseFolders = ApiClient.getJSON(ApiClient.getUrl('Library/MediaFolders', {
+        const promiseFolders = ApiClient.getJSON(ApiClient.getUrl('Library/MediaFolders', {
             IsHidden: false
         }));
-        var promiseChannels = ApiClient.getJSON(ApiClient.getUrl('Channels'));
+        const promiseChannels = ApiClient.getJSON(ApiClient.getUrl('Channels'));
         Promise.all([promiseFolders, promiseChannels]).then(function (responses) {
             loadMediaFolders(page, responses[0].Items);
             loadChannels(page, responses[1].Items);
@@ -54,11 +58,11 @@ define(['jQuery', 'loading', 'globalize', 'fnchecked', 'emby-checkbox'], functio
     }
 
     function saveUser(page) {
-        var user = {};
+        const user = {};
         user.Name = $('#txtUsername', page).val();
         user.Password = $('#txtPassword', page).val();
         ApiClient.createUser(user).then(function (user) {
-            user.Policy.EnableAllFolders = $('#chkEnableAllFolders', page).checked();
+            user.Policy.EnableAllFolders = $('#chkEnableAllFolders', page).is(':checked');
             user.Policy.EnabledFolders = [];
 
             if (!user.Policy.EnableAllFolders) {
@@ -69,7 +73,7 @@ define(['jQuery', 'loading', 'globalize', 'fnchecked', 'emby-checkbox'], functio
                 });
             }
 
-            user.Policy.EnableAllChannels = $('#chkEnableAllChannels', page).checked();
+            user.Policy.EnableAllChannels = $('#chkEnableAllChannels', page).is(':checked');
             user.Policy.EnabledChannels = [];
 
             if (!user.Policy.EnableAllChannels) {
@@ -84,7 +88,7 @@ define(['jQuery', 'loading', 'globalize', 'fnchecked', 'emby-checkbox'], functio
                 Dashboard.navigate('useredit.html?userId=' + user.Id);
             });
         }, function (response) {
-            require(['toast'], function (toast) {
+            import('toast').then(({default: toast}) => {
                 toast(globalize.translate('DefaultErrorMessage'));
             });
 
@@ -93,7 +97,7 @@ define(['jQuery', 'loading', 'globalize', 'fnchecked', 'emby-checkbox'], functio
     }
 
     function onSubmit() {
-        var page = $(this).parents('.page')[0];
+        const page = $(this).parents('.page')[0];
         loading.show();
         saveUser(page);
         return false;
@@ -104,7 +108,7 @@ define(['jQuery', 'loading', 'globalize', 'fnchecked', 'emby-checkbox'], functio
     }
 
     $(document).on('pageinit', '#newUserPage', function () {
-        var page = this;
+        const page = this;
         $('#chkEnableAllChannels', page).on('change', function () {
             if (this.checked) {
                 $('.channelAccessListContainer', page).hide();
@@ -123,4 +127,5 @@ define(['jQuery', 'loading', 'globalize', 'fnchecked', 'emby-checkbox'], functio
     }).on('pageshow', '#newUserPage', function () {
         loadData(this);
     });
-});
+
+/* eslint-enable indent */
diff --git a/src/controllers/dashboard/users/userparentalcontrol.js b/src/controllers/dashboard/users/userparentalcontrol.js
index e8255512d6..3fba3fc2b2 100644
--- a/src/controllers/dashboard/users/userparentalcontrol.js
+++ b/src/controllers/dashboard/users/userparentalcontrol.js
@@ -1,17 +1,22 @@
-define(['jQuery', 'datetime', 'loading', 'libraryMenu', 'globalize', 'listViewStyle', 'paper-icon-button-light'], function ($, datetime, loading, libraryMenu, globalize) {
-    'use strict';
+import $ from 'jQuery';
+import datetime from 'datetime';
+import loading from 'loading';
+import libraryMenu from 'libraryMenu';
+import globalize from 'globalize';
+import 'listViewStyle';
+import 'paper-icon-button-light';
+
+/* eslint-disable indent */
 
     function populateRatings(allParentalRatings, page) {
-        var html = '';
+        let html = '';
         html += "<option value=''></option>";
-        var i;
-        var length;
-        var rating;
-        var ratings = [];
+        let rating;
+        const ratings = [];
 
-        for (i = 0, length = allParentalRatings.length; i < length; i++) {
+        for (let i = 0, length = allParentalRatings.length; i < length; i++) {
             if (rating = allParentalRatings[i], ratings.length) {
-                var lastRating = ratings[ratings.length - 1];
+                const lastRating = ratings[ratings.length - 1];
 
                 if (lastRating.Value === rating.Value) {
                     lastRating.Name += '/' + rating.Name;
@@ -25,7 +30,7 @@ define(['jQuery', 'datetime', 'loading', 'libraryMenu', 'globalize', 'listViewSt
             });
         }
 
-        for (i = 0, length = ratings.length; i < length; i++) {
+        for (let i = 0, length = ratings.length; i < length; i++) {
             rating = ratings[i];
             html += "<option value='" + rating.Value + "'>" + rating.Name + '</option>';
         }
@@ -34,7 +39,7 @@ define(['jQuery', 'datetime', 'loading', 'libraryMenu', 'globalize', 'listViewSt
     }
 
     function loadUnratedItems(page, user) {
-        var items = [{
+        const items = [{
             name: globalize.translate('OptionBlockBooks'),
             value: 'Book'
         }, {
@@ -56,13 +61,13 @@ define(['jQuery', 'datetime', 'loading', 'libraryMenu', 'globalize', 'listViewSt
             name: globalize.translate('OptionBlockTvShows'),
             value: 'Series'
         }];
-        var html = '';
+        let html = '';
         html += '<h3 class="checkboxListLabel">' + globalize.translate('HeaderBlockItemsWithNoRating') + '</h3>';
         html += '<div class="checkboxList paperList checkboxList-paperList">';
 
-        for (var i = 0, length = items.length; i < length; i++) {
-            var item = items[i];
-            var checkedAttribute = -1 != user.Policy.BlockUnratedItems.indexOf(item.value) ? ' checked="checked"' : '';
+        for (let i = 0, length = items.length; i < length; i++) {
+            const item = items[i];
+            const checkedAttribute = -1 != user.Policy.BlockUnratedItems.indexOf(item.value) ? ' checked="checked"' : '';
             html += '<label><input type="checkbox" is="emby-checkbox" class="chkUnratedItem" data-itemtype="' + item.value + '" type="checkbox"' + checkedAttribute + '><span>' + item.name + '</span></label>';
         }
 
@@ -76,11 +81,11 @@ define(['jQuery', 'datetime', 'loading', 'libraryMenu', 'globalize', 'listViewSt
         loadUnratedItems(page, user);
         loadBlockedTags(page, user.Policy.BlockedTags);
         populateRatings(allParentalRatings, page);
-        var ratingValue = '';
+        let ratingValue = '';
 
         if (user.Policy.MaxParentalRating) {
-            for (var i = 0, length = allParentalRatings.length; i < length; i++) {
-                var rating = allParentalRatings[i];
+            for (let i = 0, length = allParentalRatings.length; i < length; i++) {
+                const rating = allParentalRatings[i];
 
                 if (user.Policy.MaxParentalRating >= rating.Value) {
                     ratingValue = rating.Value;
@@ -101,8 +106,8 @@ define(['jQuery', 'datetime', 'loading', 'libraryMenu', 'globalize', 'listViewSt
     }
 
     function loadBlockedTags(page, tags) {
-        var html = tags.map(function (h) {
-            var li = '<div class="listItem">';
+        let html = tags.map(function (h) {
+            let li = '<div class="listItem">';
             li += '<div class="listItemBody">';
             li += '<h3 class="listItemBodyText">';
             li += h;
@@ -116,10 +121,10 @@ define(['jQuery', 'datetime', 'loading', 'libraryMenu', 'globalize', 'listViewSt
             html = '<div class="paperList">' + html + '</div>';
         }
 
-        var elem = $('.blockedTags', page).html(html).trigger('create');
+        const elem = $('.blockedTags', page).html(html).trigger('create');
         $('.btnDeleteTag', elem).on('click', function () {
-            var tag = this.getAttribute('data-tag');
-            var newTags = tags.filter(function (t) {
+            const tag = this.getAttribute('data-tag');
+            const newTags = tags.filter(function (t) {
                 return t != tag;
             });
             loadBlockedTags(page, newTags);
@@ -132,10 +137,10 @@ define(['jQuery', 'datetime', 'loading', 'libraryMenu', 'globalize', 'listViewSt
     }
 
     function renderAccessSchedule(page, schedules) {
-        var html = '';
-        var index = 0;
+        let html = '';
+        let index = 0;
         html += schedules.map(function (a) {
-            var itemHtml = '';
+            let itemHtml = '';
             itemHtml += '<div class="liSchedule listItem" data-day="' + a.DayOfWeek + '" data-start="' + a.StartHour + '" data-end="' + a.EndHour + '">';
             itemHtml += '<div class="listItemBody two-line">';
             itemHtml += '<h3 class="listItemBodyText">';
@@ -148,7 +153,7 @@ define(['jQuery', 'datetime', 'loading', 'libraryMenu', 'globalize', 'listViewSt
             index++;
             return itemHtml;
         }).join('');
-        var accessScheduleList = page.querySelector('.accessScheduleList');
+        const accessScheduleList = page.querySelector('.accessScheduleList');
         accessScheduleList.innerHTML = html;
         $('.btnDelete', accessScheduleList).on('click', function () {
             deleteAccessSchedule(page, schedules, parseInt(this.getAttribute('data-index')));
@@ -158,7 +163,7 @@ define(['jQuery', 'datetime', 'loading', 'libraryMenu', 'globalize', 'listViewSt
     function onSaveComplete(page) {
         loading.hide();
 
-        require(['toast'], function (toast) {
+        import('toast').then(({default: toast}) => {
             toast(globalize.translate('SettingsSaved'));
         });
     }
@@ -178,8 +183,8 @@ define(['jQuery', 'datetime', 'loading', 'libraryMenu', 'globalize', 'listViewSt
     }
 
     function getDisplayTime(hours) {
-        var minutes = 0;
-        var pct = hours % 1;
+        let minutes = 0;
+        const pct = hours % 1;
 
         if (pct) {
             minutes = parseInt(60 * pct);
@@ -190,12 +195,11 @@ define(['jQuery', 'datetime', 'loading', 'libraryMenu', 'globalize', 'listViewSt
 
     function showSchedulePopup(page, schedule, index) {
         schedule = schedule || {};
-
-        require(['components/accessSchedule/accessSchedule'], function (accessschedule) {
+        import('components/accessSchedule/accessSchedule').then(({default: accessschedule}) => {
             accessschedule.show({
                 schedule: schedule
             }).then(function (updatedSchedule) {
-                var schedules = getSchedulesFromPage(page);
+                const schedules = getSchedulesFromPage(page);
 
                 if (-1 == index) {
                     index = schedules.length;
@@ -224,11 +228,12 @@ define(['jQuery', 'datetime', 'loading', 'libraryMenu', 'globalize', 'listViewSt
     }
 
     function showBlockedTagPopup(page) {
-        require(['prompt'], function (prompt) {
+
+        import('prompt').then(({default: prompt}) => {
             prompt({
                 label: globalize.translate('LabelTag')
             }).then(function (value) {
-                var tags = getBlockedTagsFromPage(page);
+                const tags = getBlockedTagsFromPage(page);
 
                 if (-1 == tags.indexOf(value)) {
                     tags.push(value);
@@ -240,9 +245,9 @@ define(['jQuery', 'datetime', 'loading', 'libraryMenu', 'globalize', 'listViewSt
 
     window.UserParentalControlPage = {
         onSubmit: function () {
-            var page = $(this).parents('.page');
+            const page = $(this).parents('.page');
             loading.show();
-            var userId = getParameterByName('userId');
+            const userId = getParameterByName('userId');
             ApiClient.getUser(userId).then(function (result) {
                 saveUser(result, page);
             });
@@ -250,7 +255,7 @@ define(['jQuery', 'datetime', 'loading', 'libraryMenu', 'globalize', 'listViewSt
         }
     };
     $(document).on('pageinit', '#userParentalControlPage', function () {
-        var page = this;
+        const page = this;
         $('.btnAddSchedule', page).on('click', function () {
             showSchedulePopup(page, {}, -1);
         });
@@ -259,13 +264,14 @@ define(['jQuery', 'datetime', 'loading', 'libraryMenu', 'globalize', 'listViewSt
         });
         $('.userParentalControlForm').off('submit', UserParentalControlPage.onSubmit).on('submit', UserParentalControlPage.onSubmit);
     }).on('pageshow', '#userParentalControlPage', function () {
-        var page = this;
+        const page = this;
         loading.show();
-        var userId = getParameterByName('userId');
-        var promise1 = ApiClient.getUser(userId);
-        var promise2 = ApiClient.getParentalRatings();
+        const userId = getParameterByName('userId');
+        const promise1 = ApiClient.getUser(userId);
+        const promise2 = ApiClient.getParentalRatings();
         Promise.all([promise1, promise2]).then(function (responses) {
             loadUser(page, responses[0], responses[1]);
         });
     });
-});
+
+/* eslint-enable indent */
diff --git a/src/controllers/dashboard/users/userpasswordpage.js b/src/controllers/dashboard/users/userpasswordpage.js
index 186e39b151..d694bb2c5d 100644
--- a/src/controllers/dashboard/users/userpasswordpage.js
+++ b/src/controllers/dashboard/users/userpasswordpage.js
@@ -1,14 +1,18 @@
-define(['loading', 'libraryMenu', 'globalize', 'emby-button'], function (loading, libraryMenu, globalize) {
-    'use strict';
+import loading from 'loading';
+import libraryMenu from 'libraryMenu';
+import globalize from 'globalize';
+import 'emby-button';
+
+/* eslint-disable indent */
 
     function loadUser(page, params) {
-        var userid = params.userId;
+        const userid = params.userId;
         ApiClient.getUser(userid).then(function (user) {
             Dashboard.getCurrentUser().then(function (loggedInUser) {
                 libraryMenu.setTitle(user.Name);
                 page.querySelector('.username').innerHTML = user.Name;
-                var showPasswordSection = true;
-                var showLocalAccessSection = false;
+                let showPasswordSection = true;
+                let showLocalAccessSection = false;
 
                 if ('Guest' == user.ConnectLinkType) {
                     page.querySelector('.localAccessSection').classList.add('hide');
@@ -34,7 +38,7 @@ define(['loading', 'libraryMenu', 'globalize', 'emby-button'], function (loading
                     page.querySelector('.localAccessSection').classList.add('hide');
                 }
 
-                var txtEasyPassword = page.querySelector('#txtEasyPassword');
+                const txtEasyPassword = page.querySelector('#txtEasyPassword');
                 txtEasyPassword.value = '';
 
                 if (user.HasConfiguredEasyPassword) {
@@ -48,7 +52,7 @@ define(['loading', 'libraryMenu', 'globalize', 'emby-button'], function (loading
 
                 page.querySelector('.chkEnableLocalEasyPassword').checked = user.Configuration.EnableLocalPassword;
 
-                require(['autoFocuser'], function (autoFocuser) {
+                import('autoFocuser').then(({default: autoFocuser}) => {
                     autoFocuser.autoFocus(page);
                 });
             });
@@ -58,10 +62,10 @@ define(['loading', 'libraryMenu', 'globalize', 'emby-button'], function (loading
         page.querySelector('#txtNewPasswordConfirm').value = '';
     }
 
-    return function (view, params) {
+    export default function (view, params) {
         function saveEasyPassword() {
-            var userId = params.userId;
-            var easyPassword = view.querySelector('#txtEasyPassword').value;
+            const userId = params.userId;
+            const easyPassword = view.querySelector('#txtEasyPassword').value;
 
             if (easyPassword) {
                 ApiClient.updateEasyPassword(userId, easyPassword).then(function () {
@@ -78,7 +82,7 @@ define(['loading', 'libraryMenu', 'globalize', 'emby-button'], function (loading
                 ApiClient.updateUserConfiguration(user.Id, user.Configuration).then(function () {
                     loading.hide();
 
-                    require(['toast'], function (toast) {
+                    import('toast').then(({default: toast}) => {
                         toast(globalize.translate('MessageSettingsSaved'));
                     });
 
@@ -88,9 +92,9 @@ define(['loading', 'libraryMenu', 'globalize', 'emby-button'], function (loading
         }
 
         function savePassword() {
-            var userId = params.userId;
-            var currentPassword = view.querySelector('#txtCurrentPassword').value;
-            var newPassword = view.querySelector('#txtNewPassword').value;
+            const userId = params.userId;
+            let currentPassword = view.querySelector('#txtCurrentPassword').value;
+            const newPassword = view.querySelector('#txtNewPassword').value;
 
             if (view.querySelector('#fldCurrentPassword').classList.contains('hide')) {
                 // Firefox does not respect autocomplete=off, so clear it if the field is supposed to be hidden (and blank)
@@ -101,7 +105,7 @@ define(['loading', 'libraryMenu', 'globalize', 'emby-button'], function (loading
             ApiClient.updateUserPassword(userId, currentPassword, newPassword).then(function () {
                 loading.hide();
 
-                require(['toast'], function (toast) {
+                import('toast').then(({default: toast}) => {
                     toast(globalize.translate('PasswordSaved'));
                 });
 
@@ -116,10 +120,10 @@ define(['loading', 'libraryMenu', 'globalize', 'emby-button'], function (loading
         }
 
         function onSubmit(e) {
-            var form = this;
+            const form = this;
 
             if (form.querySelector('#txtNewPassword').value != form.querySelector('#txtNewPasswordConfirm').value) {
-                require(['toast'], function (toast) {
+                import('toast').then(({default: toast}) => {
                     toast(globalize.translate('PasswordMatchError'));
                 });
             } else {
@@ -139,11 +143,10 @@ define(['loading', 'libraryMenu', 'globalize', 'emby-button'], function (loading
         }
 
         function resetPassword() {
-            var msg = globalize.translate('PasswordResetConfirmation');
-
-            require(['confirm'], function (confirm) {
+            const msg = globalize.translate('PasswordResetConfirmation');
+            import('confirm').then(({default: confirm}) => {
                 confirm(msg, globalize.translate('PasswordResetHeader')).then(function () {
-                    var userId = params.userId;
+                    const userId = params.userId;
                     loading.show();
                     ApiClient.resetUserPassword(userId).then(function () {
                         loading.hide();
@@ -158,11 +161,11 @@ define(['loading', 'libraryMenu', 'globalize', 'emby-button'], function (loading
         }
 
         function resetEasyPassword() {
-            var msg = globalize.translate('PinCodeResetConfirmation');
+            const msg = globalize.translate('PinCodeResetConfirmation');
 
-            require(['confirm'], function (confirm) {
+            import('confirm').then(({default: confirm}) => {
                 confirm(msg, globalize.translate('HeaderPinCodeReset')).then(function () {
-                    var userId = params.userId;
+                    const userId = params.userId;
                     loading.show();
                     ApiClient.resetEasyPassword(userId).then(function () {
                         loading.hide();
@@ -183,5 +186,6 @@ define(['loading', 'libraryMenu', 'globalize', 'emby-button'], function (loading
         view.addEventListener('viewshow', function () {
             loadUser(view, params);
         });
-    };
-});
+    }
+
+/* eslint-enable indent */
diff --git a/src/controllers/dashboard/users/userprofilespage.js b/src/controllers/dashboard/users/userprofilespage.js
index c691c665f6..dbdec4f752 100644
--- a/src/controllers/dashboard/users/userprofilespage.js
+++ b/src/controllers/dashboard/users/userprofilespage.js
@@ -1,10 +1,20 @@
-define(['loading', 'dom', 'globalize', 'date-fns', 'dfnshelper', 'paper-icon-button-light', 'cardStyle', 'emby-button', 'indicators', 'flexStyles'], function (loading, dom, globalize, datefns, dfnshelper) {
-    'use strict';
+import loading from 'loading';
+import dom from 'dom';
+import globalize from 'globalize';
+import * as datefns from 'date-fns';
+import dfnshelper from 'dfnshelper';
+import 'paper-icon-button-light';
+import 'cardStyle';
+import 'emby-button';
+import 'indicators';
+import 'flexStyles';
+
+/* eslint-disable indent */
 
     function deleteUser(page, id) {
-        var msg = globalize.translate('DeleteUserConfirmation');
+        const msg = globalize.translate('DeleteUserConfirmation');
 
-        require(['confirm'], function (confirm) {
+        import('confirm').then(({default: confirm}) => {
             confirm({
                 title: globalize.translate('DeleteUser'),
                 text: msg,
@@ -20,10 +30,10 @@ define(['loading', 'dom', 'globalize', 'date-fns', 'dfnshelper', 'paper-icon-but
     }
 
     function showUserMenu(elem) {
-        var card = dom.parentWithClass(elem, 'card');
-        var page = dom.parentWithClass(card, 'page');
-        var userId = card.getAttribute('data-userid');
-        var menuItems = [];
+        const card = dom.parentWithClass(elem, 'card');
+        const page = dom.parentWithClass(card, 'page');
+        const userId = card.getAttribute('data-userid');
+        const menuItems = [];
         menuItems.push({
             name: globalize.translate('ButtonOpen'),
             id: 'open',
@@ -45,7 +55,7 @@ define(['loading', 'dom', 'globalize', 'date-fns', 'dfnshelper', 'paper-icon-but
             icon: 'delete'
         });
 
-        require(['actionsheet'], function (actionsheet) {
+        import('actionsheet').then(({default: actionsheet}) => {
             actionsheet.show({
                 items: menuItems,
                 positionTo: card,
@@ -72,8 +82,8 @@ define(['loading', 'dom', 'globalize', 'date-fns', 'dfnshelper', 'paper-icon-but
     }
 
     function getUserHtml(user, addConnectIndicator) {
-        var html = '';
-        var cssClass = 'card squareCard scalableCard squareCard-scalable';
+        let html = '';
+        let cssClass = 'card squareCard scalableCard squareCard-scalable';
 
         if (user.Policy.IsDisabled) {
             cssClass += ' grayscale';
@@ -84,7 +94,7 @@ define(['loading', 'dom', 'globalize', 'date-fns', 'dfnshelper', 'paper-icon-but
         html += '<div class="cardScalable visualCardBox-cardScalable">';
         html += '<div class="cardPadder cardPadder-square"></div>';
         html += '<a is="emby-linkbutton" class="cardContent" href="useredit.html?userId=' + user.Id + '">';
-        var imgUrl;
+        let imgUrl;
 
         if (user.PrimaryImageTag) {
             imgUrl = ApiClient.getUserImageUrl(user.Id, {
@@ -94,7 +104,7 @@ define(['loading', 'dom', 'globalize', 'date-fns', 'dfnshelper', 'paper-icon-but
             });
         }
 
-        var imageClass = 'cardImage';
+        let imageClass = 'cardImage';
 
         if (user.Policy.IsDisabled) {
             imageClass += ' disabledUser';
@@ -118,7 +128,7 @@ define(['loading', 'dom', 'globalize', 'date-fns', 'dfnshelper', 'paper-icon-but
         html += '<button type="button" is="paper-icon-button-light" class="btnUserMenu flex-shrink-zero"><span class="material-icons more_vert"></span></button>';
         html += '</div>';
         html += '<div class="cardText cardText-secondary">';
-        var lastSeen = getLastSeenText(user.LastActivityDate);
+        const lastSeen = getLastSeenText(user.LastActivityDate);
         html += '' != lastSeen ? lastSeen : '&nbsp;';
         html += '</div>';
         html += '</div>';
@@ -146,17 +156,17 @@ define(['loading', 'dom', 'globalize', 'date-fns', 'dfnshelper', 'paper-icon-but
     }
 
     function showPendingUserMenu(elem) {
-        var menuItems = [];
+        const menuItems = [];
         menuItems.push({
             name: globalize.translate('ButtonCancel'),
             id: 'delete',
             icon: 'delete'
         });
 
-        require(['actionsheet'], function (actionsheet) {
-            var card = dom.parentWithClass(elem, 'card');
-            var page = dom.parentWithClass(card, 'page');
-            var id = card.getAttribute('data-id');
+        import('actionsheet').then(({default: actionsheet}) => {
+            const card = dom.parentWithClass(elem, 'card');
+            const page = dom.parentWithClass(card, 'page');
+            const id = card.getAttribute('data-id');
             actionsheet.show({
                 items: menuItems,
                 positionTo: card,
@@ -171,7 +181,7 @@ define(['loading', 'dom', 'globalize', 'date-fns', 'dfnshelper', 'paper-icon-but
     }
 
     function getPendingUserHtml(user) {
-        var html = '';
+        let html = '';
         html += "<div data-id='" + user.Id + "' class='card squareCard scalableCard squareCard-scalable'>";
         html += '<div class="cardBox cardBox-bottompadded visualCardBox">';
         html += '<div class="cardScalable visualCardBox-cardScalable">';
@@ -236,7 +246,7 @@ define(['loading', 'dom', 'globalize', 'date-fns', 'dfnshelper', 'paper-icon-but
     }
 
     function showInvitePopup(page) {
-        require(['components/guestinviter/guestinviter'], function (guestinviter) {
+        import('components/guestinviter/guestinviter').then(({default: guestinviter}) => {
             guestinviter.show().then(function () {
                 loadData(page);
             });
@@ -244,19 +254,19 @@ define(['loading', 'dom', 'globalize', 'date-fns', 'dfnshelper', 'paper-icon-but
     }
 
     pageIdOn('pageinit', 'userProfilesPage', function () {
-        var page = this;
+        const page = this;
         page.querySelector('.btnAddUser').addEventListener('click', function() {
             Dashboard.navigate('usernew.html');
         });
         page.querySelector('.localUsers').addEventListener('click', function (e__e) {
-            var btnUserMenu = dom.parentWithClass(e__e.target, 'btnUserMenu');
+            const btnUserMenu = dom.parentWithClass(e__e.target, 'btnUserMenu');
 
             if (btnUserMenu) {
                 showUserMenu(btnUserMenu);
             }
         });
         page.querySelector('.pending').addEventListener('click', function (e__r) {
-            var btnUserMenu = dom.parentWithClass(e__r.target, 'btnUserMenu');
+            const btnUserMenu = dom.parentWithClass(e__r.target, 'btnUserMenu');
 
             if (btnUserMenu) {
                 showPendingUserMenu(btnUserMenu);
@@ -266,4 +276,5 @@ define(['loading', 'dom', 'globalize', 'date-fns', 'dfnshelper', 'paper-icon-but
     pageIdOn('pagebeforeshow', 'userProfilesPage', function () {
         loadData(this);
     });
-});
+
+/* eslint-enable indent */
diff --git a/src/controllers/edititemmetadata.js b/src/controllers/edititemmetadata.js
index 2bfc5e560d..1a3647a758 100644
--- a/src/controllers/edititemmetadata.js
+++ b/src/controllers/edititemmetadata.js
@@ -5,7 +5,7 @@ define(['loading', 'scripts/editorsidebar'], function (loading) {
         loading.show();
 
         if (itemId) {
-            require(['metadataEditor'], function (metadataEditor) {
+            require(['metadataEditor'], function ({default: metadataEditor}) {
                 metadataEditor.embed(context.querySelector('.editPageInnerContent'), itemId, ApiClient.serverInfo().Id);
             });
         } else {
diff --git a/src/itemdetails.html b/src/controllers/itemDetails/index.html
similarity index 71%
rename from src/itemdetails.html
rename to src/controllers/itemDetails/index.html
index 4d5cab026f..bc6bc5f5a4 100644
--- a/src/itemdetails.html
+++ b/src/controllers/itemDetails/index.html
@@ -1,8 +1,5 @@
-<div id="itemDetailPage" data-role="page" class="page libraryPage itemDetailPage noSecondaryNavPage selfBackdropPage noBackdrop" data-backbutton="true">
+<div id="itemDetailPage" data-role="page" class="page libraryPage itemDetailPage noSecondaryNavPage selfBackdropPage" data-backbutton="true">
     <div id="itemBackdrop" class="itemBackdrop">
-        <button is="emby-button" type="button" class="btnPlay detailFloatingButton hide fab autoSize" title="${ButtonPlay}" data-mode="resume">
-            <span class="material-icons play_arrow"></span>
-        </button>
     </div>
 
     <div class="detailLogo"></div>
@@ -10,99 +7,80 @@
         <div class="detailPagePrimaryContainer padded-left padded-right">
             <div class="infoWrapper infoText">
                 <div class="nameContainer"></div>
-                <div class="itemMiscInfo itemMiscInfo-primary"></div>
-                <div class="itemMiscInfo itemMiscInfo-secondary"></div>
+                <div class="itemMiscInfo itemMiscInfo-primary" style="margin-bottom: 0.6em"></div>
+                <div class="itemMiscInfo itemMiscInfo-secondary" style="margin-bottom: 0.6em"></div>
             </div>
 
             <div class="mainDetailButtons">
-                <button is="emby-button" type="button" class="button-flat btnResume hide detailButton detailButtonHideonMobile" data-mode="resume">
+                <button is="emby-button" type="button" class="button-flat btnResume hide detailButton" title="${ButtonResume}" data-mode="resume">
                     <div class="detailButton-content">
                         <span class="material-icons detailButton-icon play_arrow"></span>
-                        <div class="detailButton-text">${ButtonResume}</div>
                     </div>
                 </button>
 
-                <button is="emby-button" type="button" class="button-flat btnPlay hide detailButton detailButtonHideonMobile" data-mode="play">
+                <button is="emby-button" type="button" class="button-flat btnPlay hide detailButton" title="${ButtonPlay}" data-mode="play">
                     <div class="detailButton-content">
                         <span class="material-icons detailButton-icon play_arrow"></span>
-                        <div class="detailButton-text">${ButtonPlay}</div>
                     </div>
                 </button>
 
-                <button is="emby-button" type="button" class="button-flat btnDownload hide detailButton">
+                <button is="emby-button" type="button" class="button-flat btnDownload hide detailButton" title="${ButtonDownload}">
                     <div class="detailButton-content">
                         <span class="material-icons detailButton-icon get_app"></span>
-                        <div class="detailButton-text">${ButtonDownload}</div>
                     </div>
                 </button>
 
-                <button is="emby-button" type="button" class="button-flat btnPlayTrailer hide detailButton">
+                <button is="emby-button" type="button" class="button-flat btnPlayTrailer hide detailButton" title="${ButtonTrailer}">
                     <div class="detailButton-content">
                         <span class="material-icons detailButton-icon theaters"></span>
-                        <div class="detailButton-text">${ButtonTrailer}</div>
                     </div>
                 </button>
 
-                <button is="emby-button" type="button" class="button-flat btnInstantMix hide detailButton">
+                <button is="emby-button" type="button" class="button-flat btnInstantMix hide detailButton" title="${HeaderInstantMix}">
                     <div class="detailButton-content">
                         <span class="material-icons detailButton-icon explore"></span>
-                        <div class="detailButton-text">${HeaderInstantMix}</div>
                     </div>
                 </button>
 
-                <button is="emby-button" type="button" class="button-flat btnShuffle hide detailButton">
+                <button is="emby-button" type="button" class="button-flat btnShuffle hide detailButton" title="${ButtonShuffle}">
                     <div class="detailButton-content">
                         <span class="material-icons detailButton-icon shuffle"></span>
-                        <div class="detailButton-text">${ButtonShuffle}</div>
                     </div>
                 </button>
 
-                <button is="emby-button" type="button" class="button-flat btnCancelSeriesTimer hide detailButton">
+                <button is="emby-button" type="button" class="button-flat btnCancelSeriesTimer hide detailButton" title="${CancelSeries}">
                     <div class="detailButton-content">
                         <span class="material-icons detailButton-icon delete"></span>
-                        <div class="detailButton-text">${CancelSeries}</div>
                     </div>
                 </button>
 
-                <button is="emby-button" type="button" class="button-flat btnCancelTimer hide detailButton">
+                <button is="emby-button" type="button" class="button-flat btnCancelTimer hide detailButton" title="${StopRecording}">
                     <div class="detailButton-content">
                         <span class="material-icons detailButton-icon stop"></span>
-                        <div class="detailButton-text">${StopRecording}</div>
                     </div>
                 </button>
 
-                <button is="emby-button" type="button" class="button-flat btnDeleteItem hide detailButton">
-                    <div class="detailButton-content">
-                        <span class="material-icons detailButton-icon delete"></span>
-                        <div class="detailButton-text">${Delete}</div>
-                    </div>
-                </button>
-
-                <button is="emby-playstatebutton" type="button" class="button-flat btnPlaystate hide detailButton">
+                <button is="emby-playstatebutton" type="button" class="button-flat btnPlaystate hide detailButton" title="">
                     <div class="detailButton-content">
                         <span class="material-icons detailButton-icon check"></span>
-                        <div class="detailButton-text button-text"></div>
                     </div>
                 </button>
 
-                <button is="emby-ratingbutton" type="button" class="button-flat btnUserRating hide detailButton">
+                <button is="emby-ratingbutton" type="button" class="button-flat btnUserRating hide detailButton" title="${Rate}">
                     <div class="detailButton-content">
                         <span class="material-icons detailButton-icon favorite"></span>
-                        <div class="detailButton-text button-text">${Rate}</div>
                     </div>
                 </button>
 
-                <button is="emby-button" type="button" class="button-flat btnSplitVersions hide detailButton">
+                <button is="emby-button" type="button" class="button-flat btnSplitVersions hide detailButton" title="${ButtonSplit}">
                     <div class="detailButton-content">
                         <span class="material-icons detailButton-icon call_split"></span>
-                        <div class="detailButton-text">${ButtonSplit}</div>
                     </div>
                 </button>
 
-                <button is="emby-button" type="button" class="button-flat btnMoreCommands hide detailButton">
+                <button is="emby-button" type="button" class="button-flat btnMoreCommands hide detailButton" title="${ButtonMore}">
                     <div class="detailButton-content">
                         <span class="material-icons detailButton-icon more_vert"></span>
-                        <div class="detailButton-text">${ButtonMore}</div>
                     </div>
                 </button>
             </div>
@@ -110,7 +88,7 @@
         <div class="detailPageSecondaryContainer">
             <div class="detailImageContainer padded-left"></div>
             <div class="detailPageContent">
-                <div class="detailPagePrimaryContent padded-left padded-right">
+                <div class="detailPagePrimaryContent padded-right">
                     <div class="detailSection">
                         <div class="itemMiscInfo nativeName hide"></div>
 
@@ -124,6 +102,11 @@
                                 <div class="directorsLabel label"></div>
                                 <div class="directors content"></div>
                             </div>
+
+                            <div class="detailsGroupItem writersGroup hide">
+                                <div class="writersLabel label"></div>
+                                <div class="writers content"></div>
+                            </div>
                         </div>
 
                         <form class="trackSelections hide focuscontainer-x">
@@ -148,6 +131,9 @@
                             <p class="itemGenres"></p>
                             <h3 class="tagline"></h3>
                             <p class="overview"></p>
+                            <div class="overview-controls">
+                                <a class="overview-expand hide" is="emby-linkbutton" href="#">${ShowMore}</a>
+                            </div>
                             <p id="itemBirthday"></p>
                             <p id="itemBirthLocation"></p>
                             <p id="itemDeathDate"></p>
@@ -161,15 +147,15 @@
                 </div>
 
                 <div class="seriesTimerScheduleSection verticalSection detailVerticalSection hide" style="margin-top:-3em;">
-                    <h2 class="sectionTitle padded-left">${HeaderSchedule}</h2>
-                    <div class="seriesTimerSchedule padded-left padded-right"></div>
+                    <h2 class="sectionTitle">${HeaderSchedule}</h2>
+                    <div class="seriesTimerSchedule padded-right"></div>
                 </div>
 
-                <div class="collectionItems"></div>
+                <div class="collectionItems hide"></div>
 
                 <div class="nextUpSection verticalSection detailVerticalSection hide">
-                    <h2 class="sectionTitle sectionTitle-cards padded-left">${HeaderNextUp}</h2>
-                    <div is="emby-itemscontainer" class="nextUpItems vertical-wrap padded-left padded-right"></div>
+                    <h2 class="sectionTitle sectionTitle-cards">${HeaderNextUp}</h2>
+                    <div is="emby-itemscontainer" class="nextUpItems vertical-wrap padded-right"></div>
                 </div>
 
                 <div class="programGuideSection hide verticalSection detailVerticalSection">
@@ -177,64 +163,70 @@
                 </div>
 
                 <div id="childrenCollapsible" class="hide verticalSection detailVerticalSection">
-                    <h2 class="childrenSectionHeader sectionTitle sectionTitle-cards padded-left">
+                    <h2 class="childrenSectionHeader sectionTitle sectionTitle-cards hide">
                         <span id="childrenTitle"></span>
                     </h2>
                     <div id="childrenContent">
-                        <div is="emby-itemscontainer" class="childrenItemsContainer itemsContainer padded-left padded-right" style="text-align: left;"></div>
+                        <div is="emby-itemscontainer" class="childrenItemsContainer itemsContainer padded-right" style="text-align: left;"></div>
                     </div>
                 </div>
 
                 <div id="additionalPartsCollapsible" class="verticalSection detailVerticalSection hide">
-                    <h2 class="sectionTitle sectionTitle-cards padded-left padded-right">${HeaderAdditionalParts}</h2>
-                    <div id="additionalPartsContent" is="emby-itemscontainer" class="itemsContainer vertical-wrap padded-left padded-right"></div>
+                    <h2 class="sectionTitle sectionTitle-cards padded-right">${HeaderAdditionalParts}</h2>
+                    <div is="emby-scroller" class="padded-top-focusscale padded-bottom-focusscale" data-centerfocus="true">
+                        <div id="additionalPartsContent" is="emby-itemscontainer" class="scrollSlider focuscontainer-x itemsContainer"></div>
+                    </div>
                 </div>
 
-                <div class="verticalSection itemVerticalSection moreFromSeasonSection hide">
-                    <h2 class="sectionTitle sectionTitle-cards padded-left padded-right"></h2>
+                <div class="verticalSection detailVerticalSection moreFromSeasonSection hide">
+                    <h2 class="sectionTitle sectionTitle-cards padded-right"></h2>
                     <div is="emby-scroller" class="padded-top-focusscale padded-bottom-focusscale" data-centerfocus="true">
                         <div is="emby-itemscontainer" class="scrollSlider focuscontainer-x itemsContainer"></div>
                     </div>
                 </div>
 
-                <div class="verticalSection itemVerticalSection moreFromArtistSection hide">
-                    <h2 class="sectionTitle sectionTitle-cards padded-left padded-right"></h2>
+                <div class="verticalSection detailVerticalSection moreFromArtistSection hide">
+                    <h2 class="sectionTitle sectionTitle-cards padded-right"></h2>
                     <div is="emby-scroller" class="padded-top-focusscale padded-bottom-focusscale" data-centerfocus="true">
                         <div is="emby-itemscontainer" class="scrollSlider focuscontainer-x itemsContainer"></div>
                     </div>
                 </div>
 
                 <div id="castCollapsible" class="verticalSection detailVerticalSection hide">
-                    <h2 id="peopleHeader" class="sectionTitle sectionTitle-cards padded-left padded-right">${HeaderCastCrew}</h2>
+                    <h2 id="peopleHeader" class="sectionTitle sectionTitle-cards padded-right">${HeaderCastCrew}</h2>
                     <div is="emby-scroller" class="padded-top-focusscale padded-bottom-focusscale" data-centerfocus="true">
                         <div id="castContent" is="emby-itemscontainer" class="scrollSlider focuscontainer-x itemsContainer"></div>
                     </div>
                 </div>
 
                 <div id="seriesScheduleSection" class="verticalSection detailVerticalSection hide">
-                    <h2 class="sectionTitle padded-left padded-right">${HeaderUpcomingOnTV}</h2>
-                    <div id="seriesScheduleList" is="emby-itemscontainer" class="itemsContainer vertical-list padded-left padded-right"></div>
+                    <h2 class="sectionTitle padded-right">${HeaderUpcomingOnTV}</h2>
+                    <div id="seriesScheduleList" is="emby-itemscontainer" class="itemsContainer vertical-list padded-right"></div>
                 </div>
 
                 <div id="specialsCollapsible" class="verticalSection detailVerticalSection hide">
-                    <h2 class="sectionTitle sectionTitle-cards padded-left padded-right">${HeaderSpecialFeatures}</h2>
-                    <div id="specialsContent" is="emby-itemscontainer" class="itemsContainer vertical-wrap padded-left padded-right"></div>
+                    <h2 class="sectionTitle sectionTitle-cards padded-right">${HeaderSpecialFeatures}</h2>
+                    <div is="emby-scroller" class="padded-top-focusscale padded-bottom-focusscale" data-centerfocus="true">
+                        <div id="specialsContent" is="emby-itemscontainer" class="scrollSlider focuscontainer-x itemsContainer"></div>
+                    </div>
                 </div>
 
                 <div id="musicVideosCollapsible" class="verticalSection detailVerticalSection hide">
-                    <h2 class="sectionTitle sectionTitle-cards padded-left padded-right">${HeaderMusicVideos}</h2>
-                    <div id="musicVideosContent" is="emby-itemscontainer" class="itemsContainer vertical-wrap padded-left padded-right"></div>
+                    <h2 class="sectionTitle sectionTitle-cards padded-right">${HeaderMusicVideos}</h2>
+                    <div is="emby-scroller" class="padded-top-focusscale padded-bottom-focusscale" data-centerfocus="true">
+                        <div id="musicVideosContent" is="emby-itemscontainer" class="scrollSlider focuscontainer-x itemsContainer"></div>
+                    </div>
                 </div>
 
-                <div id="scenesCollapsible" class="verticalSection itemVerticalSection verticalSection-extrabottompadding hide">
-                    <h2 class="sectionTitle sectionTitle-cards padded-left padded-right">${HeaderScenes}</h2>
+                <div id="scenesCollapsible" class="verticalSection detailVerticalSection verticalSection-extrabottompadding hide">
+                    <h2 class="sectionTitle sectionTitle-cards padded-right">${HeaderScenes}</h2>
                     <div is="emby-scroller" class="padded-top-focusscale padded-bottom-focusscale" data-centerfocus="true">
                         <div id="scenesContent" is="emby-itemscontainer" class="scrollSlider focuscontainer-x itemsContainer"></div>
                     </div>
                 </div>
 
-                <div id="similarCollapsible" class="verticalSection itemVerticalSection verticalSection-extrabottompadding hide">
-                    <h2 class="sectionTitle sectionTitle-cards padded-left padded-right">${HeaderMoreLikeThis}</h2>
+                <div id="similarCollapsible" class="verticalSection detailVerticalSection verticalSection-extrabottompadding hide">
+                    <h2 class="sectionTitle sectionTitle-cards padded-right">${HeaderMoreLikeThis}</h2>
                     <div is="emby-scroller" class="padded-top-focusscale padded-bottom-focusscale" data-centerfocus="true">
                         <div is="emby-itemscontainer" class="scrollSlider focuscontainer-x itemsContainer similarContent"></div>
                     </div>
diff --git a/src/controllers/itemDetails.js b/src/controllers/itemDetails/index.js
similarity index 79%
rename from src/controllers/itemDetails.js
rename to src/controllers/itemDetails/index.js
index 0fad1ba967..011bc4ac92 100644
--- a/src/controllers/itemDetails.js
+++ b/src/controllers/itemDetails/index.js
@@ -28,15 +28,11 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
     }
 
     function hideAll(page, className, show) {
-        var i;
-        var length;
-        var elems = page.querySelectorAll('.' + className);
-
-        for (i = 0, length = elems.length; i < length; i++) {
+        for (const elem of page.querySelectorAll('.' + className)) {
             if (show) {
-                elems[i].classList.remove('hide');
+                elem.classList.remove('hide');
             } else {
-                elems[i].classList.add('hide');
+                elem.classList.add('hide');
             }
         }
     }
@@ -51,17 +47,19 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
             positionTo: button,
             cancelTimer: false,
             record: false,
-            deleteItem: true === item.IsFolder,
+            deleteItem: item.CanDelete === true,
             shuffle: false,
             instantMix: false,
             user: user,
             share: true
         };
+
         return options;
     }
 
     function getProgramScheduleHtml(items) {
         var html = '';
+
         html += '<div is="emby-itemscontainer" class="itemsContainer vertical-list" data-contextmenu="false">';
         html += listView.getListViewHtml({
             items: items,
@@ -75,7 +73,10 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
             moreButton: false,
             recordButton: false
         });
-        return html += '</div>';
+
+        html += '</div>';
+
+        return html;
     }
 
     function renderSeriesTimerSchedule(page, apiClient, seriesTimerId) {
@@ -141,29 +142,31 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
             return;
         }
 
-        playbackManager.getPlaybackMediaSources(item).then(function (mediaSources) {
-            instance._currentPlaybackMediaSources = mediaSources;
-            page.querySelector('.trackSelections').classList.remove('hide');
-            select.setLabel(globalize.translate('LabelVersion'));
-            var currentValue = select.value;
-            var selectedId = mediaSources[0].Id;
-            select.innerHTML = mediaSources.map(function (v) {
-                var selected = v.Id === selectedId ? ' selected' : '';
-                return '<option value="' + v.Id + '"' + selected + '>' + v.Name + '</option>';
-            }).join('');
+        var mediaSources = item.MediaSources;
+        instance._currentPlaybackMediaSources = mediaSources;
 
-            if (mediaSources.length > 1) {
-                page.querySelector('.selectSourceContainer').classList.remove('hide');
-            } else {
-                page.querySelector('.selectSourceContainer').classList.add('hide');
-            }
+        page.querySelector('.trackSelections').classList.remove('hide');
+        select.setLabel(globalize.translate('LabelVersion'));
 
-            if (select.value !== currentValue || forceReload) {
-                renderVideoSelections(page, mediaSources);
-                renderAudioSelections(page, mediaSources);
-                renderSubtitleSelections(page, mediaSources);
-            }
-        });
+        var currentValue = select.value;
+
+        var selectedId = mediaSources[0].Id;
+        select.innerHTML = mediaSources.map(function (v) {
+            var selected = v.Id === selectedId ? ' selected' : '';
+            return '<option value="' + v.Id + '"' + selected + '>' + v.Name + '</option>';
+        }).join('');
+
+        if (mediaSources.length > 1) {
+            page.querySelector('.selectSourceContainer').classList.remove('hide');
+        } else {
+            page.querySelector('.selectSourceContainer').classList.add('hide');
+        }
+
+        if (select.value !== currentValue || forceReload) {
+            renderVideoSelections(page, mediaSources);
+            renderAudioSelections(page, mediaSources);
+            renderSubtitleSelections(page, mediaSources);
+        }
     }
 
     function renderVideoSelections(page, mediaSources) {
@@ -171,9 +174,11 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
         var mediaSource = mediaSources.filter(function (m) {
             return m.Id === mediaSourceId;
         })[0];
+
         var tracks = mediaSource.MediaStreams.filter(function (m) {
-            return 'Video' === m.Type;
+            return m.Type === 'Video';
         });
+
         var select = page.querySelector('.selectVideo');
         select.setLabel(globalize.translate('LabelVideo'));
         var selectedId = tracks.length ? tracks[0].Index : -1;
@@ -242,12 +247,24 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
         select.setLabel(globalize.translate('LabelSubtitles'));
         var selectedId = null == mediaSource.DefaultSubtitleStreamIndex ? -1 : mediaSource.DefaultSubtitleStreamIndex;
 
-        if (tracks.length) {
+        var videoTracks = mediaSource.MediaStreams.filter(function (m) {
+            return 'Video' === m.Type;
+        });
+
+        // This only makes sense on Video items
+        if (videoTracks.length) {
             var selected = -1 === selectedId ? ' selected' : '';
             select.innerHTML = '<option value="-1">' + globalize.translate('Off') + '</option>' + tracks.map(function (v) {
                 selected = v.Index === selectedId ? ' selected' : '';
                 return '<option value="' + v.Index + '" ' + selected + '>' + v.DisplayTitle + '</option>';
             }).join('');
+
+            if (tracks.length > 0) {
+                select.removeAttribute('disabled');
+            } else {
+                select.setAttribute('disabled', 'disabled');
+            }
+
             page.querySelector('.selectSubtitlesContainer').classList.remove('hide');
         } else {
             select.innerHTML = '';
@@ -278,7 +295,15 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
             var enableShuffle = item.IsFolder || -1 !== ['MusicAlbum', 'MusicGenre', 'MusicArtist'].indexOf(item.Type);
             hideAll(page, 'btnShuffle', enableShuffle);
             canPlay = true;
-            hideAll(page, 'btnResume', item.UserData && item.UserData.PlaybackPositionTicks > 0);
+
+            const isResumable = item.UserData && item.UserData.PlaybackPositionTicks > 0;
+            hideAll(page, 'btnResume', isResumable);
+
+            if (isResumable) {
+                for (const elem of page.querySelectorAll('.btnPlay')) {
+                    elem.querySelector('.detailButton-icon').classList.replace('play_arrow', 'replay');
+                }
+            }
         } else {
             hideAll(page, 'btnPlay');
             hideAll(page, 'btnResume');
@@ -324,8 +349,7 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
     function getArtistLinksHtml(artists, serverId, context) {
         var html = [];
 
-        for (var i = 0, length = artists.length; i < length; i++) {
-            var artist = artists[i];
+        for (const artist of artists) {
             var href = appRouter.getRouteUrl(artist, {
                 context: context,
                 itemType: 'MusicArtist',
@@ -333,10 +357,18 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
             });
             html.push('<a style="color:inherit;" class="button-link" is="emby-linkbutton" href="' + href + '">' + artist.Name + '</a>');
         }
+        html = html.join(' / ');
 
-        return html = html.join(' / ');
+        return html;
     }
-    function renderName(item, container, isStatic, context) {
+
+    /**
+     * Renders the item's name block
+     * @param {Object} item - Item used to render the name.
+     * @param {HTMLDivElement} container - Container to render the information into.
+     * @param {Object} context - Application context.
+     */
+    function renderName(item, container, context) {
         var parentRoute;
         var parentNameHtml = [];
         var parentNameLast = false;
@@ -400,6 +432,7 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
         } else if (item.Album) {
             parentNameHtml.push(item.Album);
         }
+
         // FIXME: This whole section needs some refactoring, so it becames easier to scale across all form factors. See GH #1022
         var html = '';
         var tvShowHtml = parentNameHtml[0];
@@ -409,36 +442,33 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
             if (parentNameLast) {
                 // Music
                 if (layoutManager.mobile) {
-                    html = '<h3 class="parentName" style="margin: .25em 0;">' + parentNameHtml.join('</br>') + '</h3>';
+                    html = '<h3 class="parentName musicParentName">' + parentNameHtml.join('</br>') + '</h3>';
                 } else {
-                    html = '<h3 class="parentName" style="margin: .25em 0;">' + parentNameHtml.join(' - ') + '</h3>';
+                    html = '<h3 class="parentName musicParentName">' + parentNameHtml.join(' - ') + '</h3>';
                 }
             } else {
-                if (layoutManager.mobile) {
-                    html = '<h1 class="parentName" style="margin: .1em 0 .25em;">' + parentNameHtml.join('</br>') + '</h1>';
-                } else {
-                    html = '<h1 class="parentName" style="margin: .1em 0 .25em;">' + tvShowHtml + '</h1>';
-                }
+                html = '<h1 class="parentName">' + tvShowHtml + '</h1>';
             }
         }
 
         var name = itemHelper.getDisplayName(item, {
             includeParentInfo: false
         });
-        var offset = parentNameLast ? '.25em' : '.5em';
 
         if (html && !parentNameLast) {
-            if (!layoutManager.mobile && tvSeasonHtml) {
-                html += '<h3 class="itemName infoText" style="margin: .25em 0 .5em;">' + tvSeasonHtml + ' - ' + name + '</h3>';
+            if (tvSeasonHtml) {
+                html += '<h3 class="itemName infoText subtitle">' + tvSeasonHtml + ' - ' + name + '</h3>';
             } else {
-                html += '<h3 class="itemName infoText" style="margin: .25em 0 .5em;">' + name + '</h3>';
+                html += '<h3 class="itemName infoText subtitle">' + name + '</h3>';
             }
+        } else if (item.OriginalTitle && item.OriginalTitle != item.Name) {
+            html = '<h1 class="itemName infoText parentNameLast withOriginalTitle">' + name + '</h1>' + html;
         } else {
-            html = '<h1 class="itemName infoText" style="margin: .1em 0 ' + offset + ';">' + name + '</h1>' + html;
+            html = '<h1 class="itemName infoText parentNameLast">' + name + '</h1>' + html;
         }
 
         if (item.OriginalTitle && item.OriginalTitle != item.Name) {
-            html += '<h4 class="itemName infoText" style="margin: -' + offset + ' 0 0;">' + item.OriginalTitle + '</h4>';
+            html += '<h4 class="itemName infoText originalTitle">' + item.OriginalTitle + '</h4>';
         }
 
         container.innerHTML = html;
@@ -462,7 +492,7 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
         if (dom.getWindowSize().innerWidth >= 1000) {
             backdrop.setBackdrops([item]);
         } else {
-            backdrop.clear();
+            backdrop.clearBackdrop();
         }
     }
 
@@ -470,43 +500,18 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
         var imgUrl;
         var hasbackdrop = false;
         var itemBackdropElement = page.querySelector('#itemBackdrop');
-        var usePrimaryImage = item.MediaType === 'Video' && item.Type !== 'Movie' && item.Type !== 'Trailer' ||
-            item.MediaType && item.MediaType !== 'Video' ||
-            item.Type === 'MusicAlbum' ||
-            item.Type === 'Person';
 
         if (!layoutManager.mobile && !userSettings.detailsBanner()) {
             return false;
         }
 
-        if ('Program' === item.Type && item.ImageTags && item.ImageTags.Thumb) {
-            imgUrl = apiClient.getScaledImageUrl(item.Id, {
-                type: 'Thumb',
-                maxWidth: dom.getScreenWidth(),
-                index: 0,
-                tag: item.ImageTags.Thumb
-            });
-            page.classList.remove('noBackdrop');
-            imageLoader.lazyImage(itemBackdropElement, imgUrl);
-            hasbackdrop = true;
-        } else if (usePrimaryImage && item.ImageTags && item.ImageTags.Primary) {
-            imgUrl = apiClient.getScaledImageUrl(item.Id, {
-                type: 'Primary',
-                maxWidth: dom.getScreenWidth(),
-                index: 0,
-                tag: item.ImageTags.Primary
-            });
-            page.classList.remove('noBackdrop');
-            imageLoader.lazyImage(itemBackdropElement, imgUrl);
-            hasbackdrop = true;
-        } else if (item.BackdropImageTags && item.BackdropImageTags.length) {
+        if (item.BackdropImageTags && item.BackdropImageTags.length) {
             imgUrl = apiClient.getScaledImageUrl(item.Id, {
                 type: 'Backdrop',
                 maxWidth: dom.getScreenWidth(),
                 index: 0,
                 tag: item.BackdropImageTags[0]
             });
-            page.classList.remove('noBackdrop');
             imageLoader.lazyImage(itemBackdropElement, imgUrl);
             hasbackdrop = true;
         } else if (item.ParentBackdropItemId && item.ParentBackdropImageTags && item.ParentBackdropImageTags.length) {
@@ -516,50 +521,35 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
                 index: 0,
                 tag: item.ParentBackdropImageTags[0]
             });
-            page.classList.remove('noBackdrop');
-            imageLoader.lazyImage(itemBackdropElement, imgUrl);
-            hasbackdrop = true;
-        } else if (item.ImageTags && item.ImageTags.Thumb) {
-            imgUrl = apiClient.getScaledImageUrl(item.Id, {
-                type: 'Thumb',
-                maxWidth: dom.getScreenWidth(),
-                index: 0,
-                tag: item.ImageTags.Thumb
-            });
-            page.classList.remove('noBackdrop');
             imageLoader.lazyImage(itemBackdropElement, imgUrl);
             hasbackdrop = true;
         } else {
             itemBackdropElement.style.backgroundImage = '';
         }
 
-        if ('Person' === item.Type) {
-            // FIXME: This hides the backdrop on all persons to fix a margin issue. Ideally, a proper fix should be made.
-            page.classList.add('noBackdrop');
-            itemBackdropElement.classList.add('personBackdrop');
-        } else {
-            itemBackdropElement.classList.remove('personBackdrop');
-        }
-
         return hasbackdrop;
     }
 
     function reloadFromItem(instance, page, params, item, user) {
-        var context = params.context;
-        page.querySelector('.detailPagePrimaryContainer').classList.add('detailSticky');
+        const apiClient = connectionManager.getApiClient(item.ServerId);
 
-        renderName(item, page.querySelector('.nameContainer'), false, context);
-        var apiClient = connectionManager.getApiClient(item.ServerId);
-        renderSeriesTimerEditor(page, item, apiClient, user);
-        renderTimerEditor(page, item, apiClient, user);
-        renderImage(page, item, apiClient, user);
-        renderLogo(page, item, apiClient);
         Emby.Page.setTitle('');
-        setInitialCollapsibleState(page, item, apiClient, context, user);
-        renderDetails(page, item, apiClient, context);
-        renderTrackSelections(page, instance, item);
+
+        // Start rendering the artwork first
+        renderImage(page, item);
+        renderLogo(page, item, apiClient);
         renderBackdrop(item);
         renderDetailPageBackdrop(page, item, apiClient);
+
+        // Render the main information for the item
+        page.querySelector('.detailPagePrimaryContainer').classList.add('detailRibbon');
+        renderName(item, page.querySelector('.nameContainer'), params.context);
+        renderDetails(page, item, apiClient, params.context);
+        renderTrackSelections(page, instance, item);
+
+        renderSeriesTimerEditor(page, item, apiClient, user);
+        renderTimerEditor(page, item, apiClient, user);
+        setInitialCollapsibleState(page, item, apiClient, params.context, user);
         var canPlay = reloadPlayButtons(page, item);
 
         if ((item.LocalTrailerCount || item.RemoteTrailers && item.RemoteTrailers.length) && -1 !== playbackManager.getSupportedCommands().indexOf('PlayTrailers')) {
@@ -570,12 +560,6 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
 
         setTrailerButtonVisibility(page, item);
 
-        if (item.CanDelete && !item.IsFolder) {
-            hideAll(page, 'btnDeleteItem', true);
-        } else {
-            hideAll(page, 'btnDeleteItem');
-        }
-
         if ('Program' !== item.Type || canPlay) {
             hideAll(page, 'mainDetailButtons', true);
         } else {
@@ -667,18 +651,15 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
     }
 
     function renderLogo(page, item, apiClient) {
-        var url = logoImageUrl(item, apiClient, {
-            maxWidth: 400
-        });
         var detailLogo = page.querySelector('.detailLogo');
 
+        var url = logoImageUrl(item, apiClient, {});
+
         if (!layoutManager.mobile && !userSettings.enableBackdrops()) {
             detailLogo.classList.add('hide');
         } else if (url) {
             detailLogo.classList.remove('hide');
-            detailLogo.classList.add('lazy');
-            detailLogo.setAttribute('data-src', url);
-            imageLoader.lazyImage(detailLogo);
+            imageLoader.setLazyImage(detailLogo, url);
         } else {
             detailLogo.classList.add('hide');
         }
@@ -704,172 +685,59 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
         }
     }
 
-    function renderLinks(linksElem, item) {
-        var html = [];
+    function renderLinks(page, item) {
+        var externalLinksElem = page.querySelector('.itemExternalLinks');
 
         var links = [];
 
         if (!layoutManager.tv && item.HomePageUrl) {
-            links.push('<a style="color:inherit;" is="emby-linkbutton" class="button-link" href="' + item.HomePageUrl + '" target="_blank">' + globalize.translate('ButtonWebsite') + '</a>');
+            links.push(`<a is="emby-linkbutton" class="button-link" href="${item.HomePageUrl}" target="_blank">${globalize.translate('ButtonWebsite')}</a>`);
         }
+
         if (item.ExternalUrls) {
-            for (var i = 0, length = item.ExternalUrls.length; i < length; i++) {
-                var url = item.ExternalUrls[i];
-                links.push('<a style="color:inherit;" is="emby-linkbutton" class="button-link" href="' + url.Url + '" target="_blank">' + url.Name + '</a>');
+            for (const url of item.ExternalUrls) {
+                links.push(`<a is="emby-linkbutton" class="button-link" href="${url.Url}" target="_blank">${url.Name}</a>`);
             }
         }
 
+        var html = [];
         if (links.length) {
             html.push(links.join(', '));
         }
 
-        linksElem.innerHTML = html.join(', ');
+        externalLinksElem.innerHTML = html.join(', ');
 
         if (html.length) {
-            linksElem.classList.remove('hide');
+            externalLinksElem.classList.remove('hide');
         } else {
-            linksElem.classList.add('hide');
+            externalLinksElem.classList.add('hide');
         }
     }
 
-    function renderDetailImage(page, elem, item, apiClient, editable, imageLoader, indicators) {
-        if ('SeriesTimer' === item.Type || 'Program' === item.Type) {
-            editable = false;
-        }
+    function renderDetailImage(elem, item, imageLoader) {
+        const itemArray = [];
+        itemArray.push(item);
+        const cardHtml = cardBuilder.getCardsHtml(itemArray, {
+            shape: 'auto',
+            showTitle: false,
+            centerText: true,
+            overlayText: false,
+            transition: false,
+            disableIndicators: true,
+            disableHoverMenu: true,
+            overlayPlayButton: true,
+            width: dom.getWindowSize().innerWidth * 0.5
+        });
 
-        elem.classList.add('detailimg-hidemobile');
-
-        var imageTags = item.ImageTags || {};
-
-        if (item.PrimaryImageTag) {
-            imageTags.Primary = item.PrimaryImageTag;
-        }
-
-        var url;
-        var html = '';
-        var shape = 'portrait';
-        var detectRatio = false;
-
-        /* In the following section, getScreenWidth() is multiplied by 0.5 as the posters
-        are 25vw and we need double the resolution to counter Skia's scaling. */
-        // TODO: Find a reliable way to get the poster width
-        if (imageTags.Primary) {
-            url = apiClient.getScaledImageUrl(item.Id, {
-                type: 'Primary',
-                maxWidth: Math.round(dom.getScreenWidth() * 0.5),
-                tag: item.ImageTags.Primary
-            });
-            detectRatio = true;
-        } else if (item.BackdropImageTags && item.BackdropImageTags.length) {
-            url = apiClient.getScaledImageUrl(item.Id, {
-                type: 'Backdrop',
-                maxWidth: Math.round(dom.getScreenWidth() * 0.5),
-                tag: item.BackdropImageTags[0]
-            });
-            shape = 'thumb';
-        } else if (imageTags.Thumb) {
-            url = apiClient.getScaledImageUrl(item.Id, {
-                type: 'Thumb',
-                maxWidth: Math.round(dom.getScreenWidth() * 0.5),
-                tag: item.ImageTags.Thumb
-            });
-            shape = 'thumb';
-        } else if (imageTags.Disc) {
-            url = apiClient.getScaledImageUrl(item.Id, {
-                type: 'Disc',
-                maxWidth: Math.round(dom.getScreenWidth() * 0.5),
-                tag: item.ImageTags.Disc
-            });
-            shape = 'square';
-        } else if (item.AlbumId && item.AlbumPrimaryImageTag) {
-            url = apiClient.getScaledImageUrl(item.AlbumId, {
-                type: 'Primary',
-                maxWidth: Math.round(dom.getScreenWidth() * 0.5),
-                tag: item.AlbumPrimaryImageTag
-            });
-            shape = 'square';
-        } else if (item.SeriesId && item.SeriesPrimaryImageTag) {
-            url = apiClient.getScaledImageUrl(item.SeriesId, {
-                type: 'Primary',
-                maxWidth: Math.round(dom.getScreenWidth() * 0.5),
-                tag: item.SeriesPrimaryImageTag
-            });
-        } else if (item.ParentPrimaryImageItemId && item.ParentPrimaryImageTag) {
-            url = apiClient.getScaledImageUrl(item.ParentPrimaryImageItemId, {
-                type: 'Primary',
-                maxWidth: Math.round(dom.getScreenWidth() * 0.5),
-                tag: item.ParentPrimaryImageTag
-            });
-        }
-
-        if (editable && url === undefined) {
-            html += "<a class='itemDetailGalleryLink itemDetailImage defaultCardBackground defaultCardBackground" + cardBuilder.getDefaultBackgroundClass(item.Name) + "' is='emby-linkbutton' style='display:block;margin:0;padding:0;' href='#'>";
-        } else if (!editable && url === undefined) {
-            html += "<div class='itemDetailGalleryLink itemDetailImage defaultCardBackground defaultCardBackground" + cardBuilder.getDefaultBackgroundClass(item.Name) + "' is='emby-linkbutton' style='display:block;margin:0;padding:0;' href='#'>";
-        } else if (editable) {
-            html += "<a class='itemDetailGalleryLink' is='emby-linkbutton' style='display:block;margin:0;padding:0;' href='#'>";
-        }
-
-        if (url) {
-            html += "<img class='itemDetailImage lazy' src='data:image/gif;base64,R0lGODlhAQABAAD/ACwAAAAAAQABAAACADs=' />";
-        }
-
-        if (url === undefined) {
-            html += cardBuilder.getDefaultText(item);
-        }
-
-        if (editable) {
-            html += '</a>';
-        } else if (!editable && url === undefined) {
-            html += '</div>';
-        }
-
-        var progressHtml = item.IsFolder || !item.UserData ? '' : indicators.getProgressBarHtml(item);
-        html += '<div class="detailImageProgressContainer">';
-
-        if (progressHtml) {
-            html += progressHtml;
-        }
-
-        html += '</div>';
-        elem.innerHTML = html;
-
-        if (detectRatio && item.PrimaryImageAspectRatio) {
-            if (item.PrimaryImageAspectRatio >= 1.48) {
-                shape = 'thumb';
-            } else if (item.PrimaryImageAspectRatio >= 0.85 && item.PrimaryImageAspectRatio <= 1.34) {
-                shape = 'square';
-            }
-        }
-
-        if ('thumb' == shape) {
-            elem.classList.add('thumbDetailImageContainer');
-            elem.classList.remove('portraitDetailImageContainer');
-            elem.classList.remove('squareDetailImageContainer');
-        } else if ('square' == shape) {
-            elem.classList.remove('thumbDetailImageContainer');
-            elem.classList.remove('portraitDetailImageContainer');
-            elem.classList.add('squareDetailImageContainer');
-        } else {
-            elem.classList.remove('thumbDetailImageContainer');
-            elem.classList.add('portraitDetailImageContainer');
-            elem.classList.remove('squareDetailImageContainer');
-        }
-
-        if (url) {
-            imageLoader.lazyImage(elem.querySelector('img'), url);
-        }
+        elem.innerHTML = cardHtml;
+        imageLoader.lazyChildren(elem);
     }
 
-    function renderImage(page, item, apiClient, user) {
+    function renderImage(page, item) {
         renderDetailImage(
-            page,
             page.querySelector('.detailImageContainer'),
             item,
-            apiClient,
-            user.Policy.IsAdministrator && 'Photo' != item.MediaType,
-            imageLoader,
-            indicators
+            imageLoader
         );
     }
 
@@ -951,7 +819,7 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
 
         if (item.SpecialFeatureCount && 0 != item.SpecialFeatureCount && 'Series' != item.Type) {
             page.querySelector('#specialsCollapsible').classList.remove('hide');
-            renderSpecials(page, item, user, 6);
+            renderSpecials(page, item, user);
         } else {
             page.querySelector('#specialsCollapsible').classList.add('hide');
         }
@@ -972,39 +840,54 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
         }
     }
 
-    function renderOverview(elems, item) {
-        for (var i = 0, length = elems.length; i < length; i++) {
-            var elem = elems[i];
+    function toggleLineClamp(clampTarget, e) {
+        var expandButton = e.target;
+        var clampClassName = 'detail-clamp-text';
+
+        if (clampTarget.classList.contains(clampClassName)) {
+            clampTarget.classList.remove(clampClassName);
+            expandButton.innerHTML = globalize.translate('ShowLess');
+        } else {
+            clampTarget.classList.add(clampClassName);
+            expandButton.innerHTML = globalize.translate('ShowMore');
+        }
+    }
+
+    function renderOverview(page, item) {
+        for (const overviewElemnt of page.querySelectorAll('.overview')) {
             var overview = item.Overview || '';
 
             if (overview) {
-                elem.innerHTML = overview;
-                elem.classList.remove('hide');
-                var anchors = elem.querySelectorAll('a');
+                overviewElemnt.innerHTML = overview;
+                overviewElemnt.classList.remove('hide');
+                overviewElemnt.classList.add('detail-clamp-text');
 
-                for (var j = 0, length2 = anchors.length; j < length2; j++) {
-                    anchors[j].setAttribute('target', '_blank');
+                // Grab the sibling element to control the expand state
+                var expandButton = overviewElemnt.parentElement.querySelector('.overview-expand');
+
+                // Detect if we have overflow of text. Based on this StackOverflow answer
+                // https://stackoverflow.com/a/35157976
+                if (Math.abs(overviewElemnt.scrollHeight - overviewElemnt.offsetHeight) > 2) {
+                    expandButton.classList.remove('hide');
+                } else {
+                    expandButton.classList.add('hide');
+                }
+
+                expandButton.addEventListener('click', toggleLineClamp.bind(null, overviewElemnt));
+
+                for (const anchor of overviewElemnt.querySelectorAll('a')) {
+                    anchor.setAttribute('target', '_blank');
                 }
             } else {
-                elem.innerHTML = '';
-                elem.classList.add('hide');
+                overviewElemnt.innerHTML = '';
+                overviewElemnt.classList.add('hide');
             }
         }
     }
 
-    function renderGenres(page, item, context) {
-        context = context || inferContext(item);
-        var type;
+    function renderGenres(page, item, context = inferContext(item)) {
         var genres = item.GenreItems || [];
-
-        switch (context) {
-            case 'music':
-                type = 'MusicGenre';
-                break;
-
-            default:
-                type = 'Genre';
-        }
+        var type = context === 'music' ? 'MusicGenre' : 'Genre';
 
         var html = genres.map(function (p) {
             return '<a style="color:inherit;" class="button-link" is="emby-linkbutton" href="' + appRouter.getRouteUrl({
@@ -1030,19 +913,49 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
         }
     }
 
-    function renderDirector(page, item, context) {
-        var directors = (item.People || []).filter(function (p) {
-            return 'Director' === p.Type;
+    function renderWriter(page, item, context) {
+        var writers = (item.People || []).filter(function (person) {
+            return person.Type === 'Writer';
         });
-        var html = directors.map(function (p) {
+
+        var html = writers.map(function (person) {
             return '<a style="color:inherit;" class="button-link" is="emby-linkbutton" href="' + appRouter.getRouteUrl({
-                Name: p.Name,
+                Name: person.Name,
                 Type: 'Person',
                 ServerId: item.ServerId,
-                Id: p.Id
+                Id: person.Id
             }, {
                 context: context
-            }) + '">' + p.Name + '</a>';
+            }) + '">' + person.Name + '</a>';
+        }).join(', ');
+
+        var writersLabel = page.querySelector('.writersLabel');
+        writersLabel.innerHTML = globalize.translate(writers.length > 1 ? 'Writers' : 'Writer');
+        var writersValue = page.querySelector('.writers');
+        writersValue.innerHTML = html;
+
+        var writersGroup = page.querySelector('.writersGroup');
+        if (writers.length) {
+            writersGroup.classList.remove('hide');
+        } else {
+            writersGroup.classList.add('hide');
+        }
+    }
+
+    function renderDirector(page, item, context) {
+        var directors = (item.People || []).filter(function (person) {
+            return person.Type === 'Director';
+        });
+
+        var html = directors.map(function (person) {
+            return '<a style="color:inherit;" class="button-link" is="emby-linkbutton" href="' + appRouter.getRouteUrl({
+                Name: person.Name,
+                Type: 'Person',
+                ServerId: item.ServerId,
+                Id: person.Id
+            }, {
+                context: context
+            }) + '">' + person.Name + '</a>';
         }).join(', ');
 
         var directorsLabel = page.querySelector('.directorsLabel');
@@ -1058,13 +971,39 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
         }
     }
 
-    function renderDetails(page, item, apiClient, context, isStatic) {
-        renderSimilarItems(page, item, context);
-        renderMoreFromSeason(page, item, apiClient);
-        renderMoreFromArtist(page, item, apiClient);
-        renderDirector(page, item, context);
-        renderGenres(page, item, context);
-        renderChannelGuide(page, apiClient, item);
+    function renderMiscInfo(page, item) {
+        const primaryItemMiscInfo = page.querySelectorAll('.itemMiscInfo-primary');
+
+        for (const miscInfo of primaryItemMiscInfo) {
+            mediaInfo.fillPrimaryMediaInfo(miscInfo, item, {
+                interactive: true,
+                episodeTitle: false,
+                subtitles: false
+            });
+
+            if (miscInfo.innerHTML && 'SeriesTimer' !== item.Type) {
+                miscInfo.classList.remove('hide');
+            } else {
+                miscInfo.classList.add('hide');
+            }
+        }
+
+        const secondaryItemMiscInfo = page.querySelectorAll('.itemMiscInfo-secondary');
+
+        for (const miscInfo of secondaryItemMiscInfo) {
+            mediaInfo.fillSecondaryMediaInfo(miscInfo, item, {
+                interactive: true
+            });
+
+            if (miscInfo.innerHTML && 'SeriesTimer' !== item.Type) {
+                miscInfo.classList.remove('hide');
+            } else {
+                miscInfo.classList.add('hide');
+            }
+        }
+    }
+
+    function renderTagline(page, item) {
         var taglineElement = page.querySelector('.tagline');
 
         if (item.Taglines && item.Taglines.length) {
@@ -1073,45 +1012,21 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
         } else {
             taglineElement.classList.add('hide');
         }
+    }
 
-        var overview = page.querySelector('.overview');
-        var externalLinksElem = page.querySelector('.itemExternalLinks');
-
-        renderOverview([overview], item);
-        var i;
-        var itemMiscInfo;
-        itemMiscInfo = page.querySelectorAll('.itemMiscInfo-primary');
-
-        for (i = 0; i < itemMiscInfo.length; i++) {
-            mediaInfo.fillPrimaryMediaInfo(itemMiscInfo[i], item, {
-                interactive: true,
-                episodeTitle: false,
-                subtitles: false
-            });
-
-            if (itemMiscInfo[i].innerHTML && 'SeriesTimer' !== item.Type) {
-                itemMiscInfo[i].classList.remove('hide');
-            } else {
-                itemMiscInfo[i].classList.add('hide');
-            }
-        }
-
-        itemMiscInfo = page.querySelectorAll('.itemMiscInfo-secondary');
-
-        for (i = 0; i < itemMiscInfo.length; i++) {
-            mediaInfo.fillSecondaryMediaInfo(itemMiscInfo[i], item, {
-                interactive: true
-            });
-
-            if (itemMiscInfo[i].innerHTML && 'SeriesTimer' !== item.Type) {
-                itemMiscInfo[i].classList.remove('hide');
-            } else {
-                itemMiscInfo[i].classList.add('hide');
-            }
-        }
-
+    function renderDetails(page, item, apiClient, context, isStatic) {
+        renderSimilarItems(page, item, context);
+        renderMoreFromSeason(page, item, apiClient);
+        renderMoreFromArtist(page, item, apiClient);
+        renderDirector(page, item, context);
+        renderWriter(page, item, context);
+        renderGenres(page, item, context);
+        renderChannelGuide(page, apiClient, item);
+        renderTagline(page, item);
+        renderOverview(page, item);
+        renderMiscInfo(page, item);
         reloadUserDataButtons(page, item);
-        renderLinks(externalLinksElem, item);
+        renderLinks(page, item);
         renderTags(page, item);
         renderSeriesAirTime(page, item, isStatic);
     }
@@ -1399,8 +1314,7 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
                     action: 'playallfromhere',
                     image: false,
                     artist: 'auto',
-                    containerAlbumArtists: item.AlbumArtists,
-                    addToListButton: true
+                    containerAlbumArtists: item.AlbumArtists
                 });
                 isList = true;
             } else if ('Series' == item.Type) {
@@ -1442,11 +1356,12 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
                         items: result.Items,
                         showIndexNumber: false,
                         enableOverview: true,
+                        enablePlayedButton: layoutManager.mobile ? false : true,
+                        infoButton: layoutManager.mobile ? false : true,
                         imageSize: 'large',
                         enableSideMediaInfo: false,
                         highlight: false,
-                        action: layoutManager.tv ? 'resume' : 'none',
-                        infoButton: true,
+                        action: !layoutManager.desktop ? 'link' : 'none',
                         imagePlayButton: true,
                         includeParentInfoInTitle: false
                     });
@@ -1473,6 +1388,9 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
                     childrenItemsContainer.classList.remove('vertical-list');
                 }
             }
+            if (layoutManager.mobile) {
+                childrenItemsContainer.classList.remove('padded-right');
+            }
             childrenItemsContainer.innerHTML = html;
             imageLoader.lazyChildren(childrenItemsContainer);
             if ('BoxSet' == item.Type) {
@@ -1674,12 +1592,10 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
     }
 
     function renderCollectionItems(page, parentItem, types, items) {
+        page.querySelector('.collectionItems').classList.remove('hide');
         page.querySelector('.collectionItems').innerHTML = '';
-        var i;
-        var length;
 
-        for (i = 0, length = types.length; i < length; i++) {
-            var type = types[i];
+        for (const type of types) {
             var typeItems = filterItemsByCollectionItemType(items, type);
 
             if (typeItems.length) {
@@ -1712,8 +1628,8 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
             renderChildren(page, parentItem);
         };
 
-        for (i = 0, length = containers.length; i < length; i++) {
-            containers[i].notifyRefreshNeeded = notifyRefreshNeeded;
+        for (const container of containers) {
+            container.notifyRefreshNeeded = notifyRefreshNeeded;
         }
 
         // if nothing in the collection can be played hide play and shuffle buttons
@@ -1760,7 +1676,7 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
         imageLoader.lazyChildren(collectionItems);
         collectionItems.querySelector('.btnAddToCollection').addEventListener('click', function () {
             require(['alert'], function (alert) {
-                alert({
+                alert.default({
                     text: globalize.translate('AddItemToCollectionHelp'),
                     html: globalize.translate('AddItemToCollectionHelp') + '<br/><br/><a is="emby-linkbutton" class="button-link" target="_blank" href="https://web.archive.org/web/20181216120305/https://github.com/MediaBrowser/Wiki/wiki/Collections">' + globalize.translate('ButtonLearnMore') + '</a>'
                 });
@@ -1780,7 +1696,7 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
             if (result.Items.length) {
                 page.querySelector('#musicVideosCollapsible').classList.remove('hide');
                 var musicVideosContent = page.querySelector('.musicVideosContent');
-                musicVideosContent.innerHTML = getVideosHtml(result.Items, user);
+                musicVideosContent.innerHTML = getVideosHtml(result.Items);
                 imageLoader.lazyChildren(musicVideosContent);
             } else {
                 page.querySelector('#musicVideosCollapsible').classList.add('hide');
@@ -1793,7 +1709,7 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
             if (result.Items.length) {
                 page.querySelector('#additionalPartsCollapsible').classList.remove('hide');
                 var additionalPartsContent = page.querySelector('#additionalPartsContent');
-                additionalPartsContent.innerHTML = getVideosHtml(result.Items, user);
+                additionalPartsContent.innerHTML = getVideosHtml(result.Items);
                 imageLoader.lazyChildren(additionalPartsContent);
             } else {
                 page.querySelector('#additionalPartsCollapsible').classList.add('hide');
@@ -1812,7 +1728,8 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
                 chaptercardbuilder.buildChapterCards(item, chapters, {
                     itemsContainer: scenesContent,
                     backdropShape: 'overflowBackdrop',
-                    squareShape: 'overflowSquare'
+                    squareShape: 'overflowSquare',
+                    imageBlurhashes: item.ImageBlurHashes
                 });
             });
         } else {
@@ -1820,10 +1737,10 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
         }
     }
 
-    function getVideosHtml(items, user, limit, moreButtonClass) {
+    function getVideosHtml(items) {
         var html = cardBuilder.getCardsHtml({
             items: items,
-            shape: 'auto',
+            shape: 'autooverflow',
             showTitle: true,
             action: 'play',
             overlayText: false,
@@ -1831,24 +1748,20 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
             showRuntime: true
         });
 
-        if (limit && items.length > limit) {
-            html += '<p style="margin: 0;padding-left:5px;"><button is="emby-button" type="button" class="raised more ' + moreButtonClass + '">' + globalize.translate('ButtonMore') + '</button></p>';
-        }
-
         return html;
     }
 
-    function renderSpecials(page, item, user, limit) {
+    function renderSpecials(page, item, user) {
         connectionManager.getApiClient(item.ServerId).getSpecialFeatures(user.Id, item.Id).then(function (specials) {
             var specialsContent = page.querySelector('#specialsContent');
-            specialsContent.innerHTML = getVideosHtml(specials, user, limit, 'moreSpecials');
+            specialsContent.innerHTML = getVideosHtml(specials);
             imageLoader.lazyChildren(specialsContent);
         });
     }
 
     function renderCast(page, item) {
         var people = (item.People || []).filter(function (p) {
-            return 'Director' !== p.Type;
+            return p.Type === 'Actor';
         });
 
         if (!people.length) {
@@ -1863,7 +1776,8 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
                 itemsContainer: castContent,
                 coverImage: true,
                 serverId: item.ServerId,
-                shape: 'overflowPortrait'
+                shape: 'overflowPortrait',
+                imageBlurhashes: item.ImageBlurHashes
             });
         });
     }
@@ -1876,12 +1790,10 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
     }
 
     function bindAll(view, selector, eventName, fn) {
-        var i;
-        var length;
         var elems = view.querySelectorAll(selector);
 
-        for (i = 0, length = elems.length; i < length; i++) {
-            elems[i].addEventListener(eventName, fn);
+        for (const elem of elems) {
+            elem.addEventListener(eventName, fn);
         }
     }
 
@@ -1894,19 +1806,20 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
     return function (view, params) {
         function reload(instance, page, params) {
             loading.show();
+
             var apiClient = params.serverId ? connectionManager.getApiClient(params.serverId) : ApiClient;
-            var promises = [getPromise(apiClient, params), apiClient.getCurrentUser()];
-            Promise.all(promises).then(function (responses) {
-                var item = responses[0];
-                var user = responses[1];
+
+            Promise.all([getPromise(apiClient, params), apiClient.getCurrentUser()]).then(([item, user]) => {
                 currentItem = item;
                 reloadFromItem(instance, page, params, item, user);
+            }).catch((error) => {
+                console.error('failed to get item or current user: ', error);
             });
         }
 
         function splitVersions(instance, page, apiClient, params) {
             require(['confirm'], function (confirm) {
-                confirm('Are you sure you wish to split the media sources into separate items?', 'Split Media Apart').then(function () {
+                confirm.default('Are you sure you wish to split the media sources into separate items?', 'Split Media Apart').then(function () {
                     loading.show();
                     apiClient.ajax({
                         type: 'DELETE',
@@ -1951,7 +1864,7 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
                 });
             }
 
-            playItem(item, item.UserData && 'resume' === mode ? item.UserData.PlaybackPositionTicks : 0);
+            playItem(item, item.UserData && mode === 'resume' ? item.UserData.PlaybackPositionTicks : 0);
         }
 
         function onPlayClick() {
@@ -1966,15 +1879,6 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
             playbackManager.shuffle(currentItem);
         }
 
-        function onDeleteClick() {
-            require(['deleteHelper'], function (deleteHelper) {
-                deleteHelper.deleteItem({
-                    item: currentItem,
-                    navigate: true
-                });
-            });
-        }
-
         function onCancelSeriesTimerClick() {
             require(['recordingHelper'], function (recordingHelper) {
                 recordingHelper.cancelSeriesTimerWithConfirmation(currentItem.Id, currentItem.ServerId).then(function () {
@@ -2024,17 +1928,6 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
             setTrailerButtonVisibility(view, currentItem);
         }
 
-        function editImages() {
-            return new Promise(function (resolve, reject) {
-                require(['imageEditor'], function (imageEditor) {
-                    imageEditor.show({
-                        itemId: currentItem.Id,
-                        serverId: currentItem.ServerId
-                    }).then(resolve, reject);
-                });
-            });
-        }
-
         function onWebSocketMessage(e, data) {
             var msg = data;
 
@@ -2063,7 +1956,6 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
         bindAll(view, '.btnPlayTrailer', 'click', onPlayTrailerClick);
         bindAll(view, '.btnCancelSeriesTimer', 'click', onCancelSeriesTimerClick);
         bindAll(view, '.btnCancelTimer', 'click', onCancelTimerClick);
-        bindAll(view, '.btnDeleteItem', 'click', onDeleteClick);
         bindAll(view, '.btnDownload', 'click', onDownloadClick);
         view.querySelector('.trackSelections').addEventListener('submit', onTrackSelectionsSubmit);
         view.querySelector('.btnSplitVersions').addEventListener('click', function () {
@@ -2075,30 +1967,10 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
             renderAudioSelections(view, self._currentPlaybackMediaSources);
             renderSubtitleSelections(view, self._currentPlaybackMediaSources);
         });
-        view.addEventListener('click', function (e) {
-            if (dom.parentWithClass(e.target, 'moreScenes')) {
-                renderScenes(view, currentItem);
-            } else if (dom.parentWithClass(e.target, 'morePeople')) {
-                renderCast(view, currentItem);
-            } else if (dom.parentWithClass(e.target, 'moreSpecials')) {
-                apiClient.getCurrentUser().then(function (user) {
-                    renderSpecials(view, currentItem, user);
-                });
-            }
-        });
-        view.querySelector('.detailImageContainer').addEventListener('click', function (e) {
-            if (dom.parentWithClass(e.target, 'itemDetailGalleryLink')) {
-                editImages().then(function () {
-                    reload(self, view, params);
-                });
-            }
-        });
         view.addEventListener('viewshow', function (e) {
             var page = this;
 
-            if (layoutManager.mobile) {
-                libraryMenu.setTransparentMenu(true);
-            }
+            libraryMenu.setTransparentMenu(true);
 
             if (e.detail.isRestored) {
                 if (currentItem) {
diff --git a/src/controllers/list.js b/src/controllers/list.js
index edd4469007..e550b535f4 100644
--- a/src/controllers/list.js
+++ b/src/controllers/list.js
@@ -1,4 +1,4 @@
-define(['globalize', 'listView', 'layoutManager', 'userSettings', 'focusManager', 'cardBuilder', 'loading', 'connectionManager', 'alphaNumericShortcuts', 'scroller', 'playbackManager', 'alphaPicker', 'emby-itemscontainer', 'emby-scroller'], function (globalize, listView, layoutManager, userSettings, focusManager, cardBuilder, loading, connectionManager, AlphaNumericShortcuts, scroller, playbackManager, alphaPicker) {
+define(['globalize', 'listView', 'layoutManager', 'userSettings', 'focusManager', 'cardBuilder', 'loading', 'connectionManager', 'alphaNumericShortcuts', 'scroller', 'playbackManager', 'alphaPicker', 'emby-itemscontainer', 'emby-scroller'], function (globalize, listView, layoutManager, userSettings, focusManager, cardBuilder, loading, connectionManager, AlphaNumericShortcuts, scroller, playbackManager, AlphaPicker) {
     'use strict';
 
     function getInitialLiveTvQuery(instance, params) {
@@ -308,7 +308,7 @@ define(['globalize', 'listView', 'layoutManager', 'userSettings', 'focusManager'
         return apiClient.getItems(apiClient.getCurrentUserId(), modifyQueryWithFilters(instance, {
             StartIndex: startIndex,
             Limit: limit,
-            Fields: 'PrimaryImageAspectRatio,SortName',
+            Fields: 'PrimaryImageAspectRatio,SortName,Path',
             ImageTypeLimit: 1,
             ParentId: item.Id,
             SortBy: sortBy
@@ -386,7 +386,7 @@ define(['globalize', 'listView', 'layoutManager', 'userSettings', 'focusManager'
         var instance = this;
 
         require(['playlistEditor'], function (playlistEditor) {
-            new playlistEditor().show({
+            new playlistEditor.showEditor({
                 items: [],
                 serverId: instance.params.serverId
             });
@@ -544,7 +544,7 @@ define(['globalize', 'listView', 'layoutManager', 'userSettings', 'focusManager'
             alphaPickerElement.classList.add('focuscontainer-right');
             self.itemsContainer.parentNode.classList.add('padded-right-withalphapicker');
 
-            self.alphaPicker = new alphaPicker({
+            self.alphaPicker = new AlphaPicker.default({
                 element: alphaPickerElement,
                 itemsContainer: layoutManager.tv ? self.itemsContainer : null,
                 itemClass: 'card',
@@ -803,7 +803,7 @@ define(['globalize', 'listView', 'layoutManager', 'userSettings', 'focusManager'
                 bindAll(view.querySelectorAll('.btnShuffle'), 'click', shuffle);
             }
 
-            this.alphaNumericShortcuts = new AlphaNumericShortcuts({
+            self.alphaNumericShortcuts = new AlphaNumericShortcuts.default({
                 itemsContainer: self.itemsContainer
             });
         });
diff --git a/src/controllers/livetv/livetvchannels.js b/src/controllers/livetv/livetvchannels.js
index 7f22d3dd13..62906d9d21 100644
--- a/src/controllers/livetv/livetvchannels.js
+++ b/src/controllers/livetv/livetvchannels.js
@@ -86,7 +86,7 @@ define(['cardBuilder', 'imageLoader', 'libraryBrowser', 'loading', 'events', 'us
         }
 
         function showFilterMenu(context) {
-            require(['components/filterdialog/filterdialog'], function (filterDialogFactory) {
+            require(['components/filterdialog/filterdialog'], function ({default: filterDialogFactory}) {
                 var filterDialog = new filterDialogFactory({
                     query: getQuery(),
                     mode: 'livetvchannels',
diff --git a/src/controllers/livetvguideprovider.js b/src/controllers/livetvguideprovider.js
index e83036992b..8f8b9f91c7 100644
--- a/src/controllers/livetvguideprovider.js
+++ b/src/controllers/livetvguideprovider.js
@@ -17,7 +17,7 @@ define(['events', 'loading', 'globalize'], function (events, loading, globalize)
 
     function loadTemplate(page, type, providerId) {
         require(['text!./components/tvproviders/' + type + '.template.html'], function (html) {
-            page.querySelector('.providerTemplate').innerHTML = globalize.translateDocument(html);
+            page.querySelector('.providerTemplate').innerHTML = globalize.translateHtml(html);
             init(page, type, providerId);
         });
     }
diff --git a/src/controllers/livetvsettings.js b/src/controllers/livetvsettings.js
index 7a8552b9ac..715eb06214 100644
--- a/src/controllers/livetvsettings.js
+++ b/src/controllers/livetvsettings.js
@@ -1,4 +1,4 @@
-define(['jQuery', 'loading', 'globalize', 'fnchecked', 'emby-button'], function ($, loading, globalize) {
+define(['jQuery', 'loading', 'globalize', 'emby-button'], function ($, loading, globalize) {
     'use strict';
 
     function loadPage(page, config) {
@@ -59,7 +59,7 @@ define(['jQuery', 'loading', 'globalize', 'fnchecked', 'emby-button'], function
         $('.liveTvSettingsForm').off('submit', onSubmit).on('submit', onSubmit);
         $('#btnSelectRecordingPath', page).on('click.selectDirectory', function () {
             require(['directorybrowser'], function (directoryBrowser) {
-                var picker = new directoryBrowser();
+                var picker = new directoryBrowser.default();
                 picker.show({
                     callback: function (path) {
                         if (path) {
@@ -74,7 +74,7 @@ define(['jQuery', 'loading', 'globalize', 'fnchecked', 'emby-button'], function
         });
         $('#btnSelectMovieRecordingPath', page).on('click.selectDirectory', function () {
             require(['directorybrowser'], function (directoryBrowser) {
-                var picker = new directoryBrowser();
+                var picker = new directoryBrowser.default();
                 picker.show({
                     callback: function (path) {
                         if (path) {
@@ -89,7 +89,7 @@ define(['jQuery', 'loading', 'globalize', 'fnchecked', 'emby-button'], function
         });
         $('#btnSelectSeriesRecordingPath', page).on('click.selectDirectory', function () {
             require(['directorybrowser'], function (directoryBrowser) {
-                var picker = new directoryBrowser();
+                var picker = new directoryBrowser.default();
                 picker.show({
                     callback: function (path) {
                         if (path) {
@@ -104,7 +104,7 @@ define(['jQuery', 'loading', 'globalize', 'fnchecked', 'emby-button'], function
         });
         $('#btnSelectPostProcessorPath', page).on('click.selectDirectory', function () {
             require(['directorybrowser'], function (directoryBrowser) {
-                var picker = new directoryBrowser();
+                var picker = new directoryBrowser.default();
                 picker.show({
                     includeFiles: true,
                     callback: function (path) {
diff --git a/src/controllers/livetvstatus.js b/src/controllers/livetvstatus.js
index 82d0b697db..84ea006fd9 100644
--- a/src/controllers/livetvstatus.js
+++ b/src/controllers/livetvstatus.js
@@ -49,7 +49,7 @@ define(['jQuery', 'globalize', 'scripts/taskbutton', 'dom', 'libraryMenu', 'layo
         var message = globalize.translate('MessageConfirmDeleteTunerDevice');
 
         require(['confirm'], function (confirm) {
-            confirm(message, globalize.translate('HeaderDeleteDevice')).then(function () {
+            confirm.default(message, globalize.translate('HeaderDeleteDevice')).then(function () {
                 loading.show();
                 ApiClient.ajax({
                     type: 'DELETE',
@@ -155,8 +155,8 @@ define(['jQuery', 'globalize', 'scripts/taskbutton', 'dom', 'libraryMenu', 'layo
     }
 
     function mapChannels(page, providerId) {
-        require(['components/channelMapper/channelMapper'], function (channelmapper) {
-            new channelmapper({
+        require(['components/channelMapper/channelMapper'], function (channelMapper) {
+            new channelMapper.default({
                 serverId: ApiClient.serverInfo().Id,
                 providerId: providerId
             }).show();
@@ -167,7 +167,7 @@ define(['jQuery', 'globalize', 'scripts/taskbutton', 'dom', 'libraryMenu', 'layo
         var message = globalize.translate('MessageConfirmDeleteGuideProvider');
 
         require(['confirm'], function (confirm) {
-            confirm(message, globalize.translate('HeaderDeleteProvider')).then(function () {
+            confirm.default(message, globalize.translate('HeaderDeleteProvider')).then(function () {
                 loading.show();
                 ApiClient.ajax({
                     type: 'DELETE',
@@ -303,7 +303,7 @@ define(['jQuery', 'globalize', 'scripts/taskbutton', 'dom', 'libraryMenu', 'layo
     }).on('pageshow', '#liveTvStatusPage', function () {
         var page = this;
         reload(page);
-        taskButton({
+        taskButton.default({
             mode: 'on',
             progressElem: page.querySelector('.refreshGuideProgress'),
             taskKey: 'RefreshGuide',
@@ -311,7 +311,7 @@ define(['jQuery', 'globalize', 'scripts/taskbutton', 'dom', 'libraryMenu', 'layo
         });
     }).on('pagehide', '#liveTvStatusPage', function () {
         var page = this;
-        taskButton({
+        taskButton.default({
             mode: 'off',
             progressElem: page.querySelector('.refreshGuideProgress'),
             taskKey: 'RefreshGuide',
diff --git a/src/controllers/livetvtuner.js b/src/controllers/livetvtuner.js
index d7a4d92db2..92f705c02f 100644
--- a/src/controllers/livetvtuner.js
+++ b/src/controllers/livetvtuner.js
@@ -215,7 +215,7 @@ define(['globalize', 'loading', 'libraryMenu', 'dom', 'emby-input', 'emby-button
         });
         view.querySelector('.btnSelectPath').addEventListener('click', function () {
             require(['directorybrowser'], function (directoryBrowser) {
-                var picker = new directoryBrowser();
+                var picker = new directoryBrowser.default();
                 picker.show({
                     includeFiles: true,
                     callback: function (path) {
diff --git a/src/controllers/movies/moviecollections.js b/src/controllers/movies/moviecollections.js
index e9ae599b92..65abca46e0 100644
--- a/src/controllers/movies/moviecollections.js
+++ b/src/controllers/movies/moviecollections.js
@@ -171,7 +171,12 @@ define(['loading', 'events', 'libraryBrowser', 'imageLoader', 'listView', 'cardB
                 }
 
                 if (!result.Items.length) {
-                    html = '<p style="text-align:center;">' + globalize.translate('MessageNoCollectionsAvailable') + '</p>';
+                    html = '';
+
+                    html += '<div class="noItemsMessage centerMessage">';
+                    html += '<h1>' + globalize.translate('MessageNothingHere') + '</h1>';
+                    html += '<p>' + globalize.translate('MessageNoCollectionsAvailable') + '</p>';
+                    html += '</div>';
                 }
 
                 var itemsContainer = tabContent.querySelector('.itemsContainer');
@@ -237,7 +242,7 @@ define(['loading', 'events', 'libraryBrowser', 'imageLoader', 'listView', 'cardB
             tabContent.querySelector('.btnNewCollection').addEventListener('click', function () {
                 require(['collectionEditor'], function (collectionEditor) {
                     var serverId = ApiClient.serverInfo().Id;
-                    new collectionEditor().show({
+                    new collectionEditor.showEditor({
                         items: [],
                         serverId: serverId
                     });
diff --git a/src/controllers/movies/moviegenres.js b/src/controllers/movies/moviegenres.js
index e8e49ff9da..ab410c1bd4 100644
--- a/src/controllers/movies/moviegenres.js
+++ b/src/controllers/movies/moviegenres.js
@@ -165,6 +165,15 @@ define(['layoutManager', 'loading', 'libraryBrowser', 'cardBuilder', 'lazyLoader
                     html += '</div>';
                 }
 
+                if (!result.Items.length) {
+                    html = '';
+
+                    html += '<div class="noItemsMessage centerMessage">';
+                    html += '<h1>' + globalize.translate('MessageNothingHere') + '</h1>';
+                    html += '<p>' + globalize.translate('MessageNoGenresAvailable') + '</p>';
+                    html += '</div>';
+                }
+
                 elem.innerHTML = html;
                 lazyLoader.lazyChildren(elem, fillItemsContainer);
                 libraryBrowser.saveQueryValues(getSavedQueryKey(), query);
diff --git a/src/controllers/movies/movies.js b/src/controllers/movies/movies.js
index 89bcc215e6..82b162e2ad 100644
--- a/src/controllers/movies/movies.js
+++ b/src/controllers/movies/movies.js
@@ -1,4 +1,4 @@
-define(['loading', 'layoutManager', 'userSettings', 'events', 'libraryBrowser', 'alphaPicker', 'listView', 'cardBuilder', 'globalize', 'emby-itemscontainer'], function (loading, layoutManager, userSettings, events, libraryBrowser, alphaPicker, listView, cardBuilder, globalize) {
+define(['loading', 'layoutManager', 'userSettings', 'events', 'libraryBrowser', 'alphaPicker', 'listView', 'cardBuilder', 'globalize', 'emby-itemscontainer'], function (loading, layoutManager, userSettings, events, libraryBrowser, AlphaPicker, listView, cardBuilder, globalize) {
     'use strict';
 
     return function (view, params, tabContent, options) {
@@ -168,7 +168,7 @@ define(['loading', 'layoutManager', 'userSettings', 'events', 'libraryBrowser',
                     query.StartIndex = 0;
                     itemsContainer.refreshItems();
                 });
-                self.alphaPicker = new alphaPicker({
+                self.alphaPicker = new AlphaPicker.default({
                     element: alphaPickerElement,
                     valueChangeEvent: 'click'
                 });
@@ -270,7 +270,7 @@ define(['loading', 'layoutManager', 'userSettings', 'events', 'libraryBrowser',
         query = userSettings.loadQuerySettings(savedQueryKey, query);
 
         self.showFilterMenu = function () {
-            require(['components/filterdialog/filterdialog'], function (filterDialogFactory) {
+            require(['components/filterdialog/filterdialog'], function ({default: filterDialogFactory}) {
                 var filterDialog = new filterDialogFactory({
                     query: query,
                     mode: 'movies',
diff --git a/src/controllers/movies/movietrailers.js b/src/controllers/movies/movietrailers.js
index 25d41d4fba..a9db0abf49 100644
--- a/src/controllers/movies/movietrailers.js
+++ b/src/controllers/movies/movietrailers.js
@@ -1,4 +1,4 @@
-define(['layoutManager', 'loading', 'events', 'libraryBrowser', 'imageLoader', 'alphaPicker', 'listView', 'cardBuilder', 'userSettings', 'globalize', 'emby-itemscontainer'], function (layoutManager, loading, events, libraryBrowser, imageLoader, alphaPicker, listView, cardBuilder, userSettings, globalize) {
+define(['layoutManager', 'loading', 'events', 'libraryBrowser', 'imageLoader', 'alphaPicker', 'listView', 'cardBuilder', 'userSettings', 'globalize', 'emby-itemscontainer'], function (layoutManager, loading, events, libraryBrowser, imageLoader, AlphaPicker, listView, cardBuilder, userSettings, globalize) {
     'use strict';
 
     return function (view, params, tabContent) {
@@ -158,7 +158,12 @@ define(['layoutManager', 'loading', 'events', 'libraryBrowser', 'imageLoader', '
                 }
 
                 if (!result.Items.length) {
-                    html = '<p style="text-align:center;">' + globalize.translate('MessageNoTrailersFound') + '</p>';
+                    html = '';
+
+                    html += '<div class="noItemsMessage centerMessage">';
+                    html += '<h1>' + globalize.translate('MessageNothingHere') + '</h1>';
+                    html += '<p>' + globalize.translate('MessageNoTrailersFound') + '</p>';
+                    html += '</div>';
                 }
 
                 var itemsContainer = tabContent.querySelector('.itemsContainer');
@@ -180,7 +185,7 @@ define(['layoutManager', 'loading', 'events', 'libraryBrowser', 'imageLoader', '
         var isLoading = false;
 
         self.showFilterMenu = function () {
-            require(['components/filterdialog/filterdialog'], function (filterDialogFactory) {
+            require(['components/filterdialog/filterdialog'], function ({default: filterDialogFactory}) {
                 var filterDialog = new filterDialogFactory({
                     query: getQuery(tabContent),
                     mode: 'movies',
@@ -208,7 +213,7 @@ define(['layoutManager', 'loading', 'events', 'libraryBrowser', 'imageLoader', '
                 query.StartIndex = 0;
                 reloadItems();
             });
-            self.alphaPicker = new alphaPicker({
+            self.alphaPicker = new AlphaPicker.default({
                 element: alphaPickerElement,
                 valueChangeEvent: 'click'
             });
diff --git a/src/controllers/music/musicalbums.js b/src/controllers/music/musicalbums.js
index ecb51f9dc3..3630e0b9f9 100644
--- a/src/controllers/music/musicalbums.js
+++ b/src/controllers/music/musicalbums.js
@@ -1,4 +1,4 @@
-define(['layoutManager', 'playbackManager', 'loading', 'events', 'libraryBrowser', 'imageLoader', 'alphaPicker', 'listView', 'cardBuilder', 'userSettings', 'globalize', 'emby-itemscontainer'], function (layoutManager, playbackManager, loading, events, libraryBrowser, imageLoader, alphaPicker, listView, cardBuilder, userSettings, globalize) {
+define(['layoutManager', 'playbackManager', 'loading', 'events', 'libraryBrowser', 'imageLoader', 'alphaPicker', 'listView', 'cardBuilder', 'userSettings', 'globalize', 'emby-itemscontainer'], function (layoutManager, playbackManager, loading, events, libraryBrowser, imageLoader, AlphaPicker, listView, cardBuilder, userSettings, globalize) {
     'use strict';
 
     return function (view, params, tabContent) {
@@ -186,7 +186,7 @@ define(['layoutManager', 'playbackManager', 'loading', 'events', 'libraryBrowser
         var isLoading = false;
 
         self.showFilterMenu = function () {
-            require(['components/filterdialog/filterdialog'], function (filterDialogFactory) {
+            require(['components/filterdialog/filterdialog'], function ({default: filterDialogFactory}) {
                 var filterDialog = new filterDialogFactory({
                     query: getQuery(),
                     mode: 'albums',
@@ -215,7 +215,7 @@ define(['layoutManager', 'playbackManager', 'loading', 'events', 'libraryBrowser
                 query.StartIndex = 0;
                 reloadItems(tabContent);
             });
-            self.alphaPicker = new alphaPicker({
+            self.alphaPicker = new AlphaPicker.default({
                 element: alphaPickerElement,
                 valueChangeEvent: 'click'
             });
diff --git a/src/controllers/music/musicartists.js b/src/controllers/music/musicartists.js
index bd9341be6d..c9a0b06b77 100644
--- a/src/controllers/music/musicartists.js
+++ b/src/controllers/music/musicartists.js
@@ -1,4 +1,4 @@
-define(['layoutManager', 'loading', 'events', 'libraryBrowser', 'imageLoader', 'alphaPicker', 'listView', 'cardBuilder', 'apphost', 'userSettings', 'emby-itemscontainer'], function (layoutManager, loading, events, libraryBrowser, imageLoader, alphaPicker, listView, cardBuilder, appHost, userSettings) {
+define(['layoutManager', 'loading', 'events', 'libraryBrowser', 'imageLoader', 'alphaPicker', 'listView', 'cardBuilder', 'apphost', 'userSettings', 'emby-itemscontainer'], function (layoutManager, loading, events, libraryBrowser, imageLoader, AlphaPicker, listView, cardBuilder, appHost, userSettings) {
     'use strict';
 
     return function (view, params, tabContent) {
@@ -170,7 +170,7 @@ define(['layoutManager', 'loading', 'events', 'libraryBrowser', 'imageLoader', '
         var isLoading = false;
 
         self.showFilterMenu = function () {
-            require(['components/filterdialog/filterdialog'], function (filterDialogFactory) {
+            require(['components/filterdialog/filterdialog'], function ({default: filterDialogFactory}) {
                 var filterDialog = new filterDialogFactory({
                     query: getQuery(tabContent),
                     mode: self.mode,
@@ -199,7 +199,7 @@ define(['layoutManager', 'loading', 'events', 'libraryBrowser', 'imageLoader', '
                 query.StartIndex = 0;
                 reloadItems(tabContent);
             });
-            self.alphaPicker = new alphaPicker({
+            self.alphaPicker = new AlphaPicker.default({
                 element: alphaPickerElement,
                 valueChangeEvent: 'click'
             });
diff --git a/src/controllers/music/songs.js b/src/controllers/music/songs.js
index 8e50cd720c..aa63ec51fe 100644
--- a/src/controllers/music/songs.js
+++ b/src/controllers/music/songs.js
@@ -124,7 +124,7 @@ define(['events', 'libraryBrowser', 'imageLoader', 'listView', 'loading', 'userS
         var isLoading = false;
 
         self.showFilterMenu = function () {
-            require(['components/filterdialog/filterdialog'], function (filterDialogFactory) {
+            require(['components/filterdialog/filterdialog'], function ({default: filterDialogFactory}) {
                 var filterDialog = new filterDialogFactory({
                     query: getQuery(tabContent),
                     mode: 'songs',
diff --git a/src/controllers/playback/nowplaying.js b/src/controllers/playback/nowplaying.js
deleted file mode 100644
index 98c9945e84..0000000000
--- a/src/controllers/playback/nowplaying.js
+++ /dev/null
@@ -1,22 +0,0 @@
-define(['components/remotecontrol/remotecontrol', 'libraryMenu', 'emby-button'], function (remotecontrolFactory, libraryMenu) {
-    'use strict';
-
-    return function (view, params) {
-        var remoteControl = new remotecontrolFactory();
-        remoteControl.init(view, view.querySelector('.remoteControlContent'));
-        view.addEventListener('viewshow', function (e) {
-            libraryMenu.setTransparentMenu(true);
-
-            if (remoteControl) {
-                remoteControl.onShow();
-            }
-        });
-        view.addEventListener('viewbeforehide', function (e) {
-            libraryMenu.setTransparentMenu(false);
-
-            if (remoteControl) {
-                remoteControl.destroy();
-            }
-        });
-    };
-});
diff --git a/src/nowplaying.html b/src/controllers/playback/queue/index.html
similarity index 88%
rename from src/nowplaying.html
rename to src/controllers/playback/queue/index.html
index 5f235a562e..592807737f 100644
--- a/src/nowplaying.html
+++ b/src/controllers/playback/queue/index.html
@@ -5,7 +5,7 @@
         <div class="nowPlayingInfoContainer">
             <div class="nowPlayingPageImageContainer"></div>
             <div class="nowPlayingInfoControls">
-            
+
                 <div class="flex">
 
                     <div class="nowPlayingInfoContainerMedia">
@@ -15,9 +15,9 @@
                         <div class="nowPlayingArtist nowPlayingSerie"></div>
                     </div>
                     <div class="nowPlayingPageUserDataButtonsTitle"></div>
-                    
+
                 </div>
-                
+
                 <div class="sliderContainer flex">
                     <div class="positionTime"></div>
                         <div class="nowPlayingPositionSliderContainer">
@@ -25,15 +25,20 @@
                         </div>
                     <div class="runtime"></div>
                 </div>
-                
-                <div class="nowPlayingButtonsContainer focuscontainer-x">
-                
+
+                <div class="nowPlayingButtonsContainer focuscontainer-x justify-content-space-between">
+
                     <div class="nowPlayingInfoButtons">
-                    
+
+                        <button is="paper-icon-button-light" class="btnCommand btnRepeat repeatToggleButton autoSize" title="${ButtonRepeat}"
+                            data-command="SetRepeatMode">
+                            <span class="material-icons repeat"></span>
+                        </button>
+
                         <button is="paper-icon-button-light" class="btnRewind btnNowPlayingRewind btnPlayStateCommand autoSize" title="${Rewind}">
                             <span class="material-icons replay_10"></span>
                         </button>
-                        
+
                         <button is="paper-icon-button-light" class="btnPreviousTrack btnPlayStateCommand autoSize" title="${ButtonPreviousTrack}">
                             <span class="material-icons skip_previous"></span>
                         </button>
@@ -49,15 +54,19 @@
                         <button is="paper-icon-button-light" class="btnPlayStateCommand btnNextTrack autoSize" title="${ButtonNextTrack}">
                             <span class="material-icons skip_next"></span>
                         </button>
-                        
+
                         <button is="paper-icon-button-light" class="btnPlayStateCommand btnFastForward btnNowPlayingFastForward autoSize" title="${FastForward}">
                             <span class="material-icons forward_30"></span>
                         </button>
-                    
+
+                        <button is="paper-icon-button-light" class="btnShuffleQueue autoSize" title="${ButtonShuffle}">
+                            <span class="material-icons shuffle"></span>
+                        </button>
+
                     </div>
 
                     <div class="nowPlayingSecondaryButtons">
-                    
+
                         <button is="paper-icon-button-light" class="btnAudioTracks videoButton btnPlayStateCommand autoSize" title="${ButtonAudioTracks}" data-command="GoToSearch">
                             <span class="material-icons audiotrack"></span>
                         </button>
@@ -65,14 +74,19 @@
                         <button is="paper-icon-button-light" class="btnSubtitles videoButton btnPlayStateCommand autoSize" title="${ButtonSubtitles}" data-command="GoToSearch">
                             <span class="material-icons closed_caption"></span>
                         </button>
-                    
+
                         <div class="nowPlayingPageUserDataButtons"></div>
 
                         <button is="paper-icon-button-light" class="btnToggleFullscreen videoButton btnPlayStateCommand autoSize" title="${ButtonFullscreen}" data-command="ToggleFullscreen">
                             <span class="material-icons fullscreen"></span>
                         </button>
 
-                        <button is="paper-icon-button-light" class="btnCommand repeatToggleButton autoSize" title="${ButtonRepeat}" data-command="SetRepeatMode">
+                        <button is="paper-icon-button-light" class="btnShuffleQueue autoSize" title="${ButtonShuffle}">
+                            <span class="material-icons shuffle"></span>
+                        </button>
+
+                        <button is="paper-icon-button-light" class="btnCommand btnRepeat repeatToggleButton autoSize" title="${ButtonRepeat}"
+                            data-command="SetRepeatMode">
                             <span class="material-icons repeat"></span>
                         </button>
 
@@ -162,21 +176,18 @@
             </div>
         </div>
         <div class="playlistSection">
-            <div class="playlistSectionButton flex align-items-center justify-content-center">
-                <button id="togglePlaylist" is="paper-icon-button-light" class="btnTogglePlaylist" title="${ButtonTogglePlaylist}">
+            <div class="playlistSectionButton flex align-items-center justify-content-center focuscontainer-x">
+                <button id="togglePlaylist" is="paper-icon-button-light" class="btnTogglePlaylist hide" title="${ButtonTogglePlaylist}">
                     <span class="material-icons queue_music"></span>
                 </button>
-                <button is="paper-icon-button-light" class="btnSavePlaylist" title="${ButtonSave}">
+                <button is="paper-icon-button-light" class="btnSavePlaylist hide" title="${ButtonSave}">
                     <span class="material-icons save"></span>
                 </button>
+                <button id="toggleContextMenu" is="paper-icon-button-light" class="btnToggleContextMenu" title="${ButtonToggleContextMenu}">
+                    <span class="material-icons more_vert"></span>
+                </button>
             </div>
             <div id="playlist" class="playlist itemsContainer vertical-list nowPlayingPlaylist hide" is="emby-itemscontainer" data-dragreorder="true"></div>
-            <div id="contextMenu" class="contextMenu itemsContainer vertical-list nowPlayingContextMenu hide" is="emby-itemscontainer">
-                <div class="listItem listItem-border contextMenuList contextMenuArtist">
-                </div>
-                <div class="listItem listItem-border contextMenuList contextMenuAlbum">
-                </div>
-            </div>
         </div>
     </div>
 </div>
diff --git a/src/controllers/playback/queue/index.js b/src/controllers/playback/queue/index.js
new file mode 100644
index 0000000000..581b5f4b8a
--- /dev/null
+++ b/src/controllers/playback/queue/index.js
@@ -0,0 +1,22 @@
+import remotecontrolFactory from 'components/remotecontrol/remotecontrol';
+import libraryMenu from 'libraryMenu';
+import 'emby-button';
+
+export default function (view, params) {
+    const remoteControl = new remotecontrolFactory();
+    remoteControl.init(view, view.querySelector('.remoteControlContent'));
+    view.addEventListener('viewshow', function (e) {
+        libraryMenu.setTransparentMenu(true);
+
+        if (remoteControl) {
+            remoteControl.onShow();
+        }
+    });
+    view.addEventListener('viewbeforehide', function (e) {
+        libraryMenu.setTransparentMenu(false);
+
+        if (remoteControl) {
+            remoteControl.destroy();
+        }
+    });
+}
diff --git a/src/videoosd.html b/src/controllers/playback/video/index.html
similarity index 100%
rename from src/videoosd.html
rename to src/controllers/playback/video/index.html
diff --git a/src/controllers/playback/videoosd.js b/src/controllers/playback/video/index.js
similarity index 78%
rename from src/controllers/playback/videoosd.js
rename to src/controllers/playback/video/index.js
index 831aea5571..e821c2393e 100644
--- a/src/controllers/playback/videoosd.js
+++ b/src/controllers/playback/video/index.js
@@ -1,5 +1,24 @@
-define(['playbackManager', 'dom', 'inputManager', 'datetime', 'itemHelper', 'mediaInfo', 'focusManager', 'imageLoader', 'scrollHelper', 'events', 'connectionManager', 'browser', 'globalize', 'apphost', 'layoutManager', 'userSettings', 'keyboardnavigation', 'scrollStyles', 'emby-slider', 'paper-icon-button-light', 'css!assets/css/videoosd'], function (playbackManager, dom, inputManager, datetime, itemHelper, mediaInfo, focusManager, imageLoader, scrollHelper, events, connectionManager, browser, globalize, appHost, layoutManager, userSettings, keyboardnavigation) {
-    'use strict';
+import playbackManager from 'playbackManager';
+import dom from 'dom';
+import inputManager from 'inputManager';
+import datetime from 'datetime';
+import itemHelper from 'itemHelper';
+import mediaInfo from 'mediaInfo';
+import focusManager from 'focusManager';
+import events from 'events';
+import connectionManager from 'connectionManager';
+import browser from 'browser';
+import globalize from 'globalize';
+import appHost from 'apphost';
+import layoutManager from 'layoutManager';
+import * as userSettings from 'userSettings';
+import keyboardnavigation from 'keyboardnavigation';
+import 'scrollStyles';
+import 'emby-slider';
+import 'paper-icon-button-light';
+import 'css!assets/css/videoosd';
+
+/* eslint-disable indent */
 
     function seriesImageUrl(item, options) {
         if ('Episode' !== item.Type) {
@@ -45,13 +64,17 @@ define(['playbackManager', 'dom', 'inputManager', 'datetime', 'itemHelper', 'med
         return null;
     }
 
-    return function (view, params) {
+    function getOpenedDialog() {
+        return document.querySelector('.dialogContainer .dialog.opened');
+    }
+
+    export default function (view, params) {
         function onVerticalSwipe(e, elem, data) {
-            var player = currentPlayer;
+            const player = currentPlayer;
 
             if (player) {
-                var deltaY = data.currentDeltaY;
-                var windowSize = dom.getWindowSize();
+                const deltaY = data.currentDeltaY;
+                const windowSize = dom.getWindowSize();
 
                 if (supportsBrightnessChange && data.clientX < windowSize.innerWidth / 2) {
                     return void doBrightnessTouch(deltaY, player, windowSize.innerHeight);
@@ -62,23 +85,23 @@ define(['playbackManager', 'dom', 'inputManager', 'datetime', 'itemHelper', 'med
         }
 
         function doBrightnessTouch(deltaY, player, viewHeight) {
-            var delta = -deltaY / viewHeight * 100;
-            var newValue = playbackManager.getBrightness(player) + delta;
+            const delta = -deltaY / viewHeight * 100;
+            let newValue = playbackManager.getBrightness(player) + delta;
             newValue = Math.min(newValue, 100);
             newValue = Math.max(newValue, 0);
             playbackManager.setBrightness(newValue, player);
         }
 
         function doVolumeTouch(deltaY, player, viewHeight) {
-            var delta = -deltaY / viewHeight * 100;
-            var newValue = playbackManager.getVolume(player) + delta;
+            const delta = -deltaY / viewHeight * 100;
+            let newValue = playbackManager.getVolume(player) + delta;
             newValue = Math.min(newValue, 100);
             newValue = Math.max(newValue, 0);
             playbackManager.setVolume(newValue, player);
         }
 
         function onDoubleClick(e) {
-            var clientX = e.clientX;
+            const clientX = e.clientX;
 
             if (null != clientX) {
                 if (clientX < dom.getWindowSize().innerWidth / 2) {
@@ -94,7 +117,7 @@ define(['playbackManager', 'dom', 'inputManager', 'datetime', 'itemHelper', 'med
 
         function getDisplayItem(item) {
             if ('TvChannel' === item.Type) {
-                var apiClient = connectionManager.getApiClient(item.ServerId);
+                const apiClient = connectionManager.getApiClient(item.ServerId);
                 return apiClient.getItem(apiClient.getCurrentUserId(), item.Id).then(function (refreshedItem) {
                     return {
                         originalItem: refreshedItem,
@@ -120,7 +143,7 @@ define(['playbackManager', 'dom', 'inputManager', 'datetime', 'itemHelper', 'med
 
             connectionManager.getApiClient(item.ServerId).getCurrentUser().then(function (user) {
                 if (user.Policy.EnableLiveTvManagement) {
-                    require(['recordingButton'], function (RecordingButton) {
+                    import('recordingButton').then(({default: RecordingButton}) => {
                         if (recordingButtonManager) {
                             return void recordingButtonManager.refreshItem(item);
                         }
@@ -136,28 +159,28 @@ define(['playbackManager', 'dom', 'inputManager', 'datetime', 'itemHelper', 'med
         }
 
         function updateDisplayItem(itemInfo) {
-            var item = itemInfo.originalItem;
+            const item = itemInfo.originalItem;
             currentItem = item;
-            var displayItem = itemInfo.displayItem || item;
+            const displayItem = itemInfo.displayItem || item;
             updateRecordingButton(displayItem);
             setPoster(displayItem, item);
-            var parentName = displayItem.SeriesName || displayItem.Album;
+            let parentName = displayItem.SeriesName || displayItem.Album;
 
             if (displayItem.EpisodeTitle || displayItem.IsSeries) {
                 parentName = displayItem.Name;
             }
 
             setTitle(displayItem, parentName);
-            var titleElement;
-            var osdTitle = view.querySelector('.osdTitle');
+            let titleElement;
+            const osdTitle = view.querySelector('.osdTitle');
             titleElement = osdTitle;
-            var displayName = itemHelper.getDisplayName(displayItem, {
+            let displayName = itemHelper.getDisplayName(displayItem, {
                 includeParentInfo: 'Program' !== displayItem.Type,
                 includeIndexNumber: 'Program' !== displayItem.Type
             });
 
             if (!displayName) {
-                displayItem.Type;
+                displayName = displayItem.Type;
             }
 
             titleElement.innerHTML = displayName;
@@ -168,7 +191,7 @@ define(['playbackManager', 'dom', 'inputManager', 'datetime', 'itemHelper', 'med
                 titleElement.classList.add('hide');
             }
 
-            var mediaInfoHtml = mediaInfo.getPrimaryMediaInfoHtml(displayItem, {
+            const mediaInfoHtml = mediaInfo.getPrimaryMediaInfoHtml(displayItem, {
                 runtime: false,
                 subtitles: false,
                 tomatoes: false,
@@ -178,7 +201,7 @@ define(['playbackManager', 'dom', 'inputManager', 'datetime', 'itemHelper', 'med
                 episodeTitleIndexNumber: 'Program' !== displayItem.Type,
                 programIndicator: false
             });
-            var osdMediaInfo = view.querySelector('.osdMediaInfo');
+            const osdMediaInfo = view.querySelector('.osdMediaInfo');
             osdMediaInfo.innerHTML = mediaInfoHtml;
 
             if (mediaInfoHtml) {
@@ -187,8 +210,8 @@ define(['playbackManager', 'dom', 'inputManager', 'datetime', 'itemHelper', 'med
                 osdMediaInfo.classList.add('hide');
             }
 
-            var secondaryMediaInfo = view.querySelector('.osdSecondaryMediaInfo');
-            var secondaryMediaInfoHtml = mediaInfo.getSecondaryMediaInfoHtml(displayItem, {
+            const secondaryMediaInfo = view.querySelector('.osdSecondaryMediaInfo');
+            const secondaryMediaInfoHtml = mediaInfo.getSecondaryMediaInfoHtml(displayItem, {
                 startDate: false,
                 programTime: false
             });
@@ -236,7 +259,7 @@ define(['playbackManager', 'dom', 'inputManager', 'datetime', 'itemHelper', 'med
         }
 
         function setDisplayTime(elem, date) {
-            var html;
+            let html;
 
             if (date) {
                 date = datetime.parseISO8601Date(date);
@@ -251,7 +274,7 @@ define(['playbackManager', 'dom', 'inputManager', 'datetime', 'itemHelper', 'med
         }
 
         function updateNowPlayingInfo(player, state) {
-            var item = state.NowPlayingItem;
+            const item = state.NowPlayingItem;
 
             currentItem = item;
             if (!item) {
@@ -294,7 +317,7 @@ define(['playbackManager', 'dom', 'inputManager', 'datetime', 'itemHelper', 'med
         function setTitle(item, parentName) {
             Emby.Page.setTitle(parentName || '');
 
-            var documentTitle = parentName || (item ? item.Name : null);
+            const documentTitle = parentName || (item ? item.Name : null);
 
             if (documentTitle) {
                 document.title = documentTitle;
@@ -302,10 +325,10 @@ define(['playbackManager', 'dom', 'inputManager', 'datetime', 'itemHelper', 'med
         }
 
         function setPoster(item, secondaryItem) {
-            var osdPoster = view.querySelector('.osdPoster');
+            const osdPoster = view.querySelector('.osdPoster');
 
             if (item) {
-                var imgUrl = seriesImageUrl(item, {
+                let imgUrl = seriesImageUrl(item, {
                     maxWidth: osdPoster.clientWidth * 2,
                     type: 'Primary'
                 }) || seriesImageUrl(item, {
@@ -333,10 +356,12 @@ define(['playbackManager', 'dom', 'inputManager', 'datetime', 'itemHelper', 'med
             osdPoster.innerHTML = '';
         }
 
+        let mouseIsDown = false;
+
         function showOsd() {
             slideDownToShow(headerElement);
             showMainOsdControls();
-            startOsdHideTimer();
+            resetIdle();
         }
 
         function hideOsd() {
@@ -379,7 +404,7 @@ define(['playbackManager', 'dom', 'inputManager', 'datetime', 'itemHelper', 'med
         }
 
         function onHideAnimationComplete(e) {
-            var elem = e.target;
+            const elem = e.target;
             if (elem != osdBottomElement)
                 return;
             elem.classList.add('hide');
@@ -390,7 +415,7 @@ define(['playbackManager', 'dom', 'inputManager', 'datetime', 'itemHelper', 'med
 
         function showMainOsdControls() {
             if (!currentVisibleMenu) {
-                var elem = osdBottomElement;
+                const elem = osdBottomElement;
                 currentVisibleMenu = 'osd';
                 clearHideAnimationEventListeners(elem);
                 elem.classList.remove('hide');
@@ -407,7 +432,7 @@ define(['playbackManager', 'dom', 'inputManager', 'datetime', 'itemHelper', 'med
 
         function hideMainOsdControls() {
             if ('osd' === currentVisibleMenu) {
-                var elem = osdBottomElement;
+                const elem = osdBottomElement;
                 clearHideAnimationEventListeners(elem);
                 elem.classList.add('videoOsdBottom-hidden');
                 dom.addEventListener(elem, transitionEndEventName, onHideAnimationComplete, {
@@ -423,11 +448,22 @@ define(['playbackManager', 'dom', 'inputManager', 'datetime', 'itemHelper', 'med
             }
         }
 
+        // TODO: Move all idle-related code to `inputManager` or `idleManager` or `idleHelper` (per dialog thing) and listen event from there.
+
+        function resetIdle() {
+            // Restart hide timer if OSD is currently visible and there is no opened dialog
+            if (currentVisibleMenu && !mouseIsDown && !getOpenedDialog()) {
+                startOsdHideTimer();
+            } else {
+                stopOsdHideTimer();
+            }
+        }
+
         function onPointerMove(e) {
             if ('mouse' === (e.pointerType || (layoutManager.mobile ? 'touch' : 'mouse'))) {
-                var eventX = e.screenX || 0;
-                var eventY = e.screenY || 0;
-                var obj = lastPointerMoveData;
+                const eventX = e.screenX || 0;
+                const eventY = e.screenY || 0;
+                const obj = lastPointerMoveData;
 
                 if (!obj) {
                     lastPointerMoveData = {
@@ -448,7 +484,7 @@ define(['playbackManager', 'dom', 'inputManager', 'datetime', 'itemHelper', 'med
         }
 
         function onInputCommand(e) {
-            var player = currentPlayer;
+            const player = currentPlayer;
 
             switch (e.detail.command) {
                 case 'left':
@@ -507,7 +543,7 @@ define(['playbackManager', 'dom', 'inputManager', 'datetime', 'itemHelper', 'med
         }
 
         function onRecordingCommand() {
-            var btnRecord = view.querySelector('.btnRecord');
+            const btnRecord = view.querySelector('.btnRecord');
 
             if (!btnRecord.classList.contains('hide')) {
                 btnRecord.click();
@@ -534,7 +570,7 @@ define(['playbackManager', 'dom', 'inputManager', 'datetime', 'itemHelper', 'med
         }
 
         function onStateChanged(event, state) {
-            var player = this;
+            const player = this;
 
             if (state.NowPlayingItem) {
                 isEnabled = true;
@@ -552,21 +588,21 @@ define(['playbackManager', 'dom', 'inputManager', 'datetime', 'itemHelper', 'med
 
         function onVolumeChanged(e) {
             if (isEnabled) {
-                var player = this;
+                const player = this;
                 updatePlayerVolumeState(player, player.isMuted(), player.getVolume());
             }
         }
 
         function onPlaybackStart(e, state) {
             console.debug('nowplaying event: ' + e.type);
-            var player = this;
+            const player = this;
             onStateChanged.call(player, e, state);
             resetUpNextDialog();
         }
 
         function resetUpNextDialog() {
             comingUpNextDisplayed = false;
-            var dlg = currentUpNextDialog;
+            const dlg = currentUpNextDialog;
 
             if (dlg) {
                 dlg.destroy();
@@ -586,8 +622,8 @@ define(['playbackManager', 'dom', 'inputManager', 'datetime', 'itemHelper', 'med
         }
 
         function onMediaStreamsChanged(e) {
-            var player = this;
-            var state = playbackManager.getPlayerState(player);
+            const player = this;
+            const state = playbackManager.getPlayerState(player);
             onStateChanged.call(player, {
                 type: 'init'
             }, state);
@@ -607,7 +643,7 @@ define(['playbackManager', 'dom', 'inputManager', 'datetime', 'itemHelper', 'med
                 currentPlayer = player;
                 if (!player) return;
             }
-            var state = playbackManager.getPlayerState(player);
+            const state = playbackManager.getPlayerState(player);
             onStateChanged.call(player, {
                 type: 'init'
             }, state);
@@ -632,7 +668,7 @@ define(['playbackManager', 'dom', 'inputManager', 'datetime', 'itemHelper', 'med
             destroyStats();
             destroySubtitleSync();
             resetUpNextDialog();
-            var player = currentPlayer;
+            const player = currentPlayer;
 
             if (player) {
                 events.off(player, 'playbackstart', onPlaybackStart);
@@ -650,15 +686,15 @@ define(['playbackManager', 'dom', 'inputManager', 'datetime', 'itemHelper', 'med
         function onTimeUpdate(e) {
             // Test for 'currentItem' is required for Firefox since its player spams 'timeupdate' events even being at breakpoint
             if (isEnabled && currentItem) {
-                var now = new Date().getTime();
+                const now = new Date().getTime();
 
                 if (!(now - lastUpdateTime < 700)) {
                     lastUpdateTime = now;
-                    var player = this;
+                    const player = this;
                     currentRuntimeTicks = playbackManager.duration(player);
-                    var currentTime = playbackManager.currentTime(player);
+                    const currentTime = playbackManager.currentTime(player);
                     updateTimeDisplay(currentTime, currentRuntimeTicks, playbackManager.playbackStartTime(player), playbackManager.getBufferedRanges(player));
-                    var item = currentItem;
+                    const item = currentItem;
                     refreshProgramInfoIfNeeded(player, item);
                     showComingUpNextIfNeeded(player, item, currentTime, currentRuntimeTicks);
                 }
@@ -667,9 +703,9 @@ define(['playbackManager', 'dom', 'inputManager', 'datetime', 'itemHelper', 'med
 
         function showComingUpNextIfNeeded(player, currentItem, currentTimeTicks, runtimeTicks) {
             if (runtimeTicks && currentTimeTicks && !comingUpNextDisplayed && !currentVisibleMenu && 'Episode' === currentItem.Type && userSettings.enableNextVideoInfoOverlay()) {
-                var showAtSecondsLeft = runtimeTicks >= 3e10 ? 40 : runtimeTicks >= 24e9 ? 35 : 30;
-                var showAtTicks = runtimeTicks - 1e3 * showAtSecondsLeft * 1e4;
-                var timeRemainingTicks = runtimeTicks - currentTimeTicks;
+                const showAtSecondsLeft = runtimeTicks >= 3e10 ? 40 : runtimeTicks >= 24e9 ? 35 : 30;
+                const showAtTicks = runtimeTicks - 1e3 * showAtSecondsLeft * 1e4;
+                const timeRemainingTicks = runtimeTicks - currentTimeTicks;
 
                 if (currentTimeTicks >= showAtTicks && runtimeTicks >= 6e9 && timeRemainingTicks >= 2e8) {
                     showComingUpNext(player);
@@ -684,7 +720,7 @@ define(['playbackManager', 'dom', 'inputManager', 'datetime', 'itemHelper', 'med
         }
 
         function showComingUpNext(player) {
-            require(['upNextDialog'], function (UpNextDialog) {
+            import('upNextDialog').then(({default: UpNextDialog}) => {
                 if (!(currentVisibleMenu || currentUpNextDialog)) {
                     currentVisibleMenu = 'upnext';
                     comingUpNextDisplayed = true;
@@ -702,15 +738,15 @@ define(['playbackManager', 'dom', 'inputManager', 'datetime', 'itemHelper', 'med
 
         function refreshProgramInfoIfNeeded(player, item) {
             if ('TvChannel' === item.Type) {
-                var program = item.CurrentProgram;
+                const program = item.CurrentProgram;
 
                 if (program && program.EndDate) {
                     try {
-                        var endDate = datetime.parseISO8601Date(program.EndDate);
+                        const endDate = datetime.parseISO8601Date(program.EndDate);
 
                         if (new Date().getTime() >= endDate.getTime()) {
                             console.debug('program info needs to be refreshed');
-                            var state = playbackManager.getPlayerState(player);
+                            const state = playbackManager.getPlayerState(player);
                             onStateChanged.call(player, {
                                 type: 'init'
                             }, state);
@@ -738,9 +774,9 @@ define(['playbackManager', 'dom', 'inputManager', 'datetime', 'itemHelper', 'med
         }
 
         function updatePlayerStateInternal(event, player, state) {
-            var playState = state.PlayState || {};
+            const playState = state.PlayState || {};
             updatePlayPauseState(playState.IsPaused);
-            var supportedCommands = playbackManager.getSupportedCommands(player);
+            const supportedCommands = playbackManager.getSupportedCommands(player);
             currentPlayerSupportedCommands = supportedCommands;
             supportsBrightnessChange = -1 !== supportedCommands.indexOf('SetBrightness');
             updatePlayerVolumeState(player, playState.IsMuted, playState.VolumeLevel);
@@ -751,7 +787,7 @@ define(['playbackManager', 'dom', 'inputManager', 'datetime', 'itemHelper', 'med
 
             btnFastForward.disabled = !playState.CanSeek;
             btnRewind.disabled = !playState.CanSeek;
-            var nowPlayingItem = state.NowPlayingItem || {};
+            const nowPlayingItem = state.NowPlayingItem || {};
             playbackStartTimeTicks = playState.PlaybackStartTimeTicks;
             updateTimeDisplay(playState.PositionTicks, nowPlayingItem.RunTimeTicks, playState.PlaybackStartTimeTicks, playState.BufferedRanges || []);
             updateNowPlayingInfo(player, state);
@@ -762,7 +798,7 @@ define(['playbackManager', 'dom', 'inputManager', 'datetime', 'itemHelper', 'med
                 view.querySelector('.btnVideoOsdSettings').classList.add('hide');
             }
 
-            var isProgressClear = state.MediaSource && null == state.MediaSource.RunTimeTicks;
+            const isProgressClear = state.MediaSource && null == state.MediaSource.RunTimeTicks;
             nowPlayingPositionSlider.setIsClear(isProgressClear);
 
             if (nowPlayingItem.RunTimeTicks) {
@@ -799,12 +835,12 @@ define(['playbackManager', 'dom', 'inputManager', 'datetime', 'itemHelper', 'med
             if (enableProgressByTimeOfDay) {
                 if (nowPlayingPositionSlider && !nowPlayingPositionSlider.dragging) {
                     if (programStartDateMs && programEndDateMs) {
-                        var currentTimeMs = (playbackStartTimeTicks + (positionTicks || 0)) / 1e4;
-                        var programRuntimeMs = programEndDateMs - programStartDateMs;
+                        const currentTimeMs = (playbackStartTimeTicks + (positionTicks || 0)) / 1e4;
+                        const programRuntimeMs = programEndDateMs - programStartDateMs;
 
                         if (nowPlayingPositionSlider.value = getDisplayPercentByTimeOfDay(programStartDateMs, programRuntimeMs, currentTimeMs), bufferedRanges.length) {
-                            var rangeStart = getDisplayPercentByTimeOfDay(programStartDateMs, programRuntimeMs, (playbackStartTimeTicks + (bufferedRanges[0].start || 0)) / 1e4);
-                            var rangeEnd = getDisplayPercentByTimeOfDay(programStartDateMs, programRuntimeMs, (playbackStartTimeTicks + (bufferedRanges[0].end || 0)) / 1e4);
+                            const rangeStart = getDisplayPercentByTimeOfDay(programStartDateMs, programRuntimeMs, (playbackStartTimeTicks + (bufferedRanges[0].start || 0)) / 1e4);
+                            const rangeEnd = getDisplayPercentByTimeOfDay(programStartDateMs, programRuntimeMs, (playbackStartTimeTicks + (bufferedRanges[0].end || 0)) / 1e4);
                             nowPlayingPositionSlider.setBufferedRanges([{
                                 start: rangeStart,
                                 end: rangeEnd
@@ -823,7 +859,7 @@ define(['playbackManager', 'dom', 'inputManager', 'datetime', 'itemHelper', 'med
             } else {
                 if (nowPlayingPositionSlider && !nowPlayingPositionSlider.dragging) {
                     if (runtimeTicks) {
-                        var pct = positionTicks / runtimeTicks;
+                        let pct = positionTicks / runtimeTicks;
                         pct *= 100;
                         nowPlayingPositionSlider.value = pct;
                     } else {
@@ -847,9 +883,9 @@ define(['playbackManager', 'dom', 'inputManager', 'datetime', 'itemHelper', 'med
         }
 
         function updatePlayerVolumeState(player, isMuted, volumeLevel) {
-            var supportedCommands = currentPlayerSupportedCommands;
-            var showMuteButton = true;
-            var showVolumeSlider = true;
+            const supportedCommands = currentPlayerSupportedCommands;
+            let showMuteButton = true;
+            let showVolumeSlider = true;
 
             if (-1 === supportedCommands.indexOf('Mute')) {
                 showMuteButton = false;
@@ -897,8 +933,8 @@ define(['playbackManager', 'dom', 'inputManager', 'datetime', 'itemHelper', 'med
         }
 
         function updatePlaylist(player) {
-            var btnPreviousTrack = view.querySelector('.btnPreviousTrack');
-            var btnNextTrack = view.querySelector('.btnNextTrack');
+            const btnPreviousTrack = view.querySelector('.btnPreviousTrack');
+            const btnNextTrack = view.querySelector('.btnNextTrack');
             btnPreviousTrack.classList.remove('hide');
             btnNextTrack.classList.remove('hide');
             btnNextTrack.disabled = false;
@@ -911,7 +947,7 @@ define(['playbackManager', 'dom', 'inputManager', 'datetime', 'itemHelper', 'med
                 return;
             }
 
-            var html = datetime.getDisplayRunningTime(ticks);
+            let html = datetime.getDisplayRunningTime(ticks);
 
             if (divider) {
                 html = '&nbsp;/&nbsp;' + html;
@@ -921,15 +957,15 @@ define(['playbackManager', 'dom', 'inputManager', 'datetime', 'itemHelper', 'med
         }
 
         function onSettingsButtonClick(e) {
-            var btn = this;
+            const btn = this;
 
-            require(['playerSettingsMenu'], function (playerSettingsMenu) {
-                var player = currentPlayer;
+            import('playerSettingsMenu').then(({default: playerSettingsMenu}) => {
+                const player = currentPlayer;
 
                 if (player) {
 
                     // show subtitle offset feature only if player and media support it
-                    var showSubOffset = playbackManager.supportSubtitleOffset(player) &&
+                    const showSubOffset = playbackManager.supportSubtitleOffset(player) &&
                         playbackManager.canHandleOffsetOnCurrentSubtitle(player);
 
                     playerSettingsMenu.show({
@@ -939,7 +975,11 @@ define(['playbackManager', 'dom', 'inputManager', 'datetime', 'itemHelper', 'med
                         stats: true,
                         suboffset: showSubOffset,
                         onOption: onSettingsOption
+                    }).finally(() => {
+                        resetIdle();
                     });
+
+                    setTimeout(resetIdle, 0);
                 }
             });
         }
@@ -948,7 +988,7 @@ define(['playbackManager', 'dom', 'inputManager', 'datetime', 'itemHelper', 'med
             if ('stats' === selectedOption) {
                 toggleStats();
             } else if ('suboffset' === selectedOption) {
-                var player = currentPlayer;
+                const player = currentPlayer;
                 if (player) {
                     playbackManager.enableShowingSubtitleOffset(player);
                     toggleSubtitleSync();
@@ -957,8 +997,8 @@ define(['playbackManager', 'dom', 'inputManager', 'datetime', 'itemHelper', 'med
         }
 
         function toggleStats() {
-            require(['playerStats'], function (PlayerStats) {
-                var player = currentPlayer;
+            import('playerStats').then(({default: PlayerStats}) => {
+                const player = currentPlayer;
 
                 if (player) {
                     if (statsOverlay) {
@@ -980,11 +1020,11 @@ define(['playbackManager', 'dom', 'inputManager', 'datetime', 'itemHelper', 'med
         }
 
         function showAudioTrackSelection() {
-            var player = currentPlayer;
-            var audioTracks = playbackManager.audioTracks(player);
-            var currentIndex = playbackManager.getAudioStreamIndex(player);
-            var menuItems = audioTracks.map(function (stream) {
-                var opt = {
+            const player = currentPlayer;
+            const audioTracks = playbackManager.audioTracks(player);
+            const currentIndex = playbackManager.getAudioStreamIndex(player);
+            const menuItems = audioTracks.map(function (stream) {
+                const opt = {
                     name: stream.DisplayTitle,
                     id: stream.Index
                 };
@@ -995,27 +1035,31 @@ define(['playbackManager', 'dom', 'inputManager', 'datetime', 'itemHelper', 'med
 
                 return opt;
             });
-            var positionTo = this;
+            const positionTo = this;
 
-            require(['actionsheet'], function (actionsheet) {
+            import('actionsheet').then(({default: actionsheet}) => {
                 actionsheet.show({
                     items: menuItems,
                     title: globalize.translate('Audio'),
                     positionTo: positionTo
                 }).then(function (id) {
-                    var index = parseInt(id);
+                    const index = parseInt(id);
 
                     if (index !== currentIndex) {
                         playbackManager.setAudioStreamIndex(index, player);
                     }
+                }).finally(() => {
+                    resetIdle();
                 });
+
+                setTimeout(resetIdle, 0);
             });
         }
 
         function showSubtitleTrackSelection() {
-            var player = currentPlayer;
-            var streams = playbackManager.subtitleTracks(player);
-            var currentIndex = playbackManager.getSubtitleStreamIndex(player);
+            const player = currentPlayer;
+            const streams = playbackManager.subtitleTracks(player);
+            let currentIndex = playbackManager.getSubtitleStreamIndex(player);
 
             if (null == currentIndex) {
                 currentIndex = -1;
@@ -1025,8 +1069,8 @@ define(['playbackManager', 'dom', 'inputManager', 'datetime', 'itemHelper', 'med
                 Index: -1,
                 DisplayTitle: globalize.translate('Off')
             });
-            var menuItems = streams.map(function (stream) {
-                var opt = {
+            const menuItems = streams.map(function (stream) {
+                const opt = {
                     name: stream.DisplayTitle,
                     id: stream.Index
                 };
@@ -1037,28 +1081,32 @@ define(['playbackManager', 'dom', 'inputManager', 'datetime', 'itemHelper', 'med
 
                 return opt;
             });
-            var positionTo = this;
+            const positionTo = this;
 
-            require(['actionsheet'], function (actionsheet) {
+            import('actionsheet').then(({default: actionsheet}) => {
                 actionsheet.show({
                     title: globalize.translate('Subtitles'),
                     items: menuItems,
                     positionTo: positionTo
                 }).then(function (id) {
-                    var index = parseInt(id);
+                    const index = parseInt(id);
 
                     if (index !== currentIndex) {
                         playbackManager.setSubtitleStreamIndex(index, player);
                     }
 
                     toggleSubtitleSync();
+                }).finally(() => {
+                    resetIdle();
                 });
+
+                setTimeout(resetIdle, 0);
             });
         }
 
         function toggleSubtitleSync(action) {
-            require(['subtitleSync'], function (SubtitleSync) {
-                var player = currentPlayer;
+            import('subtitleSync').then(({default: SubtitleSync}) => {
+                const player = currentPlayer;
                 if (subtitleSyncOverlay) {
                     subtitleSyncOverlay.toggle(action);
                 } else if (player) {
@@ -1078,12 +1126,12 @@ define(['playbackManager', 'dom', 'inputManager', 'datetime', 'itemHelper', 'med
          * Clicked element.
          * To skip 'click' handling on Firefox/Edge.
          */
-        var clickedElement;
+        let clickedElement;
 
-        function onWindowKeyDown(e) {
-            clickedElement = e.srcElement;
+        function onKeyDown(e) {
+            clickedElement = e.target;
 
-            var key = keyboardnavigation.getKeyName(e);
+            const key = keyboardnavigation.getKeyName(e);
 
             if (!currentVisibleMenu && 32 === e.keyCode) {
                 playbackManager.playPause(currentPlayer);
@@ -1103,7 +1151,7 @@ define(['playbackManager', 'dom', 'inputManager', 'datetime', 'itemHelper', 'med
                 case 'Escape':
                 case 'Back':
                     // Ignore key when some dialog is opened
-                    if (currentVisibleMenu === 'osd' && !document.querySelector('.dialogContainer')) {
+                    if (currentVisibleMenu === 'osd' && !getOpenedDialog()) {
                         hideOsd();
                         e.stopPropagation();
                     }
@@ -1187,19 +1235,44 @@ define(['playbackManager', 'dom', 'inputManager', 'datetime', 'itemHelper', 'med
                 case '6':
                 case '7':
                 case '8':
-                case '9':
-                    var percent = parseInt(key, 10) * 10;
+                case '9': {
+                    const percent = parseInt(key, 10) * 10;
                     playbackManager.seekPercent(percent, currentPlayer);
                     break;
+                }
             }
         }
 
+        function onKeyDownCapture() {
+            resetIdle();
+        }
+
         function onWindowMouseDown(e) {
-            clickedElement = e.srcElement;
+            clickedElement = e.target;
+            mouseIsDown = true;
+            resetIdle();
+        }
+
+        function onWindowMouseUp() {
+            mouseIsDown = false;
+            resetIdle();
         }
 
         function onWindowTouchStart(e) {
-            clickedElement = e.srcElement;
+            clickedElement = e.target;
+            mouseIsDown = true;
+            resetIdle();
+        }
+
+        function onWindowTouchEnd() {
+            mouseIsDown = false;
+            resetIdle();
+        }
+
+        function onWindowDragEnd() {
+            // mousedown -> dragstart -> dragend !!! no mouseup :(
+            mouseIsDown = false;
+            resetIdle();
         }
 
         function getImgUrl(item, chapter, index, maxWidth, apiClient) {
@@ -1216,11 +1289,11 @@ define(['playbackManager', 'dom', 'inputManager', 'datetime', 'itemHelper', 'med
         }
 
         function getChapterBubbleHtml(apiClient, item, chapters, positionTicks) {
-            var chapter;
-            var index = -1;
+            let chapter;
+            let index = -1;
 
-            for (var i = 0, length = chapters.length; i < length; i++) {
-                var currentChapter = chapters[i];
+            for (let i = 0, length = chapters.length; i < length; i++) {
+                const currentChapter = chapters[i];
 
                 if (positionTicks >= currentChapter.StartPositionTicks) {
                     chapter = currentChapter;
@@ -1232,10 +1305,10 @@ define(['playbackManager', 'dom', 'inputManager', 'datetime', 'itemHelper', 'med
                 return null;
             }
 
-            var src = getImgUrl(item, chapter, index, 400, apiClient);
+            const src = getImgUrl(item, chapter, index, 400, apiClient);
 
             if (src) {
-                var html = '<div class="chapterThumbContainer">';
+                let html = '<div class="chapterThumbContainer">';
                 html += '<img class="chapterThumb" src="' + src + '" />';
                 html += '<div class="chapterThumbTextContainer">';
                 html += '<div class="chapterThumbText chapterThumbText-dim">';
@@ -1251,15 +1324,15 @@ define(['playbackManager', 'dom', 'inputManager', 'datetime', 'itemHelper', 'med
             return null;
         }
 
-        var playPauseClickTimeout;
+        let playPauseClickTimeout;
         function onViewHideStopPlayback() {
             if (playbackManager.isPlayingVideo()) {
-                require(['shell'], function (shell) {
+                import('shell').then(({default: shell}) => {
                     shell.disableFullscreen();
                 });
 
                 clearTimeout(playPauseClickTimeout);
-                var player = currentPlayer;
+                const player = currentPlayer;
                 view.removeEventListener('viewbeforehide', onViewHideStopPlayback);
                 releaseCurrentPlayer();
                 playbackManager.stop(player);
@@ -1274,47 +1347,49 @@ define(['playbackManager', 'dom', 'inputManager', 'datetime', 'itemHelper', 'med
             }
         }
 
-        require(['shell'], function (shell) {
+        import('shell').then(({default: shell}) => {
             shell.enableFullscreen();
         });
 
-        var currentPlayer;
-        var comingUpNextDisplayed;
-        var currentUpNextDialog;
-        var isEnabled;
-        var currentItem;
-        var recordingButtonManager;
-        var enableProgressByTimeOfDay;
-        var supportsBrightnessChange;
-        var currentVisibleMenu;
-        var statsOverlay;
-        var osdHideTimeout;
-        var lastPointerMoveData;
-        var self = this;
-        var currentPlayerSupportedCommands = [];
-        var currentRuntimeTicks = 0;
-        var lastUpdateTime = 0;
-        var programStartDateMs = 0;
-        var programEndDateMs = 0;
-        var playbackStartTimeTicks = 0;
-        var subtitleSyncOverlay;
-        var nowPlayingVolumeSlider = view.querySelector('.osdVolumeSlider');
-        var nowPlayingVolumeSliderContainer = view.querySelector('.osdVolumeSliderContainer');
-        var nowPlayingPositionSlider = view.querySelector('.osdPositionSlider');
-        var nowPlayingPositionText = view.querySelector('.osdPositionText');
-        var nowPlayingDurationText = view.querySelector('.osdDurationText');
-        var startTimeText = view.querySelector('.startTimeText');
-        var endTimeText = view.querySelector('.endTimeText');
-        var endsAtText = view.querySelector('.endsAtText');
-        var btnRewind = view.querySelector('.btnRewind');
-        var btnFastForward = view.querySelector('.btnFastForward');
-        var transitionEndEventName = dom.whichTransitionEvent();
-        var headerElement = document.querySelector('.skinHeader');
-        var osdBottomElement = document.querySelector('.videoOsdBottom-maincontrols');
+        let currentPlayer;
+        let comingUpNextDisplayed;
+        let currentUpNextDialog;
+        let isEnabled;
+        let currentItem;
+        let recordingButtonManager;
+        let enableProgressByTimeOfDay;
+        let supportsBrightnessChange;
+        let currentVisibleMenu;
+        let statsOverlay;
+        let osdHideTimeout;
+        let lastPointerMoveData;
+        const self = this;
+        let currentPlayerSupportedCommands = [];
+        let currentRuntimeTicks = 0;
+        let lastUpdateTime = 0;
+        let programStartDateMs = 0;
+        let programEndDateMs = 0;
+        let playbackStartTimeTicks = 0;
+        let subtitleSyncOverlay;
+        const nowPlayingVolumeSlider = view.querySelector('.osdVolumeSlider');
+        const nowPlayingVolumeSliderContainer = view.querySelector('.osdVolumeSliderContainer');
+        const nowPlayingPositionSlider = view.querySelector('.osdPositionSlider');
+        const nowPlayingPositionText = view.querySelector('.osdPositionText');
+        const nowPlayingDurationText = view.querySelector('.osdDurationText');
+        const startTimeText = view.querySelector('.startTimeText');
+        const endTimeText = view.querySelector('.endTimeText');
+        const endsAtText = view.querySelector('.endsAtText');
+        const btnRewind = view.querySelector('.btnRewind');
+        const btnFastForward = view.querySelector('.btnFastForward');
+        const transitionEndEventName = dom.whichTransitionEvent();
+        const headerElement = document.querySelector('.skinHeader');
+        const osdBottomElement = document.querySelector('.videoOsdBottom-maincontrols');
+
+        nowPlayingPositionSlider.enableKeyboardDragging();
+        nowPlayingVolumeSlider.enableKeyboardDragging();
 
         if (layoutManager.tv) {
             nowPlayingPositionSlider.classList.add('focusable');
-            nowPlayingPositionSlider.enableKeyboardDragging();
         }
 
         view.addEventListener('viewbeforeshow', function (e) {
@@ -1325,23 +1400,44 @@ define(['playbackManager', 'dom', 'inputManager', 'datetime', 'itemHelper', 'med
             try {
                 events.on(playbackManager, 'playerchange', onPlayerChange);
                 bindToPlayer(playbackManager.getCurrentPlayer());
+                /* eslint-disable-next-line compat/compat */
                 dom.addEventListener(document, window.PointerEvent ? 'pointermove' : 'mousemove', onPointerMove, {
                     passive: true
                 });
                 showOsd();
                 inputManager.on(window, onInputCommand);
-                dom.addEventListener(window, 'keydown', onWindowKeyDown, {
-                    capture: true
+                document.addEventListener('keydown', onKeyDown);
+                dom.addEventListener(document, 'keydown', onKeyDownCapture, {
+                    capture: true,
+                    passive: true
                 });
+                /* eslint-disable-next-line compat/compat */
                 dom.addEventListener(window, window.PointerEvent ? 'pointerdown' : 'mousedown', onWindowMouseDown, {
+                    capture: true,
+                    passive: true
+                });
+                /* eslint-disable-next-line compat/compat */
+                dom.addEventListener(window, window.PointerEvent ? 'pointerup' : 'mouseup', onWindowMouseUp, {
+                    capture: true,
                     passive: true
                 });
                 dom.addEventListener(window, 'touchstart', onWindowTouchStart, {
+                    capture: true,
+                    passive: true
+                });
+                ['touchend', 'touchcancel'].forEach((event) => {
+                    dom.addEventListener(window, event, onWindowTouchEnd, {
+                        capture: true,
+                        passive: true
+                    });
+                });
+                dom.addEventListener(window, 'dragend', onWindowDragEnd, {
+                    capture: true,
                     passive: true
                 });
             } catch (e) {
-                require(['appRouter'], function(appRouter) {
-                    appRouter.showDirect('/');
+                import('appRouter').then(({default: appRouter}) => {
+                    appRouter.goHome();
                 });
             }
         });
@@ -1350,18 +1446,39 @@ define(['playbackManager', 'dom', 'inputManager', 'datetime', 'itemHelper', 'med
                 statsOverlay.enabled(false);
             }
 
-            dom.removeEventListener(window, 'keydown', onWindowKeyDown, {
-                capture: true
+            document.removeEventListener('keydown', onKeyDown);
+            dom.removeEventListener(document, 'keydown', onKeyDownCapture, {
+                capture: true,
+                passive: true
             });
+            /* eslint-disable-next-line compat/compat */
             dom.removeEventListener(window, window.PointerEvent ? 'pointerdown' : 'mousedown', onWindowMouseDown, {
+                capture: true,
+                passive: true
+            });
+            /* eslint-disable-next-line compat/compat */
+            dom.removeEventListener(window, window.PointerEvent ? 'pointerup' : 'mouseup', onWindowMouseUp, {
+                capture: true,
                 passive: true
             });
             dom.removeEventListener(window, 'touchstart', onWindowTouchStart, {
+                capture: true,
+                passive: true
+            });
+            ['touchend', 'touchcancel'].forEach((event) => {
+                dom.removeEventListener(window, event, onWindowTouchEnd, {
+                    capture: true,
+                    passive: true
+                });
+            });
+            dom.removeEventListener(window, 'dragend', onWindowDragEnd, {
+                capture: true,
                 passive: true
             });
             stopOsdHideTimer();
             headerElement.classList.remove('osdHeader');
             headerElement.classList.remove('osdHeader-hidden');
+            /* eslint-disable-next-line compat/compat */
             dom.removeEventListener(document, window.PointerEvent ? 'pointermove' : 'mousemove', onPointerMove, {
                 passive: true
             });
@@ -1396,14 +1513,15 @@ define(['playbackManager', 'dom', 'inputManager', 'datetime', 'itemHelper', 'med
             destroyStats();
             destroySubtitleSync();
         });
-        var lastPointerDown = 0;
+        let lastPointerDown = 0;
+        /* eslint-disable-next-line compat/compat */
         dom.addEventListener(view, window.PointerEvent ? 'pointerdown' : 'click', function (e) {
             if (dom.parentWithClass(e.target, ['videoOsdBottom', 'upNextContainer'])) {
                 return void showOsd();
             }
 
-            var pointerType = e.pointerType || (layoutManager.mobile ? 'touch' : 'mouse');
-            var now = new Date().getTime();
+            const pointerType = e.pointerType || (layoutManager.mobile ? 'touch' : 'mouse');
+            const now = new Date().getTime();
 
             switch (pointerType) {
                 case 'touch':
@@ -1441,31 +1559,28 @@ define(['playbackManager', 'dom', 'inputManager', 'datetime', 'itemHelper', 'med
         if (browser.touch) {
             dom.addEventListener(view, 'dblclick', onDoubleClick, {});
         } else {
-            var options = { passive: true };
+            const options = { passive: true };
             dom.addEventListener(view, 'dblclick', function () {
                 playbackManager.toggleFullscreen(currentPlayer);
             }, options);
         }
 
-        function setVolume() {
-            playbackManager.setVolume(this.value, currentPlayer);
-        }
-
         view.querySelector('.buttonMute').addEventListener('click', function () {
             playbackManager.toggleMute(currentPlayer);
         });
-        nowPlayingVolumeSlider.addEventListener('change', setVolume);
-        nowPlayingVolumeSlider.addEventListener('mousemove', setVolume);
-        nowPlayingVolumeSlider.addEventListener('touchmove', setVolume);
+
+        nowPlayingVolumeSlider.addEventListener('input', (e) => {
+            playbackManager.setVolume(e.target.value, currentPlayer);
+        });
 
         nowPlayingPositionSlider.addEventListener('change', function () {
-            var player = currentPlayer;
+            const player = currentPlayer;
 
             if (player) {
-                var newPercent = parseFloat(this.value);
+                const newPercent = parseFloat(this.value);
 
                 if (enableProgressByTimeOfDay) {
-                    var seekAirTimeTicks = newPercent / 100 * (programEndDateMs - programStartDateMs) * 1e4;
+                    let seekAirTimeTicks = newPercent / 100 * (programEndDateMs - programStartDateMs) * 1e4;
                     seekAirTimeTicks += 1e4 * programStartDateMs;
                     seekAirTimeTicks -= playbackStartTimeTicks;
                     playbackManager.seek(seekAirTimeTicks, player);
@@ -1479,7 +1594,7 @@ define(['playbackManager', 'dom', 'inputManager', 'datetime', 'itemHelper', 'med
             showOsd();
             if (enableProgressByTimeOfDay) {
                 if (programStartDateMs && programEndDateMs) {
-                    var ms = programEndDateMs - programStartDateMs;
+                    let ms = programEndDateMs - programStartDateMs;
                     ms /= 100;
                     ms *= value;
                     ms += programStartDateMs;
@@ -1493,13 +1608,13 @@ define(['playbackManager', 'dom', 'inputManager', 'datetime', 'itemHelper', 'med
                 return '--:--';
             }
 
-            var ticks = currentRuntimeTicks;
+            let ticks = currentRuntimeTicks;
             ticks /= 100;
             ticks *= value;
-            var item = currentItem;
+            const item = currentItem;
 
             if (item && item.Chapters && item.Chapters.length && item.Chapters[0].ImageTag) {
-                var html = getChapterBubbleHtml(connectionManager.getApiClient(item.ServerId), item, item.Chapters, ticks);
+                let html = getChapterBubbleHtml(connectionManager.getApiClient(item.ServerId), item, item.Chapters, ticks);
 
                 if (html) {
                     return html;
@@ -1532,7 +1647,7 @@ define(['playbackManager', 'dom', 'inputManager', 'datetime', 'itemHelper', 'med
 
         if (browser.touch) {
             (function () {
-                require(['touchHelper'], function (TouchHelper) {
+                import('touchHelper').then(({default: TouchHelper}) => {
                     self.touchHelper = new TouchHelper(view, {
                         swipeYThreshold: 30,
                         triggerOnMove: true,
@@ -1544,5 +1659,6 @@ define(['playbackManager', 'dom', 'inputManager', 'datetime', 'itemHelper', 'med
                 });
             })();
         }
-    };
-});
+    }
+
+/* eslint-enable indent */
diff --git a/src/controllers/searchpage.js b/src/controllers/searchpage.js
index 8a138b7516..8ce3e8afe8 100644
--- a/src/controllers/searchpage.js
+++ b/src/controllers/searchpage.js
@@ -1,36 +1,37 @@
-define(['focusManager', 'searchFields', 'searchResults', 'events'], function (focusManager, SearchFields, SearchResults, events) {
-    'use strict';
+import focusManager from 'focusManager';
+import SearchFields from 'searchFields';
+import SearchResults from 'searchResults';
+import events from 'events';
 
-    return function (view, params) {
-        function onSearch(e, value) {
-            self.searchResults.search(value);
+export default function (view, params) {
+    function onSearch(e, value) {
+        self.searchResults.search(value);
+    }
+
+    const self = this;
+    view.addEventListener('viewshow', function () {
+        if (!self.searchFields) {
+            self.searchFields = new SearchFields({
+                element: view.querySelector('.searchFields')
+            });
+            self.searchResults = new SearchResults({
+                element: view.querySelector('.searchResults'),
+                serverId: params.serverId || ApiClient.serverId(),
+                parentId: params.parentId,
+                collectionType: params.collectionType
+            });
+            events.on(self.searchFields, 'search', onSearch);
+        }
+    });
+    view.addEventListener('viewdestroy', function () {
+        if (self.searchFields) {
+            self.searchFields.destroy();
+            self.searchFields = null;
         }
 
-        var self = this;
-        view.addEventListener('viewshow', function () {
-            if (!self.searchFields) {
-                self.searchFields = new SearchFields({
-                    element: view.querySelector('.searchFields')
-                });
-                self.searchResults = new SearchResults({
-                    element: view.querySelector('.searchResults'),
-                    serverId: params.serverId || ApiClient.serverId(),
-                    parentId: params.parentId,
-                    collectionType: params.collectionType
-                });
-                events.on(self.searchFields, 'search', onSearch);
-            }
-        });
-        view.addEventListener('viewdestroy', function () {
-            if (self.searchFields) {
-                self.searchFields.destroy();
-                self.searchFields = null;
-            }
-
-            if (self.searchResults) {
-                self.searchResults.destroy();
-                self.searchResults = null;
-            }
-        });
-    };
-});
+        if (self.searchResults) {
+            self.searchResults.destroy();
+            self.searchResults = null;
+        }
+    });
+}
diff --git a/src/addserver.html b/src/controllers/session/addServer/index.html
similarity index 91%
rename from src/addserver.html
rename to src/controllers/session/addServer/index.html
index 02850fffb8..d25a8eef98 100644
--- a/src/addserver.html
+++ b/src/controllers/session/addServer/index.html
@@ -1,6 +1,6 @@
 <div data-role="page" class="page standalonePage">
     <div class="padded-left padded-right padded-bottom-page">
-        <form class="addServerForm" style="margin: 0 auto;">
+        <form class="addServerForm" style="margin: 0 auto;" novalidate>
             <h1>${HeaderConnectToServer}</h1>
             <div class="inputContainer">
                 <input is="emby-input" type="url" id="txtServerHost" required="required" label="${LabelServerHost}"/>
diff --git a/src/controllers/auth/addserver.js b/src/controllers/session/addServer/index.js
similarity index 77%
rename from src/controllers/auth/addserver.js
rename to src/controllers/session/addServer/index.js
index 622d19082e..1129283246 100644
--- a/src/controllers/auth/addserver.js
+++ b/src/controllers/session/addServer/index.js
@@ -1,14 +1,20 @@
-define(['appSettings', 'loading', 'browser', 'globalize', 'emby-button'], function(appSettings, loading, browser, globalize) {
-    'use strict';
+import appSettings from 'appSettings';
+import loading from 'loading';
+import browser from 'browser';
+import globalize from 'globalize';
+import 'emby-button';
+
+/* eslint-disable indent */
 
     function handleConnectionResult(page, result) {
         loading.hide();
         switch (result.State) {
-            case 'SignedIn':
-                var apiClient = result.ApiClient;
+            case 'SignedIn': {
+                const apiClient = result.ApiClient;
                 Dashboard.onServerChanged(apiClient.getCurrentUserId(), apiClient.accessToken(), apiClient);
                 Dashboard.navigate('home.html');
                 break;
+            }
             case 'ServerSignIn':
                 Dashboard.navigate('login.html?serverid=' + result.Servers[0].Id, false, 'none');
                 break;
@@ -30,7 +36,7 @@ define(['appSettings', 'loading', 'browser', 'globalize', 'emby-button'], functi
 
     function submitServer(page) {
         loading.show();
-        var host = page.querySelector('#txtServerHost').value;
+        const host = page.querySelector('#txtServerHost').value;
         ConnectionManager.connectToAddress(host, {
             enableAutoLogin: appSettings.enableAutoLogin()
         }).then(function(result) {
@@ -42,11 +48,11 @@ define(['appSettings', 'loading', 'browser', 'globalize', 'emby-button'], functi
         });
     }
 
-    return function(view, params) {
+    export default function(view, params) {
         view.querySelector('.addServerForm').addEventListener('submit', onServerSubmit);
         view.querySelector('.btnCancel').addEventListener('click', goBack);
 
-        require(['autoFocuser'], function (autoFocuser) {
+        import('autoFocuser').then(({default: autoFocuser}) => {
             autoFocuser.autoFocus(view);
         });
 
@@ -57,9 +63,10 @@ define(['appSettings', 'loading', 'browser', 'globalize', 'emby-button'], functi
         }
 
         function goBack() {
-            require(['appRouter'], function(appRouter) {
+            import('appRouter').then(({default: appRouter}) => {
                 appRouter.back();
             });
         }
-    };
-});
+    }
+
+/* eslint-enable indent */
diff --git a/src/forgotpassword.html b/src/controllers/session/forgotPassword/index.html
similarity index 94%
rename from src/forgotpassword.html
rename to src/controllers/session/forgotPassword/index.html
index d4ed0d4170..80631564f8 100644
--- a/src/forgotpassword.html
+++ b/src/controllers/session/forgotPassword/index.html
@@ -1,5 +1,5 @@
 <div data-role="page" id="forgotPasswordPage" class="page standalonePage forgotPasswordPage">
-    <div>
+    <div class="padded-left padded-right padded-bottom-page">
         <form class="forgotPasswordForm" style="text-align: center; margin: 0 auto;">
             <div style="text-align: left;">
                 <h1>${HeaderForgotPassword}</h1>
diff --git a/src/controllers/auth/forgotpassword.js b/src/controllers/session/forgotPassword/index.js
similarity index 88%
rename from src/controllers/auth/forgotpassword.js
rename to src/controllers/session/forgotPassword/index.js
index 3756bf814d..ace5a3ec15 100644
--- a/src/controllers/auth/forgotpassword.js
+++ b/src/controllers/session/forgotPassword/index.js
@@ -1,5 +1,6 @@
-define(['globalize'], function (globalize) {
-    'use strict';
+import globalize from 'globalize';
+
+/* eslint-disable indent */
 
     function processForgotPasswordResult(result) {
         if ('ContactAdmin' == result.Action) {
@@ -17,7 +18,7 @@ define(['globalize'], function (globalize) {
         }
 
         if ('PinCode' == result.Action) {
-            var msg = globalize.translate('MessageForgotPasswordFileCreated');
+            let msg = globalize.translate('MessageForgotPasswordFileCreated');
             msg += '<br/>';
             msg += '<br/>';
             msg += 'Enter PIN here to finish Password Reset<br/>';
@@ -34,7 +35,7 @@ define(['globalize'], function (globalize) {
         }
     }
 
-    return function (view, params) {
+    export default function (view, params) {
         function onSubmit(e) {
             ApiClient.ajax({
                 type: 'POST',
@@ -49,5 +50,6 @@ define(['globalize'], function (globalize) {
         }
 
         view.querySelector('form').addEventListener('submit', onSubmit);
-    };
-});
+    }
+
+/* eslint-enable indent */
diff --git a/src/login.html b/src/controllers/session/login/index.html
similarity index 84%
rename from src/login.html
rename to src/controllers/session/login/index.html
index 49472d8817..d22d903a1d 100644
--- a/src/login.html
+++ b/src/controllers/session/login/index.html
@@ -1,7 +1,9 @@
-<div id="loginPage" data-role="page" class="page standalonePage" data-backbutton="false">
-    <div class="padded-left padded-right padded-bottom-page">
-        <form class="manualLoginForm hide" style="margin: 0 auto;">
-            <h1 style="margin-top:1em;text-align: left;">${HeaderPleaseSignIn}</h1>
+<div id="loginPage" data-role="page" class="page standalonePage flex flex-direction-column" data-backbutton="false">
+    <div class="padded-left padded-right padded-bottom-page margin-auto-y">
+        <form class="manualLoginForm margin-auto-x hide">
+            <div class="padded-left padded-right flex align-items-center justify-content-center">
+                <h1 class="sectionTitle">${HeaderPleaseSignIn}</h1>
+            </div>
             <div style="height:0; overflow: hidden;">
                 <input type="text" name="fakeusernameremembered" tabindex="-1" />
                 <input type="password" name="fakepasswordremembered" tabindex="-1" />
@@ -29,8 +31,6 @@
                     <span>${ButtonCancel}</span>
                 </button>
             </div>
-            <br/>
-            <br/>
         </form>
 
         <div class="visualLoginForm" style="text-align: center;">
diff --git a/src/controllers/auth/login.js b/src/controllers/session/login/index.js
similarity index 82%
rename from src/controllers/auth/login.js
rename to src/controllers/session/login/index.js
index 6f1c220c5f..cdccdd5fb4 100644
--- a/src/controllers/auth/login.js
+++ b/src/controllers/session/login/index.js
@@ -1,24 +1,27 @@
-define(['apphost', 'appSettings', 'dom', 'connectionManager', 'loading', 'layoutManager', 'browser', 'globalize', 'cardStyle', 'emby-checkbox'], function (appHost, appSettings, dom, connectionManager, loading, layoutManager, browser, globalize) {
-    'use strict';
+import appHost from 'apphost';
+import appSettings from 'appSettings';
+import dom from 'dom';
+import connectionManager from 'connectionManager';
+import loading from 'loading';
+import layoutManager from 'layoutManager';
+import libraryMenu from 'libraryMenu';
+import browser from 'browser';
+import globalize from 'globalize';
+import 'cardStyle';
+import 'emby-checkbox';
 
-    var enableFocusTransform = !browser.slow && !browser.edge;
+/* eslint-disable indent */
+
+    const enableFocusTransform = !browser.slow && !browser.edge;
 
     function authenticateUserByName(page, apiClient, username, password) {
         loading.show();
         apiClient.authenticateUserByName(username, password).then(function (result) {
             var user = result.User;
-            var serverId = getParameterByName('serverid');
-            var newUrl;
-
-            if (user.Policy.IsAdministrator && !serverId) {
-                newUrl = 'dashboard.html';
-            } else {
-                newUrl = 'home.html';
-            }
-
             loading.hide();
+
             Dashboard.onServerChanged(user.Id, result.AccessToken, apiClient);
-            Dashboard.navigate(newUrl);
+            Dashboard.navigate('home.html');
         }, function (response) {
             page.querySelector('#txtManualName').value = '';
             page.querySelector('#txtManualPassword').value = '';
@@ -26,7 +29,7 @@ define(['apphost', 'appSettings', 'dom', 'connectionManager', 'loading', 'layout
 
             const UnauthorizedOrForbidden = [401, 403];
             if (UnauthorizedOrForbidden.includes(response.status)) {
-                require(['toast'], function (toast) {
+                import('toast').then(({default: toast}) => {
                     const messageKey = response.status === 401 ? 'MessageInvalidUser' : 'MessageUnauthorizedUser';
                     toast(globalize.translate(messageKey));
                 });
@@ -58,23 +61,23 @@ define(['apphost', 'appSettings', 'dom', 'connectionManager', 'loading', 'layout
         }
     }
 
-    var metroColors = ['#6FBD45', '#4BB3DD', '#4164A5', '#E12026', '#800080', '#E1B222', '#008040', '#0094FF', '#FF00C7', '#FF870F', '#7F0037'];
+    const metroColors = ['#6FBD45', '#4BB3DD', '#4164A5', '#E12026', '#800080', '#E1B222', '#008040', '#0094FF', '#FF00C7', '#FF870F', '#7F0037'];
 
     function getRandomMetroColor() {
-        var index = Math.floor(Math.random() * (metroColors.length - 1));
+        const index = Math.floor(Math.random() * (metroColors.length - 1));
         return metroColors[index];
     }
 
     function getMetroColor(str) {
         if (str) {
-            var character = String(str.substr(0, 1).charCodeAt());
-            var sum = 0;
+            const character = String(str.substr(0, 1).charCodeAt());
+            let sum = 0;
 
-            for (var i = 0; i < character.length; i++) {
+            for (let i = 0; i < character.length; i++) {
                 sum += parseInt(character.charAt(i));
             }
 
-            var index = String(sum).substr(-1);
+            const index = String(sum).substr(-1);
             return metroColors[index];
         }
 
@@ -82,13 +85,13 @@ define(['apphost', 'appSettings', 'dom', 'connectionManager', 'loading', 'layout
     }
 
     function loadUserList(context, apiClient, users) {
-        var html = '';
+        let html = '';
 
-        for (var i = 0; i < users.length; i++) {
-            var user = users[i];
+        for (let i = 0; i < users.length; i++) {
+            const user = users[i];
 
             // TODO move card creation code to Card component
-            var cssClass = 'card squareCard scalableCard squareCard-scalable';
+            let cssClass = 'card squareCard scalableCard squareCard-scalable';
 
             if (layoutManager.tv) {
                 cssClass += ' show-focus';
@@ -98,13 +101,13 @@ define(['apphost', 'appSettings', 'dom', 'connectionManager', 'loading', 'layout
                 }
             }
 
-            var cardBoxCssClass = 'cardBox cardBox-bottompadded';
+            const cardBoxCssClass = 'cardBox cardBox-bottompadded';
             html += '<button type="button" class="' + cssClass + '">';
             html += '<div class="' + cardBoxCssClass + '">';
             html += '<div class="cardScalable">';
             html += '<div class="cardPadder cardPadder-square"></div>';
             html += '<div class="cardContent" data-haspw="' + user.HasPassword + '" data-username="' + user.Name + '" data-userid="' + user.Id + '">';
-            var imgUrl;
+            let imgUrl;
 
             if (user.PrimaryImageTag) {
                 imgUrl = apiClient.getUserImageUrl(user.Id, {
@@ -114,7 +117,7 @@ define(['apphost', 'appSettings', 'dom', 'connectionManager', 'loading', 'layout
                 });
                 html += '<div class="cardImageContainer coveredImage coveredImage-noScale" style="background-image:url(\'' + imgUrl + "');\"></div>";
             } else {
-                var background = getMetroColor(user.Id);
+                const background = getMetroColor(user.Id);
                 imgUrl = 'assets/img/avatar.png';
                 html += '<div class="cardImageContainer coveredImage coveredImage-noScale" style="background-image:url(\'' + imgUrl + "');background-color:" + background + ';"></div>';
             }
@@ -131,9 +134,9 @@ define(['apphost', 'appSettings', 'dom', 'connectionManager', 'loading', 'layout
         context.querySelector('#divUsers').innerHTML = html;
     }
 
-    return function (view, params) {
+    export default function (view, params) {
         function getApiClient() {
-            var serverId = params.serverid;
+            const serverId = params.serverid;
 
             if (serverId) {
                 return connectionManager.getOrCreateApiClient(serverId);
@@ -147,7 +150,7 @@ define(['apphost', 'appSettings', 'dom', 'connectionManager', 'loading', 'layout
             view.querySelector('.manualLoginForm').classList.add('hide');
             view.querySelector('.btnManual').classList.remove('hide');
 
-            require(['autoFocuser'], function (autoFocuser) {
+            import('autoFocuser').then(({default: autoFocuser}) => {
                 autoFocuser.autoFocus(view);
             });
         }
@@ -217,14 +220,14 @@ define(['apphost', 'appSettings', 'dom', 'connectionManager', 'loading', 'layout
         }
       
         view.querySelector('#divUsers').addEventListener('click', function (e) {
-            var card = dom.parentWithClass(e.target, 'card');
-            var cardContent = card ? card.querySelector('.cardContent') : null;
+            const card = dom.parentWithClass(e.target, 'card');
+            const cardContent = card ? card.querySelector('.cardContent') : null;
 
             if (cardContent) {
-                var context = view;
-                var id = cardContent.getAttribute('data-userid');
-                var name = cardContent.getAttribute('data-username');
-                var haspw = cardContent.getAttribute('data-haspw');
+                const context = view;
+                const id = cardContent.getAttribute('data-userid');
+                const name = cardContent.getAttribute('data-username');
+                const haspw = cardContent.getAttribute('data-haspw');
 
                 if (id === 'manual') {
                     context.querySelector('#txtManualName').value = '';
@@ -240,7 +243,7 @@ define(['apphost', 'appSettings', 'dom', 'connectionManager', 'loading', 'layout
         });
         view.querySelector('.manualLoginForm').addEventListener('submit', function (e) {
             appSettings.enableAutoLogin(view.querySelector('.chkRememberLogin').checked);
-            var apiClient = getApiClient();
+            const apiClient = getApiClient();
             authenticateUserByName(view, apiClient, view.querySelector('#txtManualName').value, view.querySelector('#txtManualPassword').value);
             e.preventDefault();
             return false;
@@ -260,12 +263,13 @@ define(['apphost', 'appSettings', 'dom', 'connectionManager', 'loading', 'layout
 
         view.addEventListener('viewshow', function (e) {
             loading.show();
+            libraryMenu.setTransparentMenu(true);
 
             if (!appHost.supports('multiserver')) {
                 view.querySelector('.btnSelectServer').classList.add('hide');
             }
 
-            var apiClient = getApiClient();
+            const apiClient = getApiClient();
             apiClient.getPublicUsers().then(function (users) {
                 if (users.length) {
                     showVisualForm();
@@ -281,5 +285,9 @@ define(['apphost', 'appSettings', 'dom', 'connectionManager', 'loading', 'layout
                 view.querySelector('.disclaimer').textContent = options.LoginDisclaimer || '';
             });
         });
-    };
-});
+        view.addEventListener('viewhide', function (e) {
+            libraryMenu.setTransparentMenu(false);
+        });
+    }
+
+/* eslint-enable indent */
diff --git a/src/forgotpasswordpin.html b/src/controllers/session/resetPassword/index.html
similarity index 93%
rename from src/forgotpasswordpin.html
rename to src/controllers/session/resetPassword/index.html
index 3b1ba0d37b..ef915be788 100644
--- a/src/forgotpasswordpin.html
+++ b/src/controllers/session/resetPassword/index.html
@@ -1,5 +1,5 @@
 <div data-role="page" class="page standalonePage forgotPasswordPinPage">
-    <div>
+    <div class="padded-left padded-right padded-bottom-page">
         <form class="forgotPasswordPinForm" style="text-align: center; margin: 0 auto;">
             <div style="text-align: left;">
                 <h2>${HeaderPasswordReset}</h2>
diff --git a/src/controllers/auth/forgotpasswordpin.js b/src/controllers/session/resetPassword/index.js
similarity index 84%
rename from src/controllers/auth/forgotpasswordpin.js
rename to src/controllers/session/resetPassword/index.js
index 2a51890d2f..a88e131eea 100644
--- a/src/controllers/auth/forgotpasswordpin.js
+++ b/src/controllers/session/resetPassword/index.js
@@ -1,9 +1,10 @@
-define(['globalize'], function (globalize) {
-    'use strict';
+import globalize from 'globalize';
+
+/* eslint-disable indent */
 
     function processForgotPasswordResult(result) {
         if (result.Success) {
-            var msg = globalize.translate('MessagePasswordResetForUsers');
+            let msg = globalize.translate('MessagePasswordResetForUsers');
             msg += '<br/>';
             msg += '<br/>';
             msg += result.UsersReset.join('<br/>');
@@ -22,7 +23,7 @@ define(['globalize'], function (globalize) {
         });
     }
 
-    return function (view, params) {
+    export default function (view, params) {
         function onSubmit(e) {
             ApiClient.ajax({
                 type: 'POST',
@@ -37,5 +38,6 @@ define(['globalize'], function (globalize) {
         }
 
         view.querySelector('form').addEventListener('submit', onSubmit);
-    };
-});
+    }
+
+/* eslint-enable indent */
diff --git a/src/controllers/session/selectServer/index.html b/src/controllers/session/selectServer/index.html
new file mode 100644
index 0000000000..0a14e7fa03
--- /dev/null
+++ b/src/controllers/session/selectServer/index.html
@@ -0,0 +1,17 @@
+<div id="selectServerPage" data-role="page" class="page noSecondaryNavPage standalonePage pageContainer fullWidthContent vertical flex flex-direction-column">
+    <div class="margin-auto-y">
+        <div class="verticalSection flex-shrink-zero w-100 flex flex-direction-column">
+            <div class="padded-left padded-right flex align-items-center justify-content-center">
+                <h1 class="sectionTitle sectionTitle-cards">${HeaderSelectServer}</h1>
+            </div>
+            <div class="padded-top padded-bottom-focusscale flex-grow flex" data-horizontal="true" data-centerfocus="card">
+                <div is="emby-itemscontainer" class="scrollSlider focuscontainer-x servers flex-grow" style="display: block; text-align: center;" data-hovermenu="false" data-multiselect="false"></div>
+            </div>
+        </div>
+        <div class="padded-top padded-left padded-right flex flex-shrink-zero justify-content-center verticalSection flex-wrap-wrap margin-auto-x">
+            <a is="emby-linkbutton" href="addserver.html" class="raised cancel btnAddServer flex-shrink-zero" style="margin: .25em;">
+                <span>${ButtonAddServer}</span>
+            </a>
+        </div>
+    </div>
+</div>
diff --git a/src/controllers/auth/selectserver.js b/src/controllers/session/selectServer/index.js
similarity index 79%
rename from src/controllers/auth/selectserver.js
rename to src/controllers/session/selectServer/index.js
index ba88313484..3e36b74859 100644
--- a/src/controllers/auth/selectserver.js
+++ b/src/controllers/session/selectServer/index.js
@@ -1,10 +1,28 @@
-define(['loading', 'appRouter', 'layoutManager', 'appSettings', 'apphost', 'focusManager', 'connectionManager', 'globalize', 'actionsheet', 'dom', 'browser', 'material-icons', 'flexStyles', 'emby-scroller', 'emby-itemscontainer', 'cardStyle', 'emby-button'], function (loading, appRouter, layoutManager, appSettings, appHost, focusManager, connectionManager, globalize, actionSheet, dom, browser) {
-    'use strict';
+import loading from 'loading';
+import appRouter from 'appRouter';
+import layoutManager from 'layoutManager';
+import libraryMenu from 'libraryMenu';
+import appSettings from 'appSettings';
+import appHost from 'apphost';
+import focusManager from 'focusManager';
+import connectionManager from 'connectionManager';
+import globalize from 'globalize';
+import actionSheet from 'actionsheet';
+import dom from 'dom';
+import browser from 'browser';
+import 'material-icons';
+import 'flexStyles';
+import 'emby-scroller';
+import 'emby-itemscontainer';
+import 'cardStyle';
+import 'emby-button';
 
-    var enableFocusTransform = !browser.slow && !browser.edge;
+/* eslint-disable indent */
+
+    const enableFocusTransform = !browser.slow && !browser.edge;
 
     function renderSelectServerItems(view, servers) {
-        var items = servers.map(function (server) {
+        const items = servers.map(function (server) {
             return {
                 name: server.Name,
                 showIcon: true,
@@ -14,8 +32,8 @@ define(['loading', 'appRouter', 'layoutManager', 'appSettings', 'apphost', 'focu
                 server: server
             };
         });
-        var html = items.map(function (item) {
-            var cardImageContainer;
+        let html = items.map(function (item) {
+            let cardImageContainer;
 
             if (item.showIcon) {
                 cardImageContainer = '<span class="cardImageIcon material-icons ' + item.icon + '"></span>';
@@ -25,7 +43,7 @@ define(['loading', 'appRouter', 'layoutManager', 'appSettings', 'apphost', 'focu
 
             // TODO move card creation code to Card component
 
-            var cssClass = 'card overflowSquareCard loginSquareCard scalableCard overflowSquareCard-scalable';
+            let cssClass = 'card overflowSquareCard loginSquareCard scalableCard overflowSquareCard-scalable';
 
             if (layoutManager.tv) {
                 cssClass += ' show-focus';
@@ -35,10 +53,10 @@ define(['loading', 'appRouter', 'layoutManager', 'appSettings', 'apphost', 'focu
                 }
             }
 
-            var cardBoxCssClass = 'cardBox';
+            const cardBoxCssClass = 'cardBox';
 
-            var innerOpening = '<div class="' + cardBoxCssClass + '">';
-            var cardContainer = '';
+            const innerOpening = '<div class="' + cardBoxCssClass + '">';
+            let cardContainer = '';
             cardContainer += '<button raised class="' + cssClass + '" style="display:inline-block;" data-id="' + item.id + '" data-url="' + (item.url || '') + '" data-cardtype="' + item.cardType + '">';
             cardContainer += innerOpening;
             cardContainer += '<div class="cardScalable">';
@@ -55,7 +73,7 @@ define(['loading', 'appRouter', 'layoutManager', 'appSettings', 'apphost', 'focu
             cardContainer += '</div></div></button>';
             return cardContainer;
         }).join('');
-        var itemsContainer = view.querySelector('.servers');
+        const itemsContainer = view.querySelector('.servers');
 
         if (!items.length) {
             html = '<p>' + globalize.translate('MessageNoServersAvailable') + '</p>';
@@ -89,7 +107,7 @@ define(['loading', 'appRouter', 'layoutManager', 'appSettings', 'apphost', 'focu
     }
 
     function alertTextWithOptions(options) {
-        require(['alert'], function (alert) {
+        import('alert').then(({default: alert}) => {
             alert(options);
         });
     }
@@ -98,14 +116,14 @@ define(['loading', 'appRouter', 'layoutManager', 'appSettings', 'apphost', 'focu
         alertText(globalize.translate('MessageUnableToConnectToServer'));
     }
 
-    return function (view, params) {
+    export default function (view, params) {
         function connectToServer(server) {
             loading.show();
             connectionManager.connectToServer(server, {
                 enableAutoLogin: appSettings.enableAutoLogin()
             }).then(function (result) {
                 loading.hide();
-                var apiClient = result.ApiClient;
+                const apiClient = result.ApiClient;
 
                 switch (result.State) {
                     case 'SignedIn':
@@ -140,7 +158,7 @@ define(['loading', 'appRouter', 'layoutManager', 'appSettings', 'apphost', 'focu
         }
 
         function onServerClick(server) {
-            var menuItems = [];
+            const menuItems = [];
             menuItems.push({
                 name: globalize.translate('Connect'),
                 id: 'connect'
@@ -178,31 +196,33 @@ define(['loading', 'appRouter', 'layoutManager', 'appSettings', 'apphost', 'focu
             connectionManager.getAvailableServers().then(onServersRetrieved);
         }
 
-        var servers;
+        let servers;
         updatePageStyle(view, params);
         view.addEventListener('viewshow', function (e) {
-            var isRestored = e.detail.isRestored;
+            const isRestored = e.detail.isRestored;
             appRouter.setTitle(null);
+            libraryMenu.setTransparentMenu(true);
 
             if (!isRestored) {
                 loadServers();
             }
         });
         view.querySelector('.servers').addEventListener('click', function (e) {
-            var card = dom.parentWithClass(e.target, 'card');
+            const card = dom.parentWithClass(e.target, 'card');
 
             if (card) {
-                var url = card.getAttribute('data-url');
+                const url = card.getAttribute('data-url');
 
                 if (url) {
                     appRouter.show(url);
                 } else {
-                    var id = card.getAttribute('data-id');
+                    const id = card.getAttribute('data-id');
                     onServerClick(servers.filter(function (s) {
                         return s.Id === id;
                     })[0]);
                 }
             }
         });
-    };
-});
+    }
+
+/* eslint-enable indent */
diff --git a/src/controllers/shows/episodes.js b/src/controllers/shows/episodes.js
index ca9a807cbf..1e067a7674 100644
--- a/src/controllers/shows/episodes.js
+++ b/src/controllers/shows/episodes.js
@@ -1,10 +1,19 @@
-define(['loading', 'events', 'libraryBrowser', 'imageLoader', 'listView', 'cardBuilder', 'userSettings', 'globalize', 'emby-itemscontainer'], function (loading, events, libraryBrowser, imageLoader, listView, cardBuilder, userSettings, globalize) {
-    'use strict';
+import loading from 'loading';
+import events from 'events';
+import libraryBrowser from 'libraryBrowser';
+import imageLoader from 'imageLoader';
+import listView from 'listView';
+import cardBuilder from 'cardBuilder';
+import * as userSettings from 'userSettings';
+import globalize from 'globalize';
+import 'emby-itemscontainer';
 
-    return function (view, params, tabContent) {
+/* eslint-disable indent */
+
+    export default function (view, params, tabContent) {
         function getPageData(context) {
-            var key = getSavedQueryKey(context);
-            var pageData = data[key];
+            const key = getSavedQueryKey(context);
+            let pageData = data[key];
 
             if (!pageData) {
                 pageData = data[key] = {
@@ -46,8 +55,8 @@ define(['loading', 'events', 'libraryBrowser', 'imageLoader', 'listView', 'cardB
         }
 
         function onViewStyleChange() {
-            var viewStyle = self.getCurrentViewStyle();
-            var itemsContainer = tabContent.querySelector('.itemsContainer');
+            const viewStyle = self.getCurrentViewStyle();
+            const itemsContainer = tabContent.querySelector('.itemsContainer');
 
             if ('List' == viewStyle) {
                 itemsContainer.classList.add('vertical-list');
@@ -63,7 +72,7 @@ define(['loading', 'events', 'libraryBrowser', 'imageLoader', 'listView', 'cardB
         function reloadItems(page) {
             loading.show();
             isLoading = true;
-            var query = getQuery(page);
+            const query = getQuery(page);
             ApiClient.getItems(Dashboard.getCurrentUserId(), query).then(function (result) {
                 function onNextPageClick() {
                     if (isLoading) {
@@ -88,8 +97,8 @@ define(['loading', 'events', 'libraryBrowser', 'imageLoader', 'listView', 'cardB
                 }
 
                 window.scrollTo(0, 0);
-                var html;
-                var pagingHtml = libraryBrowser.getQueryPagingHtml({
+                let html;
+                const pagingHtml = libraryBrowser.getQueryPagingHtml({
                     startIndex: query.StartIndex,
                     limit: query.Limit,
                     totalRecordCount: result.TotalRecordCount,
@@ -99,8 +108,8 @@ define(['loading', 'events', 'libraryBrowser', 'imageLoader', 'listView', 'cardB
                     sortButton: false,
                     filterButton: false
                 });
-                var viewStyle = self.getCurrentViewStyle();
-                var itemsContainer = tabContent.querySelector('.itemsContainer');
+                const viewStyle = self.getCurrentViewStyle();
+                const itemsContainer = tabContent.querySelector('.itemsContainer');
                 if (viewStyle == 'List') {
                     html = listView.getListViewHtml({
                         items: result.Items,
@@ -128,22 +137,20 @@ define(['loading', 'events', 'libraryBrowser', 'imageLoader', 'listView', 'cardB
                         overlayPlayButton: true
                     });
                 }
-                var i;
-                var length;
-                var elems;
+                let elems;
 
                 elems = tabContent.querySelectorAll('.paging');
-                for (i = 0, length = elems.length; i < length; i++) {
+                for (let i = 0, length = elems.length; i < length; i++) {
                     elems[i].innerHTML = pagingHtml;
                 }
 
                 elems = tabContent.querySelectorAll('.btnNextPage');
-                for (i = 0, length = elems.length; i < length; i++) {
+                for (let i = 0, length = elems.length; i < length; i++) {
                     elems[i].addEventListener('click', onNextPageClick);
                 }
 
                 elems = tabContent.querySelectorAll('.btnPreviousPage');
-                for (i = 0, length = elems.length; i < length; i++) {
+                for (let i = 0, length = elems.length; i < length; i++) {
                     elems[i].addEventListener('click', onPreviousPageClick);
                 }
 
@@ -153,19 +160,19 @@ define(['loading', 'events', 'libraryBrowser', 'imageLoader', 'listView', 'cardB
                 loading.hide();
                 isLoading = false;
 
-                require(['autoFocuser'], function (autoFocuser) {
+                import('autoFocuser').then(({default: autoFocuser}) => {
                     autoFocuser.autoFocus(page);
                 });
             });
         }
 
-        var self = this;
-        var data = {};
-        var isLoading = false;
+        const self = this;
+        const data = {};
+        let isLoading = false;
 
         self.showFilterMenu = function () {
-            require(['components/filterdialog/filterdialog'], function (filterDialogFactory) {
-                var filterDialog = new filterDialogFactory({
+            import('components/filterdialog/filterdialog').then(({default: filterDialogFactory}) => {
+                const filterDialog = new filterDialogFactory({
                     query: getQuery(tabContent),
                     mode: 'episodes',
                     serverId: ApiClient.serverId()
@@ -219,12 +226,12 @@ define(['loading', 'events', 'libraryBrowser', 'imageLoader', 'listView', 'cardB
                     button: e.target
                 });
             });
-            var btnSelectView = tabContent.querySelector('.btnSelectView');
+            const btnSelectView = tabContent.querySelector('.btnSelectView');
             btnSelectView.addEventListener('click', function (e) {
                 libraryBrowser.showLayoutMenu(e.target, self.getCurrentViewStyle(), 'List,Poster,PosterCard'.split(','));
             });
             btnSelectView.addEventListener('layoutchange', function (e) {
-                var viewStyle = e.detail.viewStyle;
+                const viewStyle = e.detail.viewStyle;
                 getPageData(tabContent).view = viewStyle;
                 libraryBrowser.saveViewSetting(getSavedQueryKey(tabContent), viewStyle);
                 onViewStyleChange();
@@ -240,5 +247,6 @@ define(['loading', 'events', 'libraryBrowser', 'imageLoader', 'listView', 'cardB
         };
 
         self.destroy = function () {};
-    };
-});
+    }
+
+/* eslint-enable indent */
diff --git a/src/controllers/shows/tvgenres.js b/src/controllers/shows/tvgenres.js
index de38763e99..d686a62197 100644
--- a/src/controllers/shows/tvgenres.js
+++ b/src/controllers/shows/tvgenres.js
@@ -1,10 +1,20 @@
-define(['layoutManager', 'loading', 'libraryBrowser', 'cardBuilder', 'lazyLoader', 'apphost', 'globalize', 'appRouter', 'dom', 'emby-button'], function (layoutManager, loading, libraryBrowser, cardBuilder, lazyLoader, appHost, globalize, appRouter, dom) {
-    'use strict';
+import layoutManager from 'layoutManager';
+import loading from 'loading';
+import libraryBrowser from 'libraryBrowser';
+import cardBuilder from 'cardBuilder';
+import lazyLoader from 'lazyLoader';
+import appHost from 'apphost';
+import globalize from 'globalize';
+import appRouter from 'appRouter';
+import dom from 'dom';
+import 'emby-button';
 
-    return function (view, params, tabContent) {
+/* eslint-disable indent */
+
+    export default function (view, params, tabContent) {
         function getPageData() {
-            var key = getSavedQueryKey();
-            var pageData = data[key];
+            const key = getSavedQueryKey();
+            let pageData = data[key];
 
             if (!pageData) {
                 pageData = data[key] = {
@@ -34,7 +44,7 @@ define(['layoutManager', 'loading', 'libraryBrowser', 'cardBuilder', 'lazyLoader
 
         function getPromise() {
             loading.show();
-            var query = getQuery();
+            const query = getQuery();
             return ApiClient.getGenres(ApiClient.getCurrentUserId(), query);
         }
 
@@ -51,17 +61,17 @@ define(['layoutManager', 'loading', 'libraryBrowser', 'cardBuilder', 'lazyLoader
         }
 
         function fillItemsContainer(entry) {
-            var elem = entry.target;
-            var id = elem.getAttribute('data-id');
-            var viewStyle = self.getCurrentViewStyle();
-            var limit = 'Thumb' == viewStyle || 'ThumbCard' == viewStyle ? 5 : 9;
+            const elem = entry.target;
+            const id = elem.getAttribute('data-id');
+            const viewStyle = self.getCurrentViewStyle();
+            let limit = 'Thumb' == viewStyle || 'ThumbCard' == viewStyle ? 5 : 9;
 
             if (enableScrollX()) {
                 limit = 10;
             }
 
-            var enableImageTypes = 'Thumb' == viewStyle || 'ThumbCard' == viewStyle ? 'Primary,Backdrop,Thumb' : 'Primary';
-            var query = {
+            const enableImageTypes = 'Thumb' == viewStyle || 'ThumbCard' == viewStyle ? 'Primary,Backdrop,Thumb' : 'Primary';
+            const query = {
                 SortBy: 'SortName',
                 SortOrder: 'Ascending',
                 IncludeItemTypes: 'Series',
@@ -75,7 +85,7 @@ define(['layoutManager', 'loading', 'libraryBrowser', 'cardBuilder', 'lazyLoader
                 ParentId: params.topParentId
             };
             ApiClient.getItems(ApiClient.getCurrentUserId(), query).then(function (result) {
-                var supportsImageAnalysis = appHost.supports('imageanalysis');
+                const supportsImageAnalysis = appHost.supports('imageanalysis');
 
                 if (viewStyle == 'Thumb') {
                     cardBuilder.buildCards(result.Items, {
@@ -128,14 +138,13 @@ define(['layoutManager', 'loading', 'libraryBrowser', 'cardBuilder', 'lazyLoader
         }
 
         function reloadItems(context, promise) {
-            var query = getQuery();
+            const query = getQuery();
             promise.then(function (result) {
-                var elem = context.querySelector('#items');
-                var html = '';
-                var items = result.Items;
+                const elem = context.querySelector('#items');
+                let html = '';
+                const items = result.Items;
 
-                for (var i = 0, length = items.length; i < length; i++) {
-                    var item = items[i];
+                for (const item of items) {
                     html += '<div class="verticalSection">';
                     html += '<div class="sectionTitleContainer sectionTitleContainer-cards padded-left">';
                     html += '<a is="emby-linkbutton" href="' + appRouter.getRouteUrl(item, {
@@ -149,7 +158,7 @@ define(['layoutManager', 'loading', 'libraryBrowser', 'cardBuilder', 'lazyLoader
                     html += '</a>';
                     html += '</div>';
                     if (enableScrollX()) {
-                        var scrollXClass = 'scrollX hiddenScrollX';
+                        let scrollXClass = 'scrollX hiddenScrollX';
                         if (layoutManager.tv) {
                             scrollXClass += 'smoothScrollX padded-top-focusscale padded-bottom-focusscale';
                         }
@@ -161,6 +170,15 @@ define(['layoutManager', 'loading', 'libraryBrowser', 'cardBuilder', 'lazyLoader
                     html += '</div>';
                 }
 
+                if (!result.Items.length) {
+                    html = '';
+
+                    html += '<div class="noItemsMessage centerMessage">';
+                    html += '<h1>' + globalize.translate('MessageNothingHere') + '</h1>';
+                    html += '<p>' + globalize.translate('MessageNoGenresAvailable') + '</p>';
+                    html += '</div>';
+                }
+
                 elem.innerHTML = html;
                 lazyLoader.lazyChildren(elem, fillItemsContainer);
                 libraryBrowser.saveQueryValues(getSavedQueryKey(), query);
@@ -173,8 +191,8 @@ define(['layoutManager', 'loading', 'libraryBrowser', 'cardBuilder', 'lazyLoader
             self.renderTab();
         }
 
-        var self = this;
-        var data = {};
+        const self = this;
+        const data = {};
 
         self.getViewStyles = function () {
             return 'Poster,PosterCard,Thumb,ThumbCard'.split(',');
@@ -191,7 +209,7 @@ define(['layoutManager', 'loading', 'libraryBrowser', 'cardBuilder', 'lazyLoader
         };
 
         self.enableViewSelection = true;
-        var promise;
+        let promise;
 
         self.preRender = function () {
             promise = getPromise();
@@ -200,5 +218,6 @@ define(['layoutManager', 'loading', 'libraryBrowser', 'cardBuilder', 'lazyLoader
         self.renderTab = function () {
             reloadItems(tabContent, promise);
         };
-    };
-});
+    }
+
+/* eslint-enable indent */
diff --git a/src/controllers/shows/tvlatest.js b/src/controllers/shows/tvlatest.js
index 08e420a595..c08f3d5a15 100644
--- a/src/controllers/shows/tvlatest.js
+++ b/src/controllers/shows/tvlatest.js
@@ -1,11 +1,16 @@
-define(['loading', 'components/groupedcards', 'cardBuilder', 'apphost', 'imageLoader'], function (loading, groupedcards, cardBuilder, appHost, imageLoader) {
-    'use strict';
+import loading from 'loading';
+import groupedcards from 'components/groupedcards';
+import cardBuilder from 'cardBuilder';
+import appHost from 'apphost';
+import imageLoader from 'imageLoader';
+
+/* eslint-disable indent */
 
     function getLatestPromise(context, params) {
         loading.show();
-        var userId = ApiClient.getCurrentUserId();
-        var parentId = params.topParentId;
-        var options = {
+        const userId = ApiClient.getCurrentUserId();
+        const parentId = params.topParentId;
+        const options = {
             IncludeItemTypes: 'Episode',
             Limit: 30,
             Fields: 'PrimaryImageAspectRatio,BasicSyncInfo',
@@ -18,7 +23,7 @@ define(['loading', 'components/groupedcards', 'cardBuilder', 'apphost', 'imageLo
 
     function loadLatest(context, params, promise) {
         promise.then(function (items) {
-            var html = '';
+            let html = '';
             appHost.supports('imageanalysis');
             html += cardBuilder.getCardsHtml({
                 items: items,
@@ -36,20 +41,20 @@ define(['loading', 'components/groupedcards', 'cardBuilder', 'apphost', 'imageLo
                 overlayPlayButton: true,
                 lines: 2
             });
-            var elem = context.querySelector('#latestEpisodes');
+            const elem = context.querySelector('#latestEpisodes');
             elem.innerHTML = html;
             imageLoader.lazyChildren(elem);
             loading.hide();
 
-            require(['autoFocuser'], function (autoFocuser) {
+            import('autoFocuser').then(({default: autoFocuser}) => {
                 autoFocuser.autoFocus(context);
             });
         });
     }
 
-    return function (view, params, tabContent) {
-        var self = this;
-        var latestPromise;
+    export default function (view, params, tabContent) {
+        const self = this;
+        let latestPromise;
 
         self.preRender = function () {
             latestPromise = getLatestPromise(view, params);
@@ -59,6 +64,7 @@ define(['loading', 'components/groupedcards', 'cardBuilder', 'apphost', 'imageLo
             loadLatest(tabContent, params, latestPromise);
         };
 
-        tabContent.querySelector('#latestEpisodes').addEventListener('click', groupedcards.onItemsContainerClick);
-    };
-});
+        tabContent.querySelector('#latestEpisodes').addEventListener('click', groupedcards);
+    }
+
+/* eslint-enable indent */
diff --git a/src/controllers/shows/tvrecommended.js b/src/controllers/shows/tvrecommended.js
index 8087a03096..7edd2ab501 100644
--- a/src/controllers/shows/tvrecommended.js
+++ b/src/controllers/shows/tvrecommended.js
@@ -1,5 +1,19 @@
-define(['events', 'inputManager', 'libraryMenu', 'layoutManager', 'loading', 'dom', 'userSettings', 'cardBuilder', 'playbackManager', 'mainTabsManager', 'globalize', 'scrollStyles', 'emby-itemscontainer', 'emby-button'], function (events, inputManager, libraryMenu, layoutManager, loading, dom, userSettings, cardBuilder, playbackManager, mainTabsManager, globalize) {
-    'use strict';
+import events from 'events';
+import inputManager from 'inputManager';
+import libraryMenu from 'libraryMenu';
+import layoutManager from 'layoutManager';
+import loading from 'loading';
+import dom from 'dom';
+import * as userSettings from 'userSettings';
+import cardBuilder from 'cardBuilder';
+import playbackManager from 'playbackManager';
+import * as mainTabsManager from 'mainTabsManager';
+import globalize from 'globalize';
+import 'scrollStyles';
+import 'emby-itemscontainer';
+import 'emby-button';
+
+/* eslint-disable indent */
 
     function getTabs() {
         return [{
@@ -59,7 +73,7 @@ define(['events', 'inputManager', 'libraryMenu', 'layoutManager', 'loading', 'do
         }
     }
 
-    return function (view, params) {
+    export default function (view, params) {
         function reload() {
             loading.show();
             loadResume();
@@ -67,7 +81,7 @@ define(['events', 'inputManager', 'libraryMenu', 'layoutManager', 'loading', 'do
         }
 
         function loadNextUp() {
-            var query = {
+            const query = {
                 Limit: 24,
                 Fields: 'PrimaryImageAspectRatio,SeriesInfo,DateCreated,BasicSyncInfo',
                 UserId: ApiClient.getCurrentUserId(),
@@ -83,7 +97,7 @@ define(['events', 'inputManager', 'libraryMenu', 'layoutManager', 'loading', 'do
                     view.querySelector('.noNextUpItems').classList.remove('hide');
                 }
 
-                var container = view.querySelector('#nextUpItems');
+                const container = view.querySelector('#nextUpItems');
                 cardBuilder.buildCards(result.Items, {
                     itemsContainer: container,
                     preferThumb: true,
@@ -98,7 +112,7 @@ define(['events', 'inputManager', 'libraryMenu', 'layoutManager', 'loading', 'do
                 });
                 loading.hide();
 
-                require(['autoFocuser'], function (autoFocuser) {
+                import('autoFocuser').then(({default: autoFocuser}) => {
                     autoFocuser.autoFocus(view);
                 });
             });
@@ -113,10 +127,10 @@ define(['events', 'inputManager', 'libraryMenu', 'layoutManager', 'loading', 'do
         }
 
         function loadResume() {
-            var parentId = libraryMenu.getTopParentId();
-            var screenWidth = dom.getWindowSize().innerWidth;
-            var limit = screenWidth >= 1600 ? 5 : 6;
-            var options = {
+            const parentId = libraryMenu.getTopParentId();
+            const screenWidth = dom.getWindowSize().innerWidth;
+            const limit = screenWidth >= 1600 ? 5 : 6;
+            const options = {
                 SortBy: 'DatePlayed',
                 SortOrder: 'Descending',
                 IncludeItemTypes: 'Episode',
@@ -137,8 +151,8 @@ define(['events', 'inputManager', 'libraryMenu', 'layoutManager', 'loading', 'do
                     view.querySelector('#resumableSection').classList.add('hide');
                 }
 
-                var allowBottomPadding = !enableScrollX();
-                var container = view.querySelector('#resumableItems');
+                const allowBottomPadding = !enableScrollX();
+                const container = view.querySelector('#resumableItems');
                 cardBuilder.buildCards(result.Items, {
                     itemsContainer: container,
                     preferThumb: true,
@@ -160,7 +174,7 @@ define(['events', 'inputManager', 'libraryMenu', 'layoutManager', 'loading', 'do
         }
 
         function onTabChange(e) {
-            var newIndex = parseInt(e.detail.selectedTabIndex);
+            const newIndex = parseInt(e.detail.selectedTabIndex);
             loadTab(view, newIndex);
         }
 
@@ -173,49 +187,51 @@ define(['events', 'inputManager', 'libraryMenu', 'layoutManager', 'loading', 'do
         }
 
         function getTabController(page, index, callback) {
-            var depends = [];
+            let depends;
 
             switch (index) {
                 case 0:
-                    depends.push('controllers/shows/tvshows');
+                    depends = 'controllers/shows/tvshows';
                     break;
 
                 case 1:
+                    depends = 'controllers/shows/tvrecommended';
                     break;
 
                 case 2:
-                    depends.push('controllers/shows/tvlatest');
+                    depends = 'controllers/shows/tvlatest';
                     break;
 
                 case 3:
-                    depends.push('controllers/shows/tvupcoming');
+                    depends = 'controllers/shows/tvupcoming';
                     break;
 
                 case 4:
-                    depends.push('controllers/shows/tvgenres');
+                    depends = 'controllers/shows/tvgenres';
                     break;
 
                 case 5:
-                    depends.push('controllers/shows/tvstudios');
+                    depends = 'controllers/shows/tvstudios';
                     break;
 
                 case 6:
-                    depends.push('controllers/shows/episodes');
+                    depends = 'controllers/shows/episodes';
                     break;
 
                 case 7:
-                    depends.push('scripts/searchtab');
+                    depends = 'scripts/searchtab';
+                    break;
             }
 
-            require(depends, function (controllerFactory) {
-                var tabContent;
+            import(depends).then(({default: controllerFactory}) => {
+                let tabContent;
 
                 if (index === 1) {
                     tabContent = view.querySelector(".pageTabContent[data-index='" + index + "']");
                     self.tabContent = tabContent;
                 }
 
-                var controller = tabControllers[index];
+                let controller = tabControllers[index];
 
                 if (!controller) {
                     tabContent = view.querySelector(".pageTabContent[data-index='" + index + "']");
@@ -270,7 +286,7 @@ define(['events', 'inputManager', 'libraryMenu', 'layoutManager', 'loading', 'do
         }
 
         function onWebSocketMessage(e, data) {
-            var msg = data;
+            const msg = data;
 
             if (msg.MessageType === 'UserDataChanged' && msg.Data.UserId == ApiClient.getCurrentUserId()) {
                 renderedTabs = [];
@@ -285,13 +301,13 @@ define(['events', 'inputManager', 'libraryMenu', 'layoutManager', 'loading', 'do
             }
         }
 
-        var isViewRestored;
-        var self = this;
-        var currentTabIndex = parseInt(params.tab || getDefaultTabIndex(params.topParentId));
-        var initialTabIndex = currentTabIndex;
+        let isViewRestored;
+        const self = this;
+        let currentTabIndex = parseInt(params.tab || getDefaultTabIndex(params.topParentId));
+        let initialTabIndex = currentTabIndex;
 
         self.initTab = function () {
-            var tabContent = self.tabContent;
+            const tabContent = self.tabContent;
             setScrollClasses(tabContent.querySelector('#resumableItems'), enableScrollX());
         };
 
@@ -299,14 +315,14 @@ define(['events', 'inputManager', 'libraryMenu', 'layoutManager', 'loading', 'do
             reload();
         };
 
-        var tabControllers = [];
-        var renderedTabs = [];
+        const tabControllers = [];
+        let renderedTabs = [];
         setScrollClasses(view.querySelector('#resumableItems'), enableScrollX());
         view.addEventListener('viewshow', function (e) {
             isViewRestored = e.detail.isRestored;
             initTabs();
             if (!view.getAttribute('data-title')) {
-                var parentId = params.topParentId;
+                const parentId = params.topParentId;
 
                 if (parentId) {
                     ApiClient.getItem(ApiClient.getCurrentUserId(), parentId).then(function (item) {
@@ -335,5 +351,6 @@ define(['events', 'inputManager', 'libraryMenu', 'layoutManager', 'loading', 'do
                 }
             });
         });
-    };
-});
+    }
+
+/* eslint-enable indent */
diff --git a/src/controllers/shows/tvshows.js b/src/controllers/shows/tvshows.js
index 753516f902..cde5ae5058 100644
--- a/src/controllers/shows/tvshows.js
+++ b/src/controllers/shows/tvshows.js
@@ -1,10 +1,21 @@
-define(['layoutManager', 'loading', 'events', 'libraryBrowser', 'imageLoader', 'listView', 'cardBuilder', 'alphaPicker', 'userSettings', 'globalize', 'emby-itemscontainer'], function (layoutManager, loading, events, libraryBrowser, imageLoader, listView, cardBuilder, alphaPicker, userSettings, globalize) {
-    'use strict';
+import layoutManager from 'layoutManager';
+import loading from 'loading';
+import events from 'events';
+import libraryBrowser from 'libraryBrowser';
+import imageLoader from 'imageLoader';
+import listView from 'listView';
+import cardBuilder from 'cardBuilder';
+import AlphaPicker from 'alphaPicker';
+import * as userSettings from 'userSettings';
+import globalize from 'globalize';
+import 'emby-itemscontainer';
 
-    return function (view, params, tabContent) {
+/* eslint-disable indent */
+
+    export default function (view, params, tabContent) {
         function getPageData(context) {
-            var key = getSavedQueryKey(context);
-            var pageData = data[key];
+            const key = getSavedQueryKey(context);
+            let pageData = data[key];
 
             if (!pageData) {
                 pageData = data[key] = {
@@ -45,8 +56,8 @@ define(['layoutManager', 'loading', 'events', 'libraryBrowser', 'imageLoader', '
         }
 
         function onViewStyleChange() {
-            var viewStyle = self.getCurrentViewStyle();
-            var itemsContainer = tabContent.querySelector('.itemsContainer');
+            const viewStyle = self.getCurrentViewStyle();
+            const itemsContainer = tabContent.querySelector('.itemsContainer');
 
             if ('List' == viewStyle) {
                 itemsContainer.classList.add('vertical-list');
@@ -62,7 +73,7 @@ define(['layoutManager', 'loading', 'events', 'libraryBrowser', 'imageLoader', '
         function reloadItems(page) {
             loading.show();
             isLoading = true;
-            var query = getQuery(page);
+            const query = getQuery(page);
             ApiClient.getItems(ApiClient.getCurrentUserId(), query).then(function (result) {
                 function onNextPageClick() {
                     if (isLoading) {
@@ -88,8 +99,8 @@ define(['layoutManager', 'loading', 'events', 'libraryBrowser', 'imageLoader', '
 
                 window.scrollTo(0, 0);
                 updateFilterControls(page);
-                var html;
-                var pagingHtml = libraryBrowser.getQueryPagingHtml({
+                let html;
+                const pagingHtml = libraryBrowser.getQueryPagingHtml({
                     startIndex: query.StartIndex,
                     limit: query.Limit,
                     totalRecordCount: result.TotalRecordCount,
@@ -99,7 +110,7 @@ define(['layoutManager', 'loading', 'events', 'libraryBrowser', 'imageLoader', '
                     sortButton: false,
                     filterButton: false
                 });
-                var viewStyle = self.getCurrentViewStyle();
+                const viewStyle = self.getCurrentViewStyle();
                 if (viewStyle == 'Thumb') {
                     html = cardBuilder.getCardsHtml({
                         items: result.Items,
@@ -156,49 +167,48 @@ define(['layoutManager', 'loading', 'events', 'libraryBrowser', 'imageLoader', '
                         showYear: true
                     });
                 }
-                var i;
-                var length;
-                var elems = tabContent.querySelectorAll('.paging');
 
-                for (i = 0, length = elems.length; i < length; i++) {
+                let elems = tabContent.querySelectorAll('.paging');
+
+                for (let i = 0, length = elems.length; i < length; i++) {
                     elems[i].innerHTML = pagingHtml;
                 }
 
                 elems = tabContent.querySelectorAll('.btnNextPage');
-                for (i = 0, length = elems.length; i < length; i++) {
+                for (let i = 0, length = elems.length; i < length; i++) {
                     elems[i].addEventListener('click', onNextPageClick);
                 }
 
                 elems = tabContent.querySelectorAll('.btnPreviousPage');
-                for (i = 0, length = elems.length; i < length; i++) {
+                for (let i = 0, length = elems.length; i < length; i++) {
                     elems[i].addEventListener('click', onPreviousPageClick);
                 }
 
-                var itemsContainer = tabContent.querySelector('.itemsContainer');
+                const itemsContainer = tabContent.querySelector('.itemsContainer');
                 itemsContainer.innerHTML = html;
                 imageLoader.lazyChildren(itemsContainer);
                 libraryBrowser.saveQueryValues(getSavedQueryKey(page), query);
                 loading.hide();
                 isLoading = false;
 
-                require(['autoFocuser'], function (autoFocuser) {
+                import('autoFocuser').then(({default: autoFocuser}) => {
                     autoFocuser.autoFocus(page);
                 });
             });
         }
 
         function updateFilterControls(tabContent) {
-            var query = getQuery(tabContent);
+            const query = getQuery(tabContent);
             self.alphaPicker.value(query.NameStartsWithOrGreater);
         }
 
-        var self = this;
-        var data = {};
-        var isLoading = false;
+        const self = this;
+        const data = {};
+        let isLoading = false;
 
         self.showFilterMenu = function () {
-            require(['components/filterdialog/filterdialog'], function (filterDialogFactory) {
-                var filterDialog = new filterDialogFactory({
+            import('components/filterdialog/filterdialog').then(({default: filterDialogFactory}) => {
+                const filterDialog = new filterDialogFactory({
                     query: getQuery(tabContent),
                     mode: 'series',
                     serverId: ApiClient.serverId()
@@ -216,17 +226,17 @@ define(['layoutManager', 'loading', 'events', 'libraryBrowser', 'imageLoader', '
         };
 
         function initPage(tabContent) {
-            var alphaPickerElement = tabContent.querySelector('.alphaPicker');
-            var itemsContainer = tabContent.querySelector('.itemsContainer');
+            const alphaPickerElement = tabContent.querySelector('.alphaPicker');
+            const itemsContainer = tabContent.querySelector('.itemsContainer');
 
             alphaPickerElement.addEventListener('alphavaluechanged', function (e) {
-                var newValue = e.detail.value;
-                var query = getQuery(tabContent);
+                const newValue = e.detail.value;
+                const query = getQuery(tabContent);
                 query.NameStartsWithOrGreater = newValue;
                 query.StartIndex = 0;
                 reloadItems(tabContent);
             });
-            self.alphaPicker = new alphaPicker({
+            self.alphaPicker = new AlphaPicker({
                 element: alphaPickerElement,
                 valueChangeEvent: 'click'
             });
@@ -267,12 +277,12 @@ define(['layoutManager', 'loading', 'events', 'libraryBrowser', 'imageLoader', '
                     button: e.target
                 });
             });
-            var btnSelectView = tabContent.querySelector('.btnSelectView');
+            const btnSelectView = tabContent.querySelector('.btnSelectView');
             btnSelectView.addEventListener('click', function (e) {
                 libraryBrowser.showLayoutMenu(e.target, self.getCurrentViewStyle(), 'Banner,List,Poster,PosterCard,Thumb,ThumbCard'.split(','));
             });
             btnSelectView.addEventListener('layoutchange', function (e) {
-                var viewStyle = e.detail.viewStyle;
+                const viewStyle = e.detail.viewStyle;
                 getPageData(tabContent).view = viewStyle;
                 libraryBrowser.saveViewSetting(getSavedQueryKey(tabContent), viewStyle);
                 getQuery(tabContent).StartIndex = 0;
@@ -290,5 +300,6 @@ define(['layoutManager', 'loading', 'events', 'libraryBrowser', 'imageLoader', '
         };
 
         self.destroy = function () {};
-    };
-});
+    }
+
+/* eslint-enable indent */
diff --git a/src/controllers/shows/tvstudios.js b/src/controllers/shows/tvstudios.js
index 1051bfa10b..ba7fdfaf78 100644
--- a/src/controllers/shows/tvstudios.js
+++ b/src/controllers/shows/tvstudios.js
@@ -1,9 +1,13 @@
-define(['loading', 'libraryBrowser', 'cardBuilder', 'apphost'], function (loading, libraryBrowser, cardBuilder, appHost) {
-    'use strict';
+import loading from 'loading';
+import libraryBrowser from 'libraryBrowser';
+import cardBuilder from 'cardBuilder';
+import appHost from 'apphost';
+
+/* eslint-disable indent */
 
     function getQuery(params) {
-        var key = getSavedQueryKey();
-        var pageData = data[key];
+        const key = getSavedQueryKey();
+        let pageData = data[key];
 
         if (!pageData) {
             pageData = data[key] = {
@@ -27,14 +31,14 @@ define(['loading', 'libraryBrowser', 'cardBuilder', 'apphost'], function (loadin
     }
 
     function getPromise(context, params) {
-        var query = getQuery(params);
+        const query = getQuery(params);
         loading.show();
         return ApiClient.getStudios(ApiClient.getCurrentUserId(), query);
     }
 
     function reloadItems(context, params, promise) {
         promise.then(function (result) {
-            var elem = context.querySelector('#items');
+            const elem = context.querySelector('#items');
             cardBuilder.buildCards(result.Items, {
                 itemsContainer: elem,
                 shape: 'backdrop',
@@ -47,16 +51,17 @@ define(['loading', 'libraryBrowser', 'cardBuilder', 'apphost'], function (loadin
             });
             loading.hide();
 
-            require(['autoFocuser'], function (autoFocuser) {
+            import('autoFocuser').then(({default: autoFocuser}) => {
                 autoFocuser.autoFocus(context);
             });
         });
     }
 
-    var data = {};
-    return function (view, params, tabContent) {
-        var promise;
-        var self = this;
+    const data = {};
+
+    export default function (view, params, tabContent) {
+        let promise;
+        const self = this;
 
         self.preRender = function () {
             promise = getPromise(view, params);
@@ -65,5 +70,6 @@ define(['loading', 'libraryBrowser', 'cardBuilder', 'apphost'], function (loadin
         self.renderTab = function () {
             reloadItems(tabContent, params, promise);
         };
-    };
-});
+    }
+
+/* eslint-enable indent */
diff --git a/src/controllers/shows/tvupcoming.js b/src/controllers/shows/tvupcoming.js
index d57a5ae3cd..a2016279b8 100644
--- a/src/controllers/shows/tvupcoming.js
+++ b/src/controllers/shows/tvupcoming.js
@@ -1,9 +1,19 @@
-define(['layoutManager', 'loading', 'datetime', 'libraryBrowser', 'cardBuilder', 'apphost', 'imageLoader', 'globalize', 'scrollStyles', 'emby-itemscontainer'], function (layoutManager, loading, datetime, libraryBrowser, cardBuilder, appHost, imageLoader, globalize) {
-    'use strict';
+import layoutManager from 'layoutManager';
+import loading from 'loading';
+import datetime from 'datetime';
+import libraryBrowser from 'libraryBrowser';
+import cardBuilder from 'cardBuilder';
+import appHost from 'apphost';
+import imageLoader from 'imageLoader';
+import globalize from 'globalize';
+import 'scrollStyles';
+import 'emby-itemscontainer';
+
+/* eslint-disable indent */
 
     function getUpcomingPromise(context, params) {
         loading.show();
-        var query = {
+        const query = {
             Limit: 48,
             Fields: 'AirTime,UserData',
             UserId: ApiClient.getCurrentUserId(),
@@ -17,7 +27,7 @@ define(['layoutManager', 'loading', 'datetime', 'libraryBrowser', 'cardBuilder',
 
     function loadUpcoming(context, params, promise) {
         promise.then(function (result) {
-            var items = result.Items;
+            const items = result.Items;
 
             if (items.length) {
                 context.querySelector('.noItemsMessage').style.display = 'none';
@@ -39,19 +49,17 @@ define(['layoutManager', 'loading', 'datetime', 'libraryBrowser', 'cardBuilder',
     }
 
     function renderUpcoming(elem, items) {
-        var i;
-        var length;
-        var groups = [];
-        var currentGroupName = '';
-        var currentGroup = [];
+        const groups = [];
+        let currentGroupName = '';
+        let currentGroup = [];
 
-        for (i = 0, length = items.length; i < length; i++) {
-            var item = items[i];
-            var dateText = '';
+        for (let i = 0, length = items.length; i < length; i++) {
+            const item = items[i];
+            let dateText = '';
 
             if (item.PremiereDate) {
                 try {
-                    var premiereDate = datetime.parseISO8601Date(item.PremiereDate, true);
+                    const premiereDate = datetime.parseISO8601Date(item.PremiereDate, true);
                     dateText = datetime.isRelativeDay(premiereDate, -1) ? globalize.translate('Yesterday') : datetime.toLocaleDateString(premiereDate, {
                         weekday: 'long',
                         month: 'short',
@@ -77,17 +85,17 @@ define(['layoutManager', 'loading', 'datetime', 'libraryBrowser', 'cardBuilder',
             }
         }
 
-        var html = '';
+        let html = '';
 
-        for (i = 0, length = groups.length; i < length; i++) {
-            var group = groups[i];
+        for (let i = 0, length = groups.length; i < length; i++) {
+            const group = groups[i];
             html += '<div class="verticalSection">';
             html += '<h2 class="sectionTitle sectionTitle-cards padded-left">' + group.name + '</h2>';
-            var allowBottomPadding = true;
+            let allowBottomPadding = true;
 
             if (enableScrollX()) {
                 allowBottomPadding = false;
-                var scrollXClass = 'scrollX hiddenScrollX';
+                let scrollXClass = 'scrollX hiddenScrollX';
 
                 if (layoutManager.tv) {
                     scrollXClass += ' smoothScrollX';
@@ -98,7 +106,7 @@ define(['layoutManager', 'loading', 'datetime', 'libraryBrowser', 'cardBuilder',
                 html += '<div is="emby-itemscontainer" class="itemsContainer vertical-wrap padded-left padded-right">';
             }
 
-            var supportsImageAnalysis = appHost.supports('imageanalysis');
+            let supportsImageAnalysis = appHost.supports('imageanalysis');
             supportsImageAnalysis = false;
             html += cardBuilder.getCardsHtml({
                 items: group.items,
@@ -124,9 +132,9 @@ define(['layoutManager', 'loading', 'datetime', 'libraryBrowser', 'cardBuilder',
         imageLoader.lazyChildren(elem);
     }
 
-    return function (view, params, tabContent) {
-        var upcomingPromise;
-        var self = this;
+    export default function (view, params, tabContent) {
+        let upcomingPromise;
+        const self = this;
 
         self.preRender = function () {
             upcomingPromise = getUpcomingPromise(view, params);
@@ -135,5 +143,6 @@ define(['layoutManager', 'loading', 'datetime', 'libraryBrowser', 'cardBuilder',
         self.renderTab = function () {
             loadUpcoming(tabContent, params, upcomingPromise);
         };
-    };
-});
+    }
+
+/* eslint-enable indent */
diff --git a/src/mypreferencesdisplay.html b/src/controllers/user/display/index.html
similarity index 100%
rename from src/mypreferencesdisplay.html
rename to src/controllers/user/display/index.html
diff --git a/src/controllers/user/display.js b/src/controllers/user/display/index.js
similarity index 58%
rename from src/controllers/user/display.js
rename to src/controllers/user/display/index.js
index 3aeb7db8ce..a400c50ccf 100644
--- a/src/controllers/user/display.js
+++ b/src/controllers/user/display/index.js
@@ -1,17 +1,23 @@
-define(['displaySettings', 'userSettings', 'autoFocuser'], function (DisplaySettings, userSettings, autoFocuser) {
-    'use strict';
+import DisplaySettings from 'displaySettings';
+import * as userSettings from 'userSettings';
+import autoFocuser from 'autoFocuser';
 
-    return function (view, params) {
+/* eslint-disable indent */
+
+    // Shortcuts
+    const UserSettings = userSettings.UserSettings;
+
+    export default function (view, params) {
         function onBeforeUnload(e) {
             if (hasChanges) {
                 e.returnValue = 'You currently have unsaved changes. Are you sure you wish to leave?';
             }
         }
 
-        var settingsInstance;
-        var hasChanges;
-        var userId = params.userId || ApiClient.getCurrentUserId();
-        var currentSettings = userId === ApiClient.getCurrentUserId() ? userSettings : new userSettings();
+        let settingsInstance;
+        let hasChanges;
+        const userId = params.userId || ApiClient.getCurrentUserId();
+        const currentSettings = userId === ApiClient.getCurrentUserId() ? userSettings : new UserSettings();
         view.addEventListener('viewshow', function () {
             window.addEventListener('beforeunload', onBeforeUnload);
 
@@ -23,28 +29,23 @@ define(['displaySettings', 'userSettings', 'autoFocuser'], function (DisplaySett
                     userId: userId,
                     element: view.querySelector('.settingsContainer'),
                     userSettings: currentSettings,
-                    enableSaveButton: false,
-                    enableSaveConfirmation: false,
+                    enableSaveButton: true,
+                    enableSaveConfirmation: true,
                     autoFocus: autoFocuser.isEnabled()
                 });
             }
         });
+
         view.addEventListener('change', function () {
             hasChanges = true;
         });
-        view.addEventListener('viewbeforehide', function () {
-            window.removeEventListener('beforeunload', onBeforeUnload);
-            hasChanges = false;
 
-            if (settingsInstance) {
-                settingsInstance.submit();
-            }
-        });
         view.addEventListener('viewdestroy', function () {
             if (settingsInstance) {
                 settingsInstance.destroy();
                 settingsInstance = null;
             }
         });
-    };
-});
+    }
+
+/* eslint-enable indent */
diff --git a/src/mypreferenceshome.html b/src/controllers/user/home/index.html
similarity index 100%
rename from src/mypreferenceshome.html
rename to src/controllers/user/home/index.html
diff --git a/src/controllers/user/home.js b/src/controllers/user/home/index.js
similarity index 58%
rename from src/controllers/user/home.js
rename to src/controllers/user/home/index.js
index aa7d147c31..e7058fd3ac 100644
--- a/src/controllers/user/home.js
+++ b/src/controllers/user/home/index.js
@@ -1,17 +1,27 @@
-define(['homescreenSettings', 'dom', 'globalize', 'loading', 'userSettings', 'autoFocuser', 'listViewStyle'], function (HomescreenSettings, dom, globalize, loading, userSettings, autoFocuser) {
-    'use strict';
+import HomescreenSettings from 'homescreenSettings';
+import dom from 'dom';
+import globalize from 'globalize';
+import loading from 'loading';
+import * as userSettings from 'userSettings';
+import autoFocuser from 'autoFocuser';
+import 'listViewStyle';
 
-    return function (view, params) {
+/* eslint-disable indent */
+
+    // Shortcuts
+    const UserSettings = userSettings.UserSettings;
+
+    export default function (view, params) {
         function onBeforeUnload(e) {
             if (hasChanges) {
                 e.returnValue = 'You currently have unsaved changes. Are you sure you wish to leave?';
             }
         }
 
-        var homescreenSettingsInstance;
-        var hasChanges;
-        var userId = params.userId || ApiClient.getCurrentUserId();
-        var currentSettings = userId === ApiClient.getCurrentUserId() ? userSettings : new userSettings();
+        let homescreenSettingsInstance;
+        let hasChanges;
+        const userId = params.userId || ApiClient.getCurrentUserId();
+        const currentSettings = userId === ApiClient.getCurrentUserId() ? userSettings : new UserSettings();
         view.addEventListener('viewshow', function () {
             window.addEventListener('beforeunload', onBeforeUnload);
 
@@ -23,27 +33,23 @@ define(['homescreenSettings', 'dom', 'globalize', 'loading', 'userSettings', 'au
                     userId: userId,
                     element: view.querySelector('.homeScreenSettingsContainer'),
                     userSettings: currentSettings,
-                    enableSaveButton: false,
-                    enableSaveConfirmation: false,
+                    enableSaveButton: true,
+                    enableSaveConfirmation: true,
                     autoFocus: autoFocuser.isEnabled()
                 });
             }
         });
+
         view.addEventListener('change', function () {
             hasChanges = true;
         });
-        view.addEventListener('viewbeforehide', function () {
-            hasChanges = false;
 
-            if (homescreenSettingsInstance) {
-                homescreenSettingsInstance.submit();
-            }
-        });
         view.addEventListener('viewdestroy', function () {
             if (homescreenSettingsInstance) {
                 homescreenSettingsInstance.destroy();
                 homescreenSettingsInstance = null;
             }
         });
-    };
-});
+    }
+
+/* eslint-enable indent */
diff --git a/src/controllers/user/menu.js b/src/controllers/user/menu.js
deleted file mode 100644
index 061f936eca..0000000000
--- a/src/controllers/user/menu.js
+++ /dev/null
@@ -1,65 +0,0 @@
-define(['apphost', 'connectionManager', 'layoutManager', 'listViewStyle', 'emby-button'], function(appHost, connectionManager, layoutManager) {
-    'use strict';
-
-    return function(view, params) {
-        view.querySelector('.btnLogout').addEventListener('click', function() {
-            Dashboard.logout();
-        });
-
-        view.querySelector('.selectServer').addEventListener('click', function () {
-            Dashboard.selectServer();
-        });
-
-        view.querySelector('.clientSettings').addEventListener('click', function () {
-            window.NativeShell.openClientSettings();
-        });
-
-        view.addEventListener('viewshow', function() {
-            // this page can also be used by admins to change user preferences from the user edit page
-            var userId = params.userId || Dashboard.getCurrentUserId();
-            var page = this;
-
-            page.querySelector('.lnkMyProfile').setAttribute('href', 'myprofile.html?userId=' + userId);
-            page.querySelector('.lnkDisplayPreferences').setAttribute('href', 'mypreferencesdisplay.html?userId=' + userId);
-            page.querySelector('.lnkHomePreferences').setAttribute('href', 'mypreferenceshome.html?userId=' + userId);
-            page.querySelector('.lnkPlaybackPreferences').setAttribute('href', 'mypreferencesplayback.html?userId=' + userId);
-            page.querySelector('.lnkSubtitlePreferences').setAttribute('href', 'mypreferencessubtitles.html?userId=' + userId);
-            page.querySelector('.lnkQuickConnectPreferences').setAttribute('href', 'myPreferencesQuickConnect.html?userId=' + userId);
-
-            if (window.NativeShell && window.NativeShell.AppHost.supports('clientsettings')) {
-                page.querySelector('.clientSettings').classList.remove('hide');
-            } else {
-                page.querySelector('.clientSettings').classList.add('hide');
-            }
-
-            if (appHost.supports('multiserver')) {
-                page.querySelector('.selectServer').classList.remove('hide');
-            } else {
-                page.querySelector('.selectServer').classList.add('hide');
-            }
-
-            // hide the actions if user preferences are being edited for a different user
-            if (params.userId && params.userId !== Dashboard.getCurrentUserId) {
-                page.querySelector('.userSection').classList.add('hide');
-                page.querySelector('.adminSection').classList.add('hide');
-            }
-
-            if (layoutManager.mobile) {
-                page.querySelector('.headerUsername').classList.add('hide');
-                page.querySelector('.adminSection').classList.add('hide');
-                page.querySelector('.userSection').classList.add('hide');
-            }
-
-            ApiClient.getUser(userId).then(function(user) {
-                page.querySelector('.headerUsername').innerHTML = user.Name;
-                if (!user.Policy.IsAdministrator) {
-                    page.querySelector('.adminSection').classList.add('hide');
-                }
-            });
-
-            require(['autoFocuser'], function (autoFocuser) {
-                autoFocuser.autoFocus(view);
-            });
-        });
-    };
-});
diff --git a/src/mypreferencesmenu.html b/src/controllers/user/menu/index.html
similarity index 100%
rename from src/mypreferencesmenu.html
rename to src/controllers/user/menu/index.html
diff --git a/src/controllers/user/menu/index.js b/src/controllers/user/menu/index.js
new file mode 100644
index 0000000000..73e7012f19
--- /dev/null
+++ b/src/controllers/user/menu/index.js
@@ -0,0 +1,61 @@
+import appHost from 'apphost';
+import connectionManager from 'connectionManager';
+import layoutManager from 'layoutManager';
+import 'listViewStyle';
+import 'emby-button';
+
+export default function (view, params) {
+    view.querySelector('.btnLogout').addEventListener('click', function () {
+        Dashboard.logout();
+    });
+
+    view.querySelector('.selectServer').addEventListener('click', function () {
+        Dashboard.selectServer();
+    });
+
+    view.querySelector('.clientSettings').addEventListener('click', function () {
+        window.NativeShell.openClientSettings();
+    });
+
+    view.addEventListener('viewshow', function () {
+        // this page can also be used by admins to change user preferences from the user edit page
+        const userId = params.userId || Dashboard.getCurrentUserId();
+        const page = this;
+
+        page.querySelector('.lnkMyProfile').setAttribute('href', 'myprofile.html?userId=' + userId);
+        page.querySelector('.lnkDisplayPreferences').setAttribute('href', 'mypreferencesdisplay.html?userId=' + userId);
+        page.querySelector('.lnkHomePreferences').setAttribute('href', 'mypreferenceshome.html?userId=' + userId);
+        page.querySelector('.lnkPlaybackPreferences').setAttribute('href', 'mypreferencesplayback.html?userId=' + userId);
+        page.querySelector('.lnkSubtitlePreferences').setAttribute('href', 'mypreferencessubtitles.html?userId=' + userId);
+        page.querySelector('.lnkQuickConnectPreferences').setAttribute('href', 'myPreferencesQuickConnect.html?userId=' + userId);
+
+        if (window.NativeShell && window.NativeShell.AppHost.supports('clientsettings')) {
+            page.querySelector('.clientSettings').classList.remove('hide');
+        } else {
+            page.querySelector('.clientSettings').classList.add('hide');
+        }
+
+        if (appHost.supports('multiserver')) {
+            page.querySelector('.selectServer').classList.remove('hide');
+        } else {
+            page.querySelector('.selectServer').classList.add('hide');
+        }
+
+        // hide the actions if user preferences are being edited for a different user
+        if (params.userId && params.userId !== Dashboard.getCurrentUserId) {
+            page.querySelector('.userSection').classList.add('hide');
+            page.querySelector('.adminSection').classList.add('hide');
+        }
+
+        ApiClient.getUser(userId).then(function (user) {
+            page.querySelector('.headerUsername').innerHTML = user.Name;
+            if (!user.Policy.IsAdministrator) {
+                page.querySelector('.adminSection').classList.add('hide');
+            }
+        });
+
+        import('autoFocuser').then(({default: autoFocuser}) => {
+            autoFocuser.autoFocus(view);
+        });
+    });
+}
diff --git a/src/mypreferencesplayback.html b/src/controllers/user/playback/index.html
similarity index 100%
rename from src/mypreferencesplayback.html
rename to src/controllers/user/playback/index.html
diff --git a/src/controllers/user/playback.js b/src/controllers/user/playback/index.js
similarity index 58%
rename from src/controllers/user/playback.js
rename to src/controllers/user/playback/index.js
index e945a46aab..5bcf055cd3 100644
--- a/src/controllers/user/playback.js
+++ b/src/controllers/user/playback/index.js
@@ -1,17 +1,27 @@
-define(['playbackSettings', 'dom', 'globalize', 'loading', 'userSettings', 'autoFocuser', 'listViewStyle'], function (PlaybackSettings, dom, globalize, loading, userSettings, autoFocuser) {
-    'use strict';
+import PlaybackSettings from 'playbackSettings';
+import dom from 'dom';
+import globalize from 'globalize';
+import loading from 'loading';
+import * as userSettings from 'userSettings';
+import autoFocuser from 'autoFocuser';
+import 'listViewStyle';
 
-    return function (view, params) {
+/* eslint-disable indent */
+
+    // Shortcuts
+    const UserSettings = userSettings.UserSettings;
+
+    export default function (view, params) {
         function onBeforeUnload(e) {
             if (hasChanges) {
                 e.returnValue = 'You currently have unsaved changes. Are you sure you wish to leave?';
             }
         }
 
-        var settingsInstance;
-        var hasChanges;
-        var userId = params.userId || ApiClient.getCurrentUserId();
-        var currentSettings = userId === ApiClient.getCurrentUserId() ? userSettings : new userSettings();
+        let settingsInstance;
+        let hasChanges;
+        const userId = params.userId || ApiClient.getCurrentUserId();
+        const currentSettings = userId === ApiClient.getCurrentUserId() ? userSettings : new UserSettings();
         view.addEventListener('viewshow', function () {
             window.addEventListener('beforeunload', onBeforeUnload);
 
@@ -23,27 +33,23 @@ define(['playbackSettings', 'dom', 'globalize', 'loading', 'userSettings', 'auto
                     userId: userId,
                     element: view.querySelector('.settingsContainer'),
                     userSettings: currentSettings,
-                    enableSaveButton: false,
-                    enableSaveConfirmation: false,
+                    enableSaveButton: true,
+                    enableSaveConfirmation: true,
                     autoFocus: autoFocuser.isEnabled()
                 });
             }
         });
+
         view.addEventListener('change', function () {
             hasChanges = true;
         });
-        view.addEventListener('viewbeforehide', function () {
-            hasChanges = false;
 
-            if (settingsInstance) {
-                settingsInstance.submit();
-            }
-        });
         view.addEventListener('viewdestroy', function () {
             if (settingsInstance) {
                 settingsInstance.destroy();
                 settingsInstance = null;
             }
         });
-    };
-});
+    }
+
+/* eslint-enable indent */
diff --git a/src/controllers/user/profile.js b/src/controllers/user/profile.js
deleted file mode 100644
index fd7d1e32cc..0000000000
--- a/src/controllers/user/profile.js
+++ /dev/null
@@ -1,106 +0,0 @@
-define(['controllers/dashboard/users/userpasswordpage', 'loading', 'libraryMenu', 'apphost', 'globalize', 'emby-button'], function (UserPasswordPage, loading, libraryMenu, appHost, globalize) {
-    'use strict';
-
-    function reloadUser(page) {
-        var userId = getParameterByName('userId');
-        loading.show();
-        ApiClient.getUser(userId).then(function (user) {
-            page.querySelector('.username').innerHTML = user.Name;
-            libraryMenu.setTitle(user.Name);
-
-            var imageUrl = 'assets/img/avatar.png';
-            if (user.PrimaryImageTag) {
-                imageUrl = ApiClient.getUserImageUrl(user.Id, {
-                    tag: user.PrimaryImageTag,
-                    type: 'Primary'
-                });
-            }
-
-            var userImage = page.querySelector('#image');
-            userImage.style.backgroundImage = 'url(' + imageUrl + ')';
-
-            Dashboard.getCurrentUser().then(function (loggedInUser) {
-                if (user.PrimaryImageTag) {
-                    page.querySelector('#btnAddImage').classList.add('hide');
-                    page.querySelector('#btnDeleteImage').classList.remove('hide');
-                } else if (appHost.supports('fileinput') && (loggedInUser.Policy.IsAdministrator || user.Policy.EnableUserPreferenceAccess)) {
-                    page.querySelector('#btnDeleteImage').classList.add('hide');
-                    page.querySelector('#btnAddImage').classList.remove('hide');
-                }
-            });
-            loading.hide();
-        });
-    }
-
-    function onFileReaderError(evt) {
-        loading.hide();
-        switch (evt.target.error.code) {
-            case evt.target.error.NOT_FOUND_ERR:
-                require(['toast'], function (toast) {
-                    toast(globalize.translate('FileNotFound'));
-                });
-                break;
-            case evt.target.error.ABORT_ERR:
-                onFileReaderAbort();
-                break;
-            case evt.target.error.NOT_READABLE_ERR:
-            default:
-                require(['toast'], function (toast) {
-                    toast(globalize.translate('FileReadError'));
-                });
-        }
-    }
-
-    function onFileReaderAbort(evt) {
-        loading.hide();
-        require(['toast'], function (toast) {
-            toast(globalize.translate('FileReadCancelled'));
-        });
-    }
-
-    function setFiles(page, files) {
-        var userImage = page.querySelector('#image');
-        var file = files[0];
-
-        if (!file || !file.type.match('image.*')) {
-            return false;
-        }
-
-        var reader = new FileReader();
-        reader.onerror = onFileReaderError;
-        reader.onabort = onFileReaderAbort;
-        reader.onload = function (evt) {
-            userImage.style.backgroundImage = 'url(' + evt.target.result + ')';
-            var userId = getParameterByName('userId');
-            ApiClient.uploadUserImage(userId, 'Primary', file).then(function () {
-                loading.hide();
-                reloadUser(page);
-            });
-        };
-
-        reader.readAsDataURL(file);
-    }
-
-    return function (view, params) {
-        reloadUser(view);
-        new UserPasswordPage(view, params);
-        view.querySelector('#btnDeleteImage').addEventListener('click', function () {
-            require(['confirm'], function (confirm) {
-                confirm(globalize.translate('DeleteImageConfirmation'), globalize.translate('DeleteImage')).then(function () {
-                    loading.show();
-                    var userId = getParameterByName('userId');
-                    ApiClient.deleteUserImage(userId, 'primary').then(function () {
-                        loading.hide();
-                        reloadUser(view);
-                    });
-                });
-            });
-        });
-        view.querySelector('#btnAddImage').addEventListener('click', function (evt) {
-            view.querySelector('#uploadImage').click();
-        });
-        view.querySelector('#uploadImage').addEventListener('change', function (evt) {
-            setFiles(view, evt.target.files);
-        });
-    };
-});
diff --git a/src/myprofile.html b/src/controllers/user/profile/index.html
similarity index 100%
rename from src/myprofile.html
rename to src/controllers/user/profile/index.html
diff --git a/src/controllers/user/profile/index.js b/src/controllers/user/profile/index.js
new file mode 100644
index 0000000000..631253d019
--- /dev/null
+++ b/src/controllers/user/profile/index.js
@@ -0,0 +1,109 @@
+import UserPasswordPage from 'controllers/dashboard/users/userpasswordpage';
+import loading from 'loading';
+import libraryMenu from 'libraryMenu';
+import appHost from 'apphost';
+import globalize from 'globalize';
+import 'emby-button';
+
+function reloadUser(page) {
+    const userId = getParameterByName('userId');
+    loading.show();
+    ApiClient.getUser(userId).then(function (user) {
+        page.querySelector('.username').innerHTML = user.Name;
+        libraryMenu.setTitle(user.Name);
+
+        let imageUrl = 'assets/img/avatar.png';
+        if (user.PrimaryImageTag) {
+            imageUrl = ApiClient.getUserImageUrl(user.Id, {
+                tag: user.PrimaryImageTag,
+                type: 'Primary'
+            });
+        }
+
+        const userImage = page.querySelector('#image');
+        userImage.style.backgroundImage = 'url(' + imageUrl + ')';
+
+        Dashboard.getCurrentUser().then(function (loggedInUser) {
+            if (user.PrimaryImageTag) {
+                page.querySelector('#btnAddImage').classList.add('hide');
+                page.querySelector('#btnDeleteImage').classList.remove('hide');
+            } else if (appHost.supports('fileinput') && (loggedInUser.Policy.IsAdministrator || user.Policy.EnableUserPreferenceAccess)) {
+                page.querySelector('#btnDeleteImage').classList.add('hide');
+                page.querySelector('#btnAddImage').classList.remove('hide');
+            }
+        });
+        loading.hide();
+    });
+}
+
+function onFileReaderError(evt) {
+    loading.hide();
+    switch (evt.target.error.code) {
+        case evt.target.error.NOT_FOUND_ERR:
+            import('toast').then(({default: toast}) => {
+                toast(globalize.translate('FileNotFound'));
+            });
+            break;
+        case evt.target.error.ABORT_ERR:
+            onFileReaderAbort();
+            break;
+        case evt.target.error.NOT_READABLE_ERR:
+        default:
+            import('toast').then(({default: toast}) => {
+                toast(globalize.translate('FileReadError'));
+            });
+    }
+}
+
+function onFileReaderAbort(evt) {
+    loading.hide();
+    import('toast').then(({default: toast}) => {
+        toast(globalize.translate('FileReadCancelled'));
+    });
+}
+
+function setFiles(page, files) {
+    const userImage = page.querySelector('#image');
+    const file = files[0];
+
+    if (!file || !file.type.match('image.*')) {
+        return false;
+    }
+
+    const reader = new FileReader();
+    reader.onerror = onFileReaderError;
+    reader.onabort = onFileReaderAbort;
+    reader.onload = function (evt) {
+        userImage.style.backgroundImage = 'url(' + evt.target.result + ')';
+        const userId = getParameterByName('userId');
+        ApiClient.uploadUserImage(userId, 'Primary', file).then(function () {
+            loading.hide();
+            reloadUser(page);
+        });
+    };
+
+    reader.readAsDataURL(file);
+}
+
+export default function (view, params) {
+    reloadUser(view);
+    new UserPasswordPage(view, params);
+    view.querySelector('#btnDeleteImage').addEventListener('click', function () {
+        import('confirm').then(({default: confirm}) => {
+            confirm(globalize.translate('DeleteImageConfirmation'), globalize.translate('DeleteImage')).then(function () {
+                loading.show();
+                const userId = getParameterByName('userId');
+                ApiClient.deleteUserImage(userId, 'primary').then(function () {
+                    loading.hide();
+                    reloadUser(view);
+                });
+            });
+        });
+    });
+    view.querySelector('#btnAddImage').addEventListener('click', function (evt) {
+        view.querySelector('#uploadImage').click();
+    });
+    view.querySelector('#uploadImage').addEventListener('change', function (evt) {
+        setFiles(view, evt.target.files);
+    });
+}
diff --git a/src/mypreferencessubtitles.html b/src/controllers/user/subtitles/index.html
similarity index 100%
rename from src/mypreferencessubtitles.html
rename to src/controllers/user/subtitles/index.html
diff --git a/src/controllers/user/subtitles.js b/src/controllers/user/subtitles/index.js
similarity index 61%
rename from src/controllers/user/subtitles.js
rename to src/controllers/user/subtitles/index.js
index 152301f31a..82f5270a4e 100644
--- a/src/controllers/user/subtitles.js
+++ b/src/controllers/user/subtitles/index.js
@@ -1,17 +1,23 @@
-define(['subtitleSettings', 'userSettings', 'autoFocuser'], function (SubtitleSettings, userSettings, autoFocuser) {
-    'use strict';
+import SubtitleSettings from 'subtitleSettings';
+import * as userSettings from 'userSettings';
+import autoFocuser from 'autoFocuser';
 
-    return function (view, params) {
+/* eslint-disable indent */
+
+    // Shortcuts
+    const UserSettings = userSettings.UserSettings;
+
+    export default function (view, params) {
         function onBeforeUnload(e) {
             if (hasChanges) {
                 e.returnValue = 'You currently have unsaved changes. Are you sure you wish to leave?';
             }
         }
 
-        var subtitleSettingsInstance;
-        var hasChanges;
-        var userId = params.userId || ApiClient.getCurrentUserId();
-        var currentSettings = userId === ApiClient.getCurrentUserId() ? userSettings : new userSettings();
+        let subtitleSettingsInstance;
+        let hasChanges;
+        const userId = params.userId || ApiClient.getCurrentUserId();
+        const currentSettings = userId === ApiClient.getCurrentUserId() ? userSettings : new UserSettings();
         view.addEventListener('viewshow', function () {
             window.addEventListener('beforeunload', onBeforeUnload);
 
@@ -23,27 +29,23 @@ define(['subtitleSettings', 'userSettings', 'autoFocuser'], function (SubtitleSe
                     userId: userId,
                     element: view.querySelector('.settingsContainer'),
                     userSettings: currentSettings,
-                    enableSaveButton: false,
-                    enableSaveConfirmation: false,
+                    enableSaveButton: true,
+                    enableSaveConfirmation: true,
                     autoFocus: autoFocuser.isEnabled()
                 });
             }
         });
+
         view.addEventListener('change', function () {
             hasChanges = true;
         });
-        view.addEventListener('viewbeforehide', function () {
-            hasChanges = false;
 
-            if (subtitleSettingsInstance) {
-                subtitleSettingsInstance.submit();
-            }
-        });
         view.addEventListener('viewdestroy', function () {
             if (subtitleSettingsInstance) {
                 subtitleSettingsInstance.destroy();
                 subtitleSettingsInstance = null;
             }
         });
-    };
-});
+    }
+
+/* eslint-enable indent */
diff --git a/src/controllers/wizard/finish.js b/src/controllers/wizard/finish.js
deleted file mode 100644
index c27d9a5f4b..0000000000
--- a/src/controllers/wizard/finish.js
+++ /dev/null
@@ -1,18 +0,0 @@
-define(['loading'], function (loading) {
-    'use strict';
-
-    function onFinish() {
-        loading.show();
-        ApiClient.ajax({
-            url: ApiClient.getUrl('Startup/Complete'),
-            type: 'POST'
-        }).then(function () {
-            loading.hide();
-            window.location.href = 'index.html';
-        });
-    }
-
-    return function (view, params) {
-        view.querySelector('.btnWizardNext').addEventListener('click', onFinish);
-    };
-});
diff --git a/src/wizardfinish.html b/src/controllers/wizard/finish/index.html
similarity index 100%
rename from src/wizardfinish.html
rename to src/controllers/wizard/finish/index.html
diff --git a/src/controllers/wizard/finish/index.js b/src/controllers/wizard/finish/index.js
new file mode 100644
index 0000000000..5451d6665c
--- /dev/null
+++ b/src/controllers/wizard/finish/index.js
@@ -0,0 +1,16 @@
+import loading from 'loading';
+
+function onFinish() {
+    loading.show();
+    ApiClient.ajax({
+        url: ApiClient.getUrl('Startup/Complete'),
+        type: 'POST'
+    }).then(function () {
+        loading.hide();
+        window.location.href = 'index.html';
+    });
+}
+
+export default function (view, params) {
+    view.querySelector('.btnWizardNext').addEventListener('click', onFinish);
+}
diff --git a/src/wizardremoteaccess.html b/src/controllers/wizard/remote/index.html
similarity index 100%
rename from src/wizardremoteaccess.html
rename to src/controllers/wizard/remote/index.html
diff --git a/src/controllers/wizard/remote/index.js b/src/controllers/wizard/remote/index.js
new file mode 100644
index 0000000000..3c482607de
--- /dev/null
+++ b/src/controllers/wizard/remote/index.js
@@ -0,0 +1,40 @@
+import loading from 'loading';
+import 'emby-checkbox';
+import 'emby-button';
+import 'emby-select';
+
+function save(page) {
+    loading.show();
+    const apiClient = ApiClient;
+    const config = {};
+    config.EnableRemoteAccess = page.querySelector('#chkRemoteAccess').checked;
+    config.EnableAutomaticPortMapping = page.querySelector('#chkEnableUpnp').checked;
+    apiClient.ajax({
+        type: 'POST',
+        data: config,
+        url: apiClient.getUrl('Startup/RemoteAccess')
+    }).then(function () {
+        loading.hide();
+        navigateToNextPage();
+    });
+}
+
+function navigateToNextPage() {
+    Dashboard.navigate('wizardfinish.html');
+}
+
+function onSubmit(e) {
+    save(this);
+    e.preventDefault();
+    return false;
+}
+
+export default function (view, params) {
+    view.querySelector('.wizardSettingsForm').addEventListener('submit', onSubmit);
+    view.addEventListener('viewshow', function () {
+        document.querySelector('.skinHeader').classList.add('noHomeButtonHeader');
+    });
+    view.addEventListener('viewhide', function () {
+        document.querySelector('.skinHeader').classList.remove('noHomeButtonHeader');
+    });
+}
diff --git a/src/controllers/wizard/remoteaccess.js b/src/controllers/wizard/remoteaccess.js
deleted file mode 100644
index 400cd357f4..0000000000
--- a/src/controllers/wizard/remoteaccess.js
+++ /dev/null
@@ -1,39 +0,0 @@
-define(['loading', 'emby-checkbox', 'emby-button', 'emby-select'], function (loading) {
-    'use strict';
-
-    function save(page) {
-        loading.show();
-        var apiClient = ApiClient;
-        var config = {};
-        config.EnableRemoteAccess = page.querySelector('#chkRemoteAccess').checked;
-        config.EnableAutomaticPortMapping = page.querySelector('#chkEnableUpnp').checked;
-        apiClient.ajax({
-            type: 'POST',
-            data: config,
-            url: apiClient.getUrl('Startup/RemoteAccess')
-        }).then(function () {
-            loading.hide();
-            navigateToNextPage();
-        });
-    }
-
-    function navigateToNextPage() {
-        Dashboard.navigate('wizardfinish.html');
-    }
-
-    function onSubmit(e) {
-        save(this);
-        e.preventDefault();
-        return false;
-    }
-
-    return function (view, params) {
-        view.querySelector('.wizardSettingsForm').addEventListener('submit', onSubmit);
-        view.addEventListener('viewshow', function () {
-            document.querySelector('.skinHeader').classList.add('noHomeButtonHeader');
-        });
-        view.addEventListener('viewhide', function () {
-            document.querySelector('.skinHeader').classList.remove('noHomeButtonHeader');
-        });
-    };
-});
diff --git a/src/controllers/wizard/settings.js b/src/controllers/wizard/settings.js
deleted file mode 100644
index 2062e795a3..0000000000
--- a/src/controllers/wizard/settings.js
+++ /dev/null
@@ -1,84 +0,0 @@
-define(['loading', 'emby-checkbox', 'emby-button', 'emby-select'], function (loading) {
-    'use strict';
-
-    function save(page) {
-        loading.show();
-        var apiClient = ApiClient;
-        apiClient.getJSON(apiClient.getUrl('Startup/Configuration')).then(function (config) {
-            config.PreferredMetadataLanguage = page.querySelector('#selectLanguage').value;
-            config.MetadataCountryCode = page.querySelector('#selectCountry').value;
-            apiClient.ajax({
-                type: 'POST',
-                data: config,
-                url: apiClient.getUrl('Startup/Configuration')
-            }).then(function () {
-                loading.hide();
-                navigateToNextPage();
-            });
-        });
-    }
-
-    function populateLanguages(select, languages) {
-        var html = '';
-        html += "<option value=''></option>";
-
-        for (var i = 0, length = languages.length; i < length; i++) {
-            var culture = languages[i];
-            html += "<option value='" + culture.TwoLetterISOLanguageName + "'>" + culture.DisplayName + '</option>';
-        }
-
-        select.innerHTML = html;
-    }
-
-    function populateCountries(select, allCountries) {
-        var html = '';
-        html += "<option value=''></option>";
-
-        for (var i = 0, length = allCountries.length; i < length; i++) {
-            var culture = allCountries[i];
-            html += "<option value='" + culture.TwoLetterISORegionName + "'>" + culture.DisplayName + '</option>';
-        }
-
-        select.innerHTML = html;
-    }
-
-    function reloadData(page, config, cultures, countries) {
-        populateLanguages(page.querySelector('#selectLanguage'), cultures);
-        populateCountries(page.querySelector('#selectCountry'), countries);
-        page.querySelector('#selectLanguage').value = config.PreferredMetadataLanguage;
-        page.querySelector('#selectCountry').value = config.MetadataCountryCode;
-        loading.hide();
-    }
-
-    function reload(page) {
-        loading.show();
-        var apiClient = ApiClient;
-        var promise1 = apiClient.getJSON(apiClient.getUrl('Startup/Configuration'));
-        var promise2 = apiClient.getCultures();
-        var promise3 = apiClient.getCountries();
-        Promise.all([promise1, promise2, promise3]).then(function (responses) {
-            reloadData(page, responses[0], responses[1], responses[2]);
-        });
-    }
-
-    function navigateToNextPage() {
-        Dashboard.navigate('wizardremoteaccess.html');
-    }
-
-    function onSubmit(e) {
-        save(this);
-        e.preventDefault();
-        return false;
-    }
-
-    return function (view, params) {
-        view.querySelector('.wizardSettingsForm').addEventListener('submit', onSubmit);
-        view.addEventListener('viewshow', function () {
-            document.querySelector('.skinHeader').classList.add('noHomeButtonHeader');
-            reload(this);
-        });
-        view.addEventListener('viewhide', function () {
-            document.querySelector('.skinHeader').classList.remove('noHomeButtonHeader');
-        });
-    };
-});
diff --git a/src/wizardsettings.html b/src/controllers/wizard/settings/index.html
similarity index 100%
rename from src/wizardsettings.html
rename to src/controllers/wizard/settings/index.html
diff --git a/src/controllers/wizard/settings/index.js b/src/controllers/wizard/settings/index.js
new file mode 100644
index 0000000000..a1c3c11267
--- /dev/null
+++ b/src/controllers/wizard/settings/index.js
@@ -0,0 +1,85 @@
+import loading from 'loading';
+import 'emby-checkbox';
+import 'emby-button';
+import 'emby-select';
+
+function save(page) {
+    loading.show();
+    const apiClient = ApiClient;
+    apiClient.getJSON(apiClient.getUrl('Startup/Configuration')).then(function (config) {
+        config.PreferredMetadataLanguage = page.querySelector('#selectLanguage').value;
+        config.MetadataCountryCode = page.querySelector('#selectCountry').value;
+        apiClient.ajax({
+            type: 'POST',
+            data: config,
+            url: apiClient.getUrl('Startup/Configuration')
+        }).then(function () {
+            loading.hide();
+            navigateToNextPage();
+        });
+    });
+}
+
+function populateLanguages(select, languages) {
+    let html = '';
+    html += "<option value=''></option>";
+
+    for (let i = 0, length = languages.length; i < length; i++) {
+        const culture = languages[i];
+        html += "<option value='" + culture.TwoLetterISOLanguageName + "'>" + culture.DisplayName + '</option>';
+    }
+
+    select.innerHTML = html;
+}
+
+function populateCountries(select, allCountries) {
+    let html = '';
+    html += "<option value=''></option>";
+
+    for (let i = 0, length = allCountries.length; i < length; i++) {
+        const culture = allCountries[i];
+        html += "<option value='" + culture.TwoLetterISORegionName + "'>" + culture.DisplayName + '</option>';
+    }
+
+    select.innerHTML = html;
+}
+
+function reloadData(page, config, cultures, countries) {
+    populateLanguages(page.querySelector('#selectLanguage'), cultures);
+    populateCountries(page.querySelector('#selectCountry'), countries);
+    page.querySelector('#selectLanguage').value = config.PreferredMetadataLanguage;
+    page.querySelector('#selectCountry').value = config.MetadataCountryCode;
+    loading.hide();
+}
+
+function reload(page) {
+    loading.show();
+    const apiClient = ApiClient;
+    const promise1 = apiClient.getJSON(apiClient.getUrl('Startup/Configuration'));
+    const promise2 = apiClient.getCultures();
+    const promise3 = apiClient.getCountries();
+    Promise.all([promise1, promise2, promise3]).then(function (responses) {
+        reloadData(page, responses[0], responses[1], responses[2]);
+    });
+}
+
+function navigateToNextPage() {
+    Dashboard.navigate('wizardremoteaccess.html');
+}
+
+function onSubmit(e) {
+    save(this);
+    e.preventDefault();
+    return false;
+}
+
+export default function (view, params) {
+    view.querySelector('.wizardSettingsForm').addEventListener('submit', onSubmit);
+    view.addEventListener('viewshow', function () {
+        document.querySelector('.skinHeader').classList.add('noHomeButtonHeader');
+        reload(this);
+    });
+    view.addEventListener('viewhide', function () {
+        document.querySelector('.skinHeader').classList.remove('noHomeButtonHeader');
+    });
+}
diff --git a/src/controllers/wizard/start.js b/src/controllers/wizard/start.js
deleted file mode 100644
index b7fb920d45..0000000000
--- a/src/controllers/wizard/start.js
+++ /dev/null
@@ -1,48 +0,0 @@
-define(['jQuery', 'loading', 'emby-button', 'emby-select'], function ($, loading) {
-    'use strict';
-
-    function loadPage(page, config, languageOptions) {
-        $('#selectLocalizationLanguage', page).html(languageOptions.map(function (l) {
-            return '<option value="' + l.Value + '">' + l.Name + '</option>';
-        })).val(config.UICulture);
-        loading.hide();
-    }
-
-    function save(page) {
-        loading.show();
-        var apiClient = ApiClient;
-        apiClient.getJSON(apiClient.getUrl('Startup/Configuration')).then(function (config) {
-            config.UICulture = $('#selectLocalizationLanguage', page).val();
-            apiClient.ajax({
-                type: 'POST',
-                data: config,
-                url: apiClient.getUrl('Startup/Configuration')
-            }).then(function () {
-                Dashboard.navigate('wizarduser.html');
-            });
-        });
-    }
-
-    function onSubmit() {
-        save($(this).parents('.page'));
-        return false;
-    }
-
-    return function (view, params) {
-        $('.wizardStartForm', view).on('submit', onSubmit);
-        view.addEventListener('viewshow', function () {
-            document.querySelector('.skinHeader').classList.add('noHomeButtonHeader');
-            loading.show();
-            var page = this;
-            var apiClient = ApiClient;
-            var promise1 = apiClient.getJSON(apiClient.getUrl('Startup/Configuration'));
-            var promise2 = apiClient.getJSON(apiClient.getUrl('Localization/Options'));
-            Promise.all([promise1, promise2]).then(function (responses) {
-                loadPage(page, responses[0], responses[1]);
-            });
-        });
-        view.addEventListener('viewhide', function () {
-            document.querySelector('.skinHeader').classList.remove('noHomeButtonHeader');
-        });
-    };
-});
diff --git a/src/wizardstart.html b/src/controllers/wizard/start/index.html
similarity index 100%
rename from src/wizardstart.html
rename to src/controllers/wizard/start/index.html
diff --git a/src/controllers/wizard/start/index.js b/src/controllers/wizard/start/index.js
new file mode 100644
index 0000000000..cec93446db
--- /dev/null
+++ b/src/controllers/wizard/start/index.js
@@ -0,0 +1,49 @@
+import $ from 'jQuery';
+import loading from 'loading';
+import 'emby-button';
+import 'emby-select';
+
+function loadPage(page, config, languageOptions) {
+    $('#selectLocalizationLanguage', page).html(languageOptions.map(function (l) {
+        return '<option value="' + l.Value + '">' + l.Name + '</option>';
+    })).val(config.UICulture);
+    loading.hide();
+}
+
+function save(page) {
+    loading.show();
+    const apiClient = ApiClient;
+    apiClient.getJSON(apiClient.getUrl('Startup/Configuration')).then(function (config) {
+        config.UICulture = $('#selectLocalizationLanguage', page).val();
+        apiClient.ajax({
+            type: 'POST',
+            data: config,
+            url: apiClient.getUrl('Startup/Configuration')
+        }).then(function () {
+            Dashboard.navigate('wizarduser.html');
+        });
+    });
+}
+
+function onSubmit() {
+    save($(this).parents('.page'));
+    return false;
+}
+
+export default function (view, params) {
+    $('.wizardStartForm', view).on('submit', onSubmit);
+    view.addEventListener('viewshow', function () {
+        document.querySelector('.skinHeader').classList.add('noHomeButtonHeader');
+        loading.show();
+        const page = this;
+        const apiClient = ApiClient;
+        const promise1 = apiClient.getJSON(apiClient.getUrl('Startup/Configuration'));
+        const promise2 = apiClient.getJSON(apiClient.getUrl('Localization/Options'));
+        Promise.all([promise1, promise2]).then(function (responses) {
+            loadPage(page, responses[0], responses[1]);
+        });
+    });
+    view.addEventListener('viewhide', function () {
+        document.querySelector('.skinHeader').classList.remove('noHomeButtonHeader');
+    });
+}
diff --git a/src/controllers/wizard/user.js b/src/controllers/wizard/user.js
deleted file mode 100644
index e62edef9fe..0000000000
--- a/src/controllers/wizard/user.js
+++ /dev/null
@@ -1,67 +0,0 @@
-define(['loading', 'globalize', 'dashboardcss', 'emby-input', 'emby-button', 'emby-button'], function (loading, globalize) {
-    'use strict';
-
-    function getApiClient() {
-        return ApiClient;
-    }
-
-    function nextWizardPage() {
-        Dashboard.navigate('wizardlibrary.html');
-    }
-
-    function onUpdateUserComplete(result) {
-        console.debug('user update complete: ' + result);
-        loading.hide();
-        nextWizardPage();
-    }
-
-    function submit(form) {
-        loading.show();
-        var apiClient = getApiClient();
-        apiClient.ajax({
-            type: 'POST',
-            data: {
-                Name: form.querySelector('#txtUsername').value,
-                Password: form.querySelector('#txtManualPassword').value
-            },
-            url: apiClient.getUrl('Startup/User')
-        }).then(onUpdateUserComplete);
-    }
-
-    function onSubmit(e) {
-        var form = this;
-
-        if (form.querySelector('#txtManualPassword').value != form.querySelector('#txtPasswordConfirm').value) {
-            require(['toast'], function (toast) {
-                toast(globalize.translate('PasswordMatchError'));
-            });
-        } else {
-            submit(form);
-        }
-
-        e.preventDefault();
-        return false;
-    }
-
-    function onViewShow() {
-        loading.show();
-        var page = this;
-        var apiClient = getApiClient();
-        apiClient.getJSON(apiClient.getUrl('Startup/User')).then(function (user) {
-            page.querySelector('#txtUsername').value = user.Name || '';
-            page.querySelector('#txtManualPassword').value = user.Password || '';
-            loading.hide();
-        });
-    }
-
-    return function (view, params) {
-        view.querySelector('.wizardUserForm').addEventListener('submit', onSubmit);
-        view.addEventListener('viewshow', function () {
-            document.querySelector('.skinHeader').classList.add('noHomeButtonHeader');
-        });
-        view.addEventListener('viewhide', function () {
-            document.querySelector('.skinHeader').classList.remove('noHomeButtonHeader');
-        });
-        view.addEventListener('viewshow', onViewShow);
-    };
-});
diff --git a/src/wizarduser.html b/src/controllers/wizard/user/index.html
similarity index 100%
rename from src/wizarduser.html
rename to src/controllers/wizard/user/index.html
diff --git a/src/controllers/wizard/user/index.js b/src/controllers/wizard/user/index.js
new file mode 100644
index 0000000000..855086a3a4
--- /dev/null
+++ b/src/controllers/wizard/user/index.js
@@ -0,0 +1,69 @@
+import loading from 'loading';
+import globalize from 'globalize';
+import 'dashboardcss';
+import 'emby-input';
+import 'emby-button';
+
+function getApiClient() {
+    return ApiClient;
+}
+
+function nextWizardPage() {
+    Dashboard.navigate('wizardlibrary.html');
+}
+
+function onUpdateUserComplete(result) {
+    console.debug('user update complete: ' + result);
+    loading.hide();
+    nextWizardPage();
+}
+
+function submit(form) {
+    loading.show();
+    const apiClient = getApiClient();
+    apiClient.ajax({
+        type: 'POST',
+        data: {
+            Name: form.querySelector('#txtUsername').value,
+            Password: form.querySelector('#txtManualPassword').value
+        },
+        url: apiClient.getUrl('Startup/User')
+    }).then(onUpdateUserComplete);
+}
+
+function onSubmit(e) {
+    const form = this;
+
+    if (form.querySelector('#txtManualPassword').value != form.querySelector('#txtPasswordConfirm').value) {
+        import('toast').then(({default: toast}) => {
+            toast(globalize.translate('PasswordMatchError'));
+        });
+    } else {
+        submit(form);
+    }
+
+    e.preventDefault();
+    return false;
+}
+
+function onViewShow() {
+    loading.show();
+    const page = this;
+    const apiClient = getApiClient();
+    apiClient.getJSON(apiClient.getUrl('Startup/User')).then(function (user) {
+        page.querySelector('#txtUsername').value = user.Name || '';
+        page.querySelector('#txtManualPassword').value = user.Password || '';
+        loading.hide();
+    });
+}
+
+export default function (view, params) {
+    view.querySelector('.wizardUserForm').addEventListener('submit', onSubmit);
+    view.addEventListener('viewshow', function () {
+        document.querySelector('.skinHeader').classList.add('noHomeButtonHeader');
+    });
+    view.addEventListener('viewhide', function () {
+        document.querySelector('.skinHeader').classList.remove('noHomeButtonHeader');
+    });
+    view.addEventListener('viewshow', onViewShow);
+}
diff --git a/src/dashboardgeneral.html b/src/dashboardgeneral.html
index 03bfa9af8d..99e6414dd6 100644
--- a/src/dashboardgeneral.html
+++ b/src/dashboardgeneral.html
@@ -23,13 +23,6 @@
                             </div>
                         </div>
                     </div>
-                    <div id="fldAutoRunWebApp" class="checkboxContainer checkboxContainer-withDescription hide">
-                        <label>
-                            <input is="emby-checkbox" type="checkbox" id="chkAutoRunWebApp" />
-                            <span>${LaunchWebAppOnStartup}</span>
-                        </label>
-                        <div class="fieldDescription checkboxFieldDescription">${LaunchWebAppOnStartupHelp}</div>
-                    </div>
                 </div>
 
                 <div class="verticalSection verticalSection-extrabottompadding">
@@ -62,7 +55,7 @@
                         <input is="emby-input" type="text" id="txtLoginDisclaimer" label="${LabelLoginDisclaimer}" />
                         <div class="fieldDescription">${LabelLoginDisclaimerHelp}</div>
                     </div>
-                    <div class="inputContainer">
+                    <div class="inputContainer customCssContainer">
                         <textarea is="emby-textarea" id="txtCustomCss" label="${LabelCustomCss}" class="textarea-mono"></textarea>
                         <div class="fieldDescription">${LabelCustomCssHelp}</div>
                     </div>
diff --git a/src/dlnaprofiles.html b/src/dlnaprofiles.html
index 9f2a5e129e..b47b2fd6bf 100644
--- a/src/dlnaprofiles.html
+++ b/src/dlnaprofiles.html
@@ -11,7 +11,7 @@
                         <a is="emby-linkbutton" href="dlnaprofile.html" class="fab submit" style="margin:0 0 0 1em">
                             <span class="material-icons add"></span>
                         </a>
-                        <a style="margin-left:2em!important;" is="emby-linkbutton" class="raised button-alt headerHelpButton" target="_blank" href="https://web.archive.org/web/20181216120305/https://github.com/MediaBrowser/Wiki/wiki/Dlna-profiles">${Help}</a>
+                        <a is="emby-linkbutton" style="margin-left:2em!important;" rel="noopener noreferrer" class="raised button-alt headerHelpButton" target="_blank" href="https://web.archive.org/web/20181216120305/https://github.com/MediaBrowser/Wiki/wiki/Dlna-profiles">${Help}</a>
                     </div>
 
                     <p>${CustomDlnaProfilesHelp}</p>
diff --git a/src/elements/emby-button/emby-button.js b/src/elements/emby-button/emby-button.js
index be52b1d512..213bbc8e7f 100644
--- a/src/elements/emby-button/emby-button.js
+++ b/src/elements/emby-button/emby-button.js
@@ -1,70 +1,74 @@
-define(['browser', 'dom', 'layoutManager', 'shell', 'appRouter', 'apphost', 'css!./emby-button', 'registerElement'], function (browser, dom, layoutManager, shell, appRouter, appHost) {
-    'use strict';
+import dom from 'dom';
+import layoutManager from 'layoutManager';
+import shell from 'shell';
+import appRouter from 'appRouter';
+import appHost from 'apphost';
+import 'css!./emby-button';
+import 'webcomponents';
 
-    var EmbyButtonPrototype = Object.create(HTMLButtonElement.prototype);
-    var EmbyLinkButtonPrototype = Object.create(HTMLAnchorElement.prototype);
+const EmbyButtonPrototype = Object.create(HTMLButtonElement.prototype);
+const EmbyLinkButtonPrototype = Object.create(HTMLAnchorElement.prototype);
 
-    function onAnchorClick(e) {
-        var href = this.getAttribute('href') || '';
-        if (href !== '#') {
-            if (this.getAttribute('target')) {
-                if (!appHost.supports('targetblank')) {
-                    e.preventDefault();
-                    shell.openUrl(href);
-                }
-            } else {
-                appRouter.handleAnchorClick(e);
+function onAnchorClick(e) {
+    const href = this.getAttribute('href') || '';
+    if (href !== '#') {
+        if (this.getAttribute('target')) {
+            if (!appHost.supports('targetblank')) {
+                e.preventDefault();
+                shell.openUrl(href);
             }
         } else {
-            e.preventDefault();
+            appRouter.handleAnchorClick(e);
         }
+    } else {
+        e.preventDefault();
+    }
+}
+
+EmbyButtonPrototype.createdCallback = function () {
+    if (this.classList.contains('emby-button')) {
+        return;
     }
 
-    EmbyButtonPrototype.createdCallback = function () {
-        if (this.classList.contains('emby-button')) {
-            return;
-        }
+    this.classList.add('emby-button');
+    // TODO replace all instances of element-showfocus with this method
+    if (layoutManager.tv) {
+        // handles all special css for tv layout
+        // this method utilizes class chaining
+        this.classList.add('show-focus');
+    }
+};
 
-        this.classList.add('emby-button');
-        // TODO replace all instances of element-showfocus with this method
-        if (layoutManager.tv) {
-            // handles all special css for tv layout
-            // this method utilizes class chaining
-            this.classList.add('show-focus');
-        }
-    };
+EmbyButtonPrototype.attachedCallback = function () {
+    if (this.tagName === 'A') {
+        dom.removeEventListener(this, 'click', onAnchorClick, {});
+        dom.addEventListener(this, 'click', onAnchorClick, {});
 
-    EmbyButtonPrototype.attachedCallback = function () {
-        if (this.tagName === 'A') {
-            dom.removeEventListener(this, 'click', onAnchorClick, {});
-            dom.addEventListener(this, 'click', onAnchorClick, {});
-
-            if (this.getAttribute('data-autohide') === 'true') {
-                if (appHost.supports('externallinks')) {
-                    this.classList.remove('hide');
-                } else {
-                    this.classList.add('hide');
-                }
+        if (this.getAttribute('data-autohide') === 'true') {
+            if (appHost.supports('externallinks')) {
+                this.classList.remove('hide');
+            } else {
+                this.classList.add('hide');
             }
         }
-    };
+    }
+};
 
-    EmbyButtonPrototype.detachedCallback = function () {
-        dom.removeEventListener(this, 'click', onAnchorClick, {});
-    };
+EmbyButtonPrototype.detachedCallback = function () {
+    dom.removeEventListener(this, 'click', onAnchorClick, {});
+};
 
-    EmbyLinkButtonPrototype.createdCallback = EmbyButtonPrototype.createdCallback;
-    EmbyLinkButtonPrototype.attachedCallback = EmbyButtonPrototype.attachedCallback;
+EmbyLinkButtonPrototype.createdCallback = EmbyButtonPrototype.createdCallback;
+EmbyLinkButtonPrototype.attachedCallback = EmbyButtonPrototype.attachedCallback;
 
-    document.registerElement('emby-button', {
-        prototype: EmbyButtonPrototype,
-        extends: 'button'
-    });
-
-    document.registerElement('emby-linkbutton', {
-        prototype: EmbyLinkButtonPrototype,
-        extends: 'a'
-    });
-
-    return EmbyButtonPrototype;
+document.registerElement('emby-button', {
+    prototype: EmbyButtonPrototype,
+    extends: 'button'
 });
+
+document.registerElement('emby-linkbutton', {
+    prototype: EmbyLinkButtonPrototype,
+    extends: 'a'
+});
+
+export default EmbyButtonPrototype;
diff --git a/src/elements/emby-button/paper-icon-button-light.js b/src/elements/emby-button/paper-icon-button-light.js
index 7eda76baec..f6c754fedb 100644
--- a/src/elements/emby-button/paper-icon-button-light.js
+++ b/src/elements/emby-button/paper-icon-button-light.js
@@ -1,18 +1,18 @@
-define(['layoutManager', 'css!./emby-button', 'registerElement'], function (layoutManager) {
-    'use strict';
+import layoutManager from 'layoutManager';
+import 'css!./emby-button';
+import 'webcomponents';
 
-    var EmbyButtonPrototype = Object.create(HTMLButtonElement.prototype);
+const EmbyButtonPrototype = Object.create(HTMLButtonElement.prototype);
 
-    EmbyButtonPrototype.createdCallback = function () {
-        this.classList.add('paper-icon-button-light');
+EmbyButtonPrototype.createdCallback = function () {
+    this.classList.add('paper-icon-button-light');
 
-        if (layoutManager.tv) {
-            this.classList.add('show-focus');
-        }
-    };
+    if (layoutManager.tv) {
+        this.classList.add('show-focus');
+    }
+};
 
-    document.registerElement('paper-icon-button-light', {
-        prototype: EmbyButtonPrototype,
-        extends: 'button'
-    });
+document.registerElement('paper-icon-button-light', {
+    prototype: EmbyButtonPrototype,
+    extends: 'button'
 });
diff --git a/src/elements/emby-checkbox/emby-checkbox.js b/src/elements/emby-checkbox/emby-checkbox.js
index 4d02d56163..d3f24d6f82 100644
--- a/src/elements/emby-checkbox/emby-checkbox.js
+++ b/src/elements/emby-checkbox/emby-checkbox.js
@@ -1,7 +1,11 @@
-define(['browser', 'dom', 'css!./emby-checkbox', 'registerElement'], function (browser, dom) {
-    'use strict';
+import browser from 'browser';
+import dom from 'dom';
+import 'css!./emby-checkbox';
+import 'webcomponents';
 
-    var EmbyCheckboxPrototype = Object.create(HTMLInputElement.prototype);
+/* eslint-disable indent */
+
+    let EmbyCheckboxPrototype = Object.create(HTMLInputElement.prototype);
 
     function onKeyDown(e) {
         // Don't submit form on enter
@@ -19,10 +23,10 @@ define(['browser', 'dom', 'css!./emby-checkbox', 'registerElement'], function (b
         }
     }
 
-    var enableRefreshHack = browser.tizen || browser.orsay || browser.operaTv || browser.web0s ? true : false;
+    const enableRefreshHack = browser.tizen || browser.orsay || browser.operaTv || browser.web0s ? true : false;
 
     function forceRefresh(loading) {
-        var elem = this.parentNode;
+        let elem = this.parentNode;
 
         elem.style.webkitAnimationName = 'repaintChrome';
         elem.style.webkitAnimationDelay = (loading === true ? '500ms' : '');
@@ -43,22 +47,22 @@ define(['browser', 'dom', 'css!./emby-checkbox', 'registerElement'], function (b
 
         this.classList.add('emby-checkbox');
 
-        var labelElement = this.parentNode;
+        const labelElement = this.parentNode;
         labelElement.classList.add('emby-checkbox-label');
 
-        var labelTextElement = labelElement.querySelector('span');
+        const labelTextElement = labelElement.querySelector('span');
 
-        var outlineClass = 'checkboxOutline';
+        let outlineClass = 'checkboxOutline';
 
-        var customClass = this.getAttribute('data-outlineclass');
+        const customClass = this.getAttribute('data-outlineclass');
         if (customClass) {
             outlineClass += ' ' + customClass;
         }
 
-        var checkedIcon = this.getAttribute('data-checkedicon') || 'check';
-        var uncheckedIcon = this.getAttribute('data-uncheckedicon') || '';
-        var checkHtml = '<span class="material-icons checkboxIcon checkboxIcon-checked ' + checkedIcon + '"></span>';
-        var uncheckedHtml = '<span class="material-icons checkboxIcon checkboxIcon-unchecked ' + uncheckedIcon + '"></span>';
+        const checkedIcon = this.getAttribute('data-checkedicon') || 'check';
+        const uncheckedIcon = this.getAttribute('data-uncheckedicon') || '';
+        const checkHtml = '<span class="material-icons checkboxIcon checkboxIcon-checked ' + checkedIcon + '"></span>';
+        const uncheckedHtml = '<span class="material-icons checkboxIcon checkboxIcon-unchecked ' + uncheckedIcon + '"></span>';
         labelElement.insertAdjacentHTML('beforeend', '<span class="' + outlineClass + '">' + checkHtml + uncheckedHtml + '</span>');
 
         labelTextElement.classList.add('checkboxLabel');
@@ -103,4 +107,5 @@ define(['browser', 'dom', 'css!./emby-checkbox', 'registerElement'], function (b
         prototype: EmbyCheckboxPrototype,
         extends: 'input'
     });
-});
+
+/* eslint-enable indent */
diff --git a/src/elements/emby-collapse/emby-collapse.js b/src/elements/emby-collapse/emby-collapse.js
index 707e81a786..f980f19af0 100644
--- a/src/elements/emby-collapse/emby-collapse.js
+++ b/src/elements/emby-collapse/emby-collapse.js
@@ -1,18 +1,21 @@
-define(['browser', 'css!./emby-collapse', 'registerElement', 'emby-button'], function (browser) {
-    'use strict';
+import 'css!./emby-collapse';
+import 'webcomponents';
+import 'emby-button';
 
-    var EmbyButtonPrototype = Object.create(HTMLDivElement.prototype);
+/* eslint-disable indent */
+
+    const EmbyButtonPrototype = Object.create(HTMLDivElement.prototype);
 
     function slideDownToShow(button, elem) {
 
         elem.classList.remove('hide');
         elem.classList.add('expanded');
         elem.style.height = 'auto';
-        var height = elem.offsetHeight + 'px';
+        const height = elem.offsetHeight + 'px';
         elem.style.height = '0';
 
         // trigger reflow
-        var newHeight = elem.offsetHeight;
+        const newHeight = elem.offsetHeight;
         elem.style.height = height;
 
         setTimeout(function () {
@@ -24,7 +27,7 @@ define(['browser', 'css!./emby-collapse', 'registerElement', 'emby-button'], fun
             elem.style.height = 'auto';
         }, 300);
 
-        var icon = button.querySelector('.material-icons');
+        const icon = button.querySelector('.material-icons');
         //icon.innerHTML = 'expand_less';
         icon.classList.add('emby-collapse-expandIconExpanded');
     }
@@ -33,7 +36,7 @@ define(['browser', 'css!./emby-collapse', 'registerElement', 'emby-button'], fun
 
         elem.style.height = elem.offsetHeight + 'px';
         // trigger reflow
-        var newHeight = elem.offsetHeight;
+        const newHeight = elem.offsetHeight;
 
         elem.classList.remove('expanded');
         elem.style.height = '0';
@@ -46,15 +49,15 @@ define(['browser', 'css!./emby-collapse', 'registerElement', 'emby-button'], fun
             }
         }, 300);
 
-        var icon = button.querySelector('.material-icons');
+        const icon = button.querySelector('.material-icons');
         //icon.innerHTML = 'expand_more';
         icon.classList.remove('emby-collapse-expandIconExpanded');
     }
 
     function onButtonClick(e) {
 
-        var button = this;
-        var collapseContent = button.parentNode.querySelector('.collapseContent');
+        const button = this;
+        const collapseContent = button.parentNode.querySelector('.collapseContent');
 
         if (collapseContent.expanded) {
             collapseContent.expanded = false;
@@ -73,18 +76,18 @@ define(['browser', 'css!./emby-collapse', 'registerElement', 'emby-button'], fun
 
         this.classList.add('emby-collapse');
 
-        var collapseContent = this.querySelector('.collapseContent');
+        const collapseContent = this.querySelector('.collapseContent');
         if (collapseContent) {
             collapseContent.classList.add('hide');
         }
 
-        var title = this.getAttribute('title');
+        const title = this.getAttribute('title');
 
-        var html = '<button is="emby-button" type="button" on-click="toggleExpand" id="expandButton" class="emby-collapsible-button iconRight"><h3 class="emby-collapsible-title" title="' + title + '">' + title + '</h3><span class="material-icons emby-collapse-expandIcon expand_more"></span></button>';
+        const html = '<button is="emby-button" type="button" on-click="toggleExpand" id="expandButton" class="emby-collapsible-button iconRight"><h3 class="emby-collapsible-title" title="' + title + '">' + title + '</h3><span class="material-icons emby-collapse-expandIcon expand_more"></span></button>';
 
         this.insertAdjacentHTML('afterbegin', html);
 
-        var button = this.querySelector('.emby-collapsible-button');
+        const button = this.querySelector('.emby-collapsible-button');
 
         button.addEventListener('click', onButtonClick);
 
@@ -97,4 +100,5 @@ define(['browser', 'css!./emby-collapse', 'registerElement', 'emby-button'], fun
         prototype: EmbyButtonPrototype,
         extends: 'div'
     });
-});
+
+/* eslint-enable indent */
diff --git a/src/elements/emby-input/emby-input.js b/src/elements/emby-input/emby-input.js
index 03ba2b93aa..d27cc71564 100644
--- a/src/elements/emby-input/emby-input.js
+++ b/src/elements/emby-input/emby-input.js
@@ -1,18 +1,22 @@
-define(['layoutManager', 'browser', 'dom', 'css!./emby-input', 'registerElement'], function (layoutManager, browser, dom) {
-    'use strict';
+import browser from 'browser';
+import dom from 'dom';
+import 'css!./emby-input';
+import 'webcomponents';
 
-    var EmbyInputPrototype = Object.create(HTMLInputElement.prototype);
+/* eslint-disable indent */
 
-    var inputId = 0;
-    var supportsFloatingLabel = false;
+    const EmbyInputPrototype = Object.create(HTMLInputElement.prototype);
+
+    let inputId = 0;
+    let supportsFloatingLabel = false;
 
     if (Object.getOwnPropertyDescriptor && Object.defineProperty) {
 
-        var descriptor = Object.getOwnPropertyDescriptor(HTMLInputElement.prototype, 'value');
+        const descriptor = Object.getOwnPropertyDescriptor(HTMLInputElement.prototype, 'value');
 
         // descriptor returning null in webos
         if (descriptor && descriptor.configurable) {
-            var baseSetMethod = descriptor.set;
+            const baseSetMethod = descriptor.set;
             descriptor.set = function (value) {
                 baseSetMethod.call(this, value);
 
@@ -39,9 +43,9 @@ define(['layoutManager', 'browser', 'dom', 'css!./emby-input', 'registerElement'
 
         this.classList.add('emby-input');
 
-        var parentNode = this.parentNode;
-        var document = this.ownerDocument;
-        var label = document.createElement('label');
+        const parentNode = this.parentNode;
+        const document = this.ownerDocument;
+        const label = document.createElement('label');
         label.innerHTML = this.getAttribute('label') || '';
         label.classList.add('inputLabel');
         label.classList.add('inputLabelUnfocused');
@@ -95,12 +99,12 @@ define(['layoutManager', 'browser', 'dom', 'css!./emby-input', 'registerElement'
 
     function onChange() {
 
-        var label = this.labelElement;
+        const label = this.labelElement;
         if (this.value) {
             label.classList.remove('inputLabel-float');
         } else {
 
-            var instanceSupportsFloat = supportsFloatingLabel && this.type !== 'date' && this.type !== 'time';
+            const instanceSupportsFloat = supportsFloatingLabel && this.type !== 'date' && this.type !== 'time';
 
             if (instanceSupportsFloat) {
                 label.classList.add('inputLabel-float');
@@ -109,9 +113,7 @@ define(['layoutManager', 'browser', 'dom', 'css!./emby-input', 'registerElement'
     }
 
     EmbyInputPrototype.attachedCallback = function () {
-
         this.labelElement.htmlFor = this.id;
-
         onChange.call(this);
     };
 
@@ -123,4 +125,5 @@ define(['layoutManager', 'browser', 'dom', 'css!./emby-input', 'registerElement'
         prototype: EmbyInputPrototype,
         extends: 'input'
     });
-});
+
+/* eslint-enable indent */
diff --git a/src/elements/emby-itemrefreshindicator/emby-itemrefreshindicator.js b/src/elements/emby-itemrefreshindicator/emby-itemrefreshindicator.js
index 9864dbbb67..b1f8c4f4cf 100644
--- a/src/elements/emby-itemrefreshindicator/emby-itemrefreshindicator.js
+++ b/src/elements/emby-itemrefreshindicator/emby-itemrefreshindicator.js
@@ -1,16 +1,21 @@
-define(['emby-progressring', 'dom', 'serverNotifications', 'events', 'registerElement'], function (EmbyProgressRing, dom, serverNotifications, events) {
-    'use strict';
+import EmbyProgressRing from 'emby-progressring';
+import dom from 'dom';
+import serverNotifications from 'serverNotifications';
+import events from 'events';
+import 'webcomponents';
+
+/* eslint-disable indent */
 
     function addNotificationEvent(instance, name, handler) {
 
-        var localHandler = handler.bind(instance);
+        const localHandler = handler.bind(instance);
         events.on(serverNotifications, name, localHandler);
         instance[name] = localHandler;
     }
 
     function removeNotificationEvent(instance, name) {
 
-        var handler = instance[name];
+        const handler = instance[name];
         if (handler) {
             events.off(serverNotifications, name, handler);
             instance[name] = null;
@@ -19,7 +24,7 @@ define(['emby-progressring', 'dom', 'serverNotifications', 'events', 'registerEl
 
     function onRefreshProgress(e, apiClient, info) {
 
-        var indicator = this;
+        const indicator = this;
 
         if (!indicator.itemId) {
             indicator.itemId = dom.parentWithAttribute(indicator, 'data-id').getAttribute('data-id');
@@ -27,7 +32,7 @@ define(['emby-progressring', 'dom', 'serverNotifications', 'events', 'registerEl
 
         if (info.ItemId === indicator.itemId) {
 
-            var progress = parseFloat(info.Progress);
+            const progress = parseFloat(info.Progress);
 
             if (progress && progress < 100) {
                 this.classList.remove('hide');
@@ -39,7 +44,7 @@ define(['emby-progressring', 'dom', 'serverNotifications', 'events', 'registerEl
         }
     }
 
-    var EmbyItemRefreshIndicatorPrototype = Object.create(EmbyProgressRing);
+    let EmbyItemRefreshIndicatorPrototype = Object.create(EmbyProgressRing);
 
     EmbyItemRefreshIndicatorPrototype.createdCallback = function () {
 
@@ -74,4 +79,5 @@ define(['emby-progressring', 'dom', 'serverNotifications', 'events', 'registerEl
         prototype: EmbyItemRefreshIndicatorPrototype,
         extends: 'div'
     });
-});
+
+/* eslint-enable indent */
diff --git a/src/elements/emby-itemscontainer/emby-itemscontainer.js b/src/elements/emby-itemscontainer/emby-itemscontainer.js
index 5d3772ca93..1d4a67717a 100644
--- a/src/elements/emby-itemscontainer/emby-itemscontainer.js
+++ b/src/elements/emby-itemscontainer/emby-itemscontainer.js
@@ -1,12 +1,25 @@
-define(['itemShortcuts', 'inputManager', 'connectionManager', 'playbackManager', 'imageLoader', 'layoutManager', 'browser', 'dom', 'loading', 'focusManager', 'serverNotifications', 'events', 'registerElement'], function (itemShortcuts, inputManager, connectionManager, playbackManager, imageLoader, layoutManager, browser, dom, loading, focusManager, serverNotifications, events) {
-    'use strict';
+import itemShortcuts from 'itemShortcuts';
+import inputManager from 'inputManager';
+import connectionManager from 'connectionManager';
+import playbackManager from 'playbackManager';
+import imageLoader from 'imageLoader';
+import layoutManager from 'layoutManager';
+import browser from 'browser';
+import dom from 'dom';
+import loading from 'loading';
+import focusManager from 'focusManager';
+import serverNotifications from 'serverNotifications';
+import events from 'events';
+import 'webcomponents';
 
-    var ItemsContainerPrototype = Object.create(HTMLDivElement.prototype);
+/* eslint-disable indent */
+
+    const ItemsContainerPrototype = Object.create(HTMLDivElement.prototype);
 
     function onClick(e) {
-        var itemsContainer = this;
-        var target = e.target;
-        var multiSelect = itemsContainer.multiSelect;
+        const itemsContainer = this;
+        const target = e.target;
+        let multiSelect = itemsContainer.multiSelect;
 
         if (multiSelect) {
             if (multiSelect.onContainerClick.call(itemsContainer, e) === false) {
@@ -24,13 +37,12 @@ define(['itemShortcuts', 'inputManager', 'connectionManager', 'playbackManager',
     }
 
     function onContextMenu(e) {
-        var itemsContainer = this;
-        var target = e.target;
-        var card = dom.parentWithAttribute(target, 'data-id');
+        const target = e.target;
+        const card = dom.parentWithAttribute(target, 'data-id');
 
         // check for serverId, it won't be present on selectserver
         if (card && card.getAttribute('data-serverid')) {
-            inputManager.trigger('menu', {
+            inputManager.handleCommand('menu', {
                 sourceElement: card
             });
 
@@ -47,7 +59,7 @@ define(['itemShortcuts', 'inputManager', 'connectionManager', 'playbackManager',
     }
 
     ItemsContainerPrototype.enableMultiSelect = function (enabled) {
-        var current = this.multiSelect;
+        const current = this.multiSelect;
 
         if (!enabled) {
             if (current) {
@@ -61,8 +73,8 @@ define(['itemShortcuts', 'inputManager', 'connectionManager', 'playbackManager',
             return;
         }
 
-        var self = this;
-        require(['multiSelect'], function (MultiSelect) {
+        const self = this;
+        import('multiSelect').then(({default: MultiSelect}) => {
             self.multiSelect = new MultiSelect({
                 container: self,
                 bindOnClick: false
@@ -71,14 +83,14 @@ define(['itemShortcuts', 'inputManager', 'connectionManager', 'playbackManager',
     };
 
     function onDrop(evt, itemsContainer) {
-        var el = evt.item;
+        const el = evt.item;
 
-        var newIndex = evt.newIndex;
-        var itemId = el.getAttribute('data-playlistitemid');
-        var playlistId = el.getAttribute('data-playlistid');
+        const newIndex = evt.newIndex;
+        const itemId = el.getAttribute('data-playlistitemid');
+        const playlistId = el.getAttribute('data-playlistid');
 
         if (!playlistId) {
-            var oldIndex = evt.oldIndex;
+            const oldIndex = evt.oldIndex;
             el.dispatchEvent(new CustomEvent('itemdrop', {
                 detail: {
                     oldIndex: oldIndex,
@@ -91,8 +103,8 @@ define(['itemShortcuts', 'inputManager', 'connectionManager', 'playbackManager',
             return;
         }
 
-        var serverId = el.getAttribute('data-serverid');
-        var apiClient = connectionManager.getApiClient(serverId);
+        const serverId = el.getAttribute('data-serverid');
+        const apiClient = connectionManager.getApiClient(serverId);
 
         loading.show();
 
@@ -108,7 +120,7 @@ define(['itemShortcuts', 'inputManager', 'connectionManager', 'playbackManager',
     }
 
     ItemsContainerPrototype.enableDragReordering = function (enabled) {
-        var current = this.sortable;
+        const current = this.sortable;
         if (!enabled) {
             if (current) {
                 current.destroy();
@@ -121,8 +133,8 @@ define(['itemShortcuts', 'inputManager', 'connectionManager', 'playbackManager',
             return;
         }
 
-        var self = this;
-        require(['sortable'], function (Sortable) {
+        const self = this;
+        import('sortable').then(({default: Sortable}) => {
             self.sortable = new Sortable(self, {
                 draggable: '.listItem',
                 handle: '.listViewDragHandle',
@@ -137,13 +149,13 @@ define(['itemShortcuts', 'inputManager', 'connectionManager', 'playbackManager',
 
     function onUserDataChanged(e, apiClient, userData) {
 
-        var itemsContainer = this;
+        const itemsContainer = this;
 
-        require(['cardBuilder'], function (cardBuilder) {
+        import('cardBuilder').then(({default: cardBuilder}) => {
             cardBuilder.onUserDataChanged(userData, itemsContainer);
         });
 
-        var eventsToMonitor = getEventsToMonitor(itemsContainer);
+        const eventsToMonitor = getEventsToMonitor(itemsContainer);
 
         // TODO: Check user data change reason?
         if (eventsToMonitor.indexOf('markfavorite') !== -1) {
@@ -154,7 +166,7 @@ define(['itemShortcuts', 'inputManager', 'connectionManager', 'playbackManager',
     }
 
     function getEventsToMonitor(itemsContainer) {
-        var monitor = itemsContainer.getAttribute('data-monitor');
+        let monitor = itemsContainer.getAttribute('data-monitor');
         if (monitor) {
             return monitor.split(',');
         }
@@ -164,24 +176,24 @@ define(['itemShortcuts', 'inputManager', 'connectionManager', 'playbackManager',
 
     function onTimerCreated(e, apiClient, data) {
 
-        var itemsContainer = this;
+        const itemsContainer = this;
 
         if (getEventsToMonitor(itemsContainer).indexOf('timers') !== -1) {
             itemsContainer.notifyRefreshNeeded();
             return;
         }
 
-        var programId = data.ProgramId;
+        const programId = data.ProgramId;
         // This could be null, not supported by all tv providers
-        var newTimerId = data.Id;
+        const newTimerId = data.Id;
 
-        require(['cardBuilder'], function (cardBuilder) {
+        import('cardBuilder').then(({default: cardBuilder}) => {
             cardBuilder.onTimerCreated(programId, newTimerId, itemsContainer);
         });
     }
 
     function onSeriesTimerCreated(e, apiClient, data) {
-        var itemsContainer = this;
+        const itemsContainer = this;
         if (getEventsToMonitor(itemsContainer).indexOf('seriestimers') !== -1) {
             itemsContainer.notifyRefreshNeeded();
             return;
@@ -189,49 +201,49 @@ define(['itemShortcuts', 'inputManager', 'connectionManager', 'playbackManager',
     }
 
     function onTimerCancelled(e, apiClient, data) {
-        var itemsContainer = this;
+        const itemsContainer = this;
         if (getEventsToMonitor(itemsContainer).indexOf('timers') !== -1) {
             itemsContainer.notifyRefreshNeeded();
             return;
         }
 
-        require(['cardBuilder'], function (cardBuilder) {
+        import('cardBuilder').then(({default: cardBuilder}) => {
             cardBuilder.onTimerCancelled(data.Id, itemsContainer);
         });
     }
 
     function onSeriesTimerCancelled(e, apiClient, data) {
-        var itemsContainer = this;
+        const itemsContainer = this;
         if (getEventsToMonitor(itemsContainer).indexOf('seriestimers') !== -1) {
             itemsContainer.notifyRefreshNeeded();
             return;
         }
 
-        require(['cardBuilder'], function (cardBuilder) {
+        import('cardBuilder').then(({default: cardBuilder}) => {
             cardBuilder.onSeriesTimerCancelled(data.Id, itemsContainer);
         });
     }
 
     function onLibraryChanged(e, apiClient, data) {
-        var itemsContainer = this;
+        const itemsContainer = this;
 
-        var eventsToMonitor = getEventsToMonitor(itemsContainer);
+        const eventsToMonitor = getEventsToMonitor(itemsContainer);
         if (eventsToMonitor.indexOf('seriestimers') !== -1 || eventsToMonitor.indexOf('timers') !== -1) {
             // yes this is an assumption
             return;
         }
 
-        var itemsAdded = data.ItemsAdded || [];
-        var itemsRemoved = data.ItemsRemoved || [];
+        const itemsAdded = data.ItemsAdded || [];
+        const itemsRemoved = data.ItemsRemoved || [];
         if (!itemsAdded.length && !itemsRemoved.length) {
             return;
         }
 
-        var parentId = itemsContainer.getAttribute('data-parentid');
+        const parentId = itemsContainer.getAttribute('data-parentid');
         if (parentId) {
-            var foldersAddedTo = data.FoldersAddedTo || [];
-            var foldersRemovedFrom = data.FoldersRemovedFrom || [];
-            var collectionFolders = data.CollectionFolders || [];
+            const foldersAddedTo = data.FoldersAddedTo || [];
+            const foldersRemovedFrom = data.FoldersRemovedFrom || [];
+            const collectionFolders = data.CollectionFolders || [];
 
             if (foldersAddedTo.indexOf(parentId) === -1 && foldersRemovedFrom.indexOf(parentId) === -1 && collectionFolders.indexOf(parentId) === -1) {
                 return;
@@ -242,10 +254,10 @@ define(['itemShortcuts', 'inputManager', 'connectionManager', 'playbackManager',
     }
 
     function onPlaybackStopped(e, stopInfo) {
-        var itemsContainer = this;
-        var state = stopInfo.state;
+        const itemsContainer = this;
+        const state = stopInfo.state;
 
-        var eventsToMonitor = getEventsToMonitor(itemsContainer);
+        const eventsToMonitor = getEventsToMonitor(itemsContainer);
         if (state.NowPlayingItem && state.NowPlayingItem.MediaType === 'Video') {
             if (eventsToMonitor.indexOf('videoplayback') !== -1) {
                 itemsContainer.notifyRefreshNeeded(true);
@@ -260,14 +272,14 @@ define(['itemShortcuts', 'inputManager', 'connectionManager', 'playbackManager',
     }
 
     function addNotificationEvent(instance, name, handler, owner) {
-        var localHandler = handler.bind(instance);
+        const localHandler = handler.bind(instance);
         owner = owner || serverNotifications;
         events.on(owner, name, localHandler);
         instance['event_' + name] = localHandler;
     }
 
     function removeNotificationEvent(instance, name, owner) {
-        var handler = instance['event_' + name];
+        const handler = instance['event_' + name];
         if (handler) {
             owner = owner || serverNotifications;
             events.off(owner, name, handler);
@@ -347,10 +359,10 @@ define(['itemShortcuts', 'inputManager', 'connectionManager', 'playbackManager',
     ItemsContainerPrototype.resume = function (options) {
         this.paused = false;
 
-        var refreshIntervalEndTime = this.refreshIntervalEndTime;
+        let refreshIntervalEndTime = this.refreshIntervalEndTime;
         if (refreshIntervalEndTime) {
 
-            var remainingMs = refreshIntervalEndTime - new Date().getTime();
+            const remainingMs = refreshIntervalEndTime - new Date().getTime();
             if (remainingMs > 0 && !this.needsRefresh) {
                 resetRefreshInterval(this, remainingMs);
             } else {
@@ -387,7 +399,7 @@ define(['itemShortcuts', 'inputManager', 'connectionManager', 'playbackManager',
             return;
         }
 
-        var timeout = this.refreshTimeout;
+        let timeout = this.refreshTimeout;
         if (timeout) {
             clearTimeout(timeout);
         }
@@ -424,9 +436,9 @@ define(['itemShortcuts', 'inputManager', 'connectionManager', 'playbackManager',
     }
 
     function onDataFetched(result) {
-        var items = result.Items || result;
+        const items = result.Items || result;
 
-        var parentContainer = this.parentContainer;
+        let parentContainer = this.parentContainer;
         if (parentContainer) {
             if (items.length) {
                 parentContainer.classList.remove('hide');
@@ -435,9 +447,9 @@ define(['itemShortcuts', 'inputManager', 'connectionManager', 'playbackManager',
             }
         }
 
-        var activeElement = document.activeElement;
-        var focusId;
-        var hasActiveElement;
+        const activeElement = document.activeElement;
+        let focusId;
+        let hasActiveElement;
 
         if (this.contains(activeElement)) {
             hasActiveElement = true;
@@ -461,7 +473,7 @@ define(['itemShortcuts', 'inputManager', 'connectionManager', 'playbackManager',
 
     function setFocus(itemsContainer, focusId) {
         if (focusId) {
-            var newElement = itemsContainer.querySelector('[data-id="' + focusId + '"]');
+            const newElement = itemsContainer.querySelector('[data-id="' + focusId + '"]');
             if (newElement) {
                 try {
                     focusManager.focus(newElement);
@@ -479,4 +491,5 @@ define(['itemShortcuts', 'inputManager', 'connectionManager', 'playbackManager',
         prototype: ItemsContainerPrototype,
         extends: 'div'
     });
-});
+
+/* eslint-enable indent */
diff --git a/src/elements/emby-playstatebutton/emby-playstatebutton.js b/src/elements/emby-playstatebutton/emby-playstatebutton.js
index 57f7eb76eb..e1b34318b8 100644
--- a/src/elements/emby-playstatebutton/emby-playstatebutton.js
+++ b/src/elements/emby-playstatebutton/emby-playstatebutton.js
@@ -1,14 +1,19 @@
-define(['connectionManager', 'serverNotifications', 'events', 'globalize', 'emby-button'], function (connectionManager, serverNotifications, events, globalize, EmbyButtonPrototype) {
-    'use strict';
+import connectionManager from 'connectionManager';
+import serverNotifications from 'serverNotifications';
+import events from 'events';
+import globalize from 'globalize';
+import EmbyButtonPrototype from 'emby-button';
+
+/* eslint-disable indent */
 
     function addNotificationEvent(instance, name, handler) {
-        var localHandler = handler.bind(instance);
+        const localHandler = handler.bind(instance);
         events.on(serverNotifications, name, localHandler);
         instance[name] = localHandler;
     }
 
     function removeNotificationEvent(instance, name) {
-        var handler = instance[name];
+        const handler = instance[name];
         if (handler) {
             events.off(serverNotifications, name, handler);
             instance[name] = null;
@@ -17,10 +22,10 @@ define(['connectionManager', 'serverNotifications', 'events', 'globalize', 'emby
 
     function onClick(e) {
 
-        var button = this;
-        var id = button.getAttribute('data-id');
-        var serverId = button.getAttribute('data-serverid');
-        var apiClient = connectionManager.getApiClient(serverId);
+        const button = this;
+        const id = button.getAttribute('data-id');
+        const serverId = button.getAttribute('data-serverid');
+        const apiClient = connectionManager.getApiClient(serverId);
 
         if (!button.classList.contains('playstatebutton-played')) {
             apiClient.markPlayed(apiClient.getCurrentUserId(), id, new Date());
@@ -32,14 +37,14 @@ define(['connectionManager', 'serverNotifications', 'events', 'globalize', 'emby
     }
 
     function onUserDataChanged(e, apiClient, userData) {
-        var button = this;
+        const button = this;
         if (userData.ItemId === button.getAttribute('data-id')) {
             setState(button, userData.Played);
         }
     }
 
     function setState(button, played, updateAttribute) {
-        var icon = button.iconElement;
+        let icon = button.iconElement;
         if (!icon) {
             button.iconElement = button.querySelector('.material-icons');
             icon = button.iconElement;
@@ -72,7 +77,7 @@ define(['connectionManager', 'serverNotifications', 'events', 'globalize', 'emby
             button.title = globalize.translate('Played');
         }
 
-        var text = button.querySelector('.button-text');
+        let text = button.querySelector('.button-text');
         if (text) {
             text.innerHTML = button.title;
         }
@@ -92,7 +97,7 @@ define(['connectionManager', 'serverNotifications', 'events', 'globalize', 'emby
         addNotificationEvent(button, 'UserDataChanged', onUserDataChanged);
     }
 
-    var EmbyPlaystateButtonPrototype = Object.create(EmbyButtonPrototype);
+    const EmbyPlaystateButtonPrototype = Object.create(EmbyButtonPrototype);
 
     EmbyPlaystateButtonPrototype.createdCallback = function () {
 
@@ -109,8 +114,8 @@ define(['connectionManager', 'serverNotifications', 'events', 'globalize', 'emby
             EmbyButtonPrototype.attachedCallback.call(this);
         }
 
-        var itemId = this.getAttribute('data-id');
-        var serverId = this.getAttribute('data-serverid');
+        const itemId = this.getAttribute('data-id');
+        const serverId = this.getAttribute('data-serverid');
         if (itemId && serverId) {
 
             setState(this, this.getAttribute('data-played') === 'true', false);
@@ -137,7 +142,7 @@ define(['connectionManager', 'serverNotifications', 'events', 'globalize', 'emby
             this.setAttribute('data-id', item.Id);
             this.setAttribute('data-serverid', item.ServerId);
 
-            var played = item.UserData && item.UserData.Played;
+            const played = item.UserData && item.UserData.Played;
             setState(this, played);
             bindEvents(this);
 
@@ -156,4 +161,5 @@ define(['connectionManager', 'serverNotifications', 'events', 'globalize', 'emby
         prototype: EmbyPlaystateButtonPrototype,
         extends: 'button'
     });
-});
+
+/* eslint-enable indent */
diff --git a/src/elements/emby-programcell/emby-programcell.js b/src/elements/emby-programcell/emby-programcell.js
index a959033186..d1f1820e5e 100644
--- a/src/elements/emby-programcell/emby-programcell.js
+++ b/src/elements/emby-programcell/emby-programcell.js
@@ -1,16 +1,12 @@
-define([], function() {
-    'use strict';
+const ProgramCellPrototype = Object.create(HTMLButtonElement.prototype);
 
-    var ProgramCellPrototype = Object.create(HTMLButtonElement.prototype);
+ProgramCellPrototype.detachedCallback = function () {
+    this.posLeft = null;
+    this.posWidth = null;
+    this.guideProgramName = null;
+};
 
-    ProgramCellPrototype.detachedCallback = function () {
-        this.posLeft = null;
-        this.posWidth = null;
-        this.guideProgramName = null;
-    };
-
-    document.registerElement('emby-programcell', {
-        prototype: ProgramCellPrototype,
-        extends: 'button'
-    });
+document.registerElement('emby-programcell', {
+    prototype: ProgramCellPrototype,
+    extends: 'button'
 });
diff --git a/src/elements/emby-progressbar/emby-progressbar.js b/src/elements/emby-progressbar/emby-progressbar.js
index a799f82bdd..54fcb1999e 100644
--- a/src/elements/emby-progressbar/emby-progressbar.js
+++ b/src/elements/emby-progressbar/emby-progressbar.js
@@ -1,20 +1,19 @@
-define([], function() {
-    'use strict';
+/* eslint-disable indent */
 
-    var ProgressBarPrototype = Object.create(HTMLDivElement.prototype);
+    let ProgressBarPrototype = Object.create(HTMLDivElement.prototype);
 
     function onAutoTimeProgress() {
-        var start = parseInt(this.getAttribute('data-starttime'));
-        var end = parseInt(this.getAttribute('data-endtime'));
+        const start = parseInt(this.getAttribute('data-starttime'));
+        const end = parseInt(this.getAttribute('data-endtime'));
 
-        var now = new Date().getTime();
-        var total = end - start;
-        var pct = 100 * ((now - start) / total);
+        const now = new Date().getTime();
+        const total = end - start;
+        let pct = 100 * ((now - start) / total);
 
         pct = Math.min(100, pct);
         pct = Math.max(0, pct);
 
-        var itemProgressBarForeground = this.querySelector('.itemProgressBarForeground');
+        const itemProgressBarForeground = this.querySelector('.itemProgressBarForeground');
         itemProgressBarForeground.style.width = pct + '%';
     }
 
@@ -39,4 +38,5 @@ define([], function() {
         prototype: ProgressBarPrototype,
         extends: 'div'
     });
-});
+
+/* eslint-enable indent */
diff --git a/src/elements/emby-progressring/emby-progressring.js b/src/elements/emby-progressring/emby-progressring.js
index edc635947c..062f64d78b 100644
--- a/src/elements/emby-progressring/emby-progressring.js
+++ b/src/elements/emby-progressring/emby-progressring.js
@@ -1,14 +1,16 @@
-define(['require', 'css!./emby-progressring', 'registerElement'], function (require) {
-    'use strict';
+import 'css!./emby-progressring';
+import 'webcomponents';
 
-    var EmbyProgressRing = Object.create(HTMLDivElement.prototype);
+/* eslint-disable indent */
+
+    let EmbyProgressRing = Object.create(HTMLDivElement.prototype);
 
     EmbyProgressRing.createdCallback = function () {
 
         this.classList.add('progressring');
-        var instance = this;
+        const instance = this;
 
-        require(['text!./emby-progressring.template.html'], function (template) {
+        import('text!./emby-progressring.template.html').then(({default: template}) => {
             instance.innerHTML = template;
 
             //if (window.MutationObserver) {
@@ -37,7 +39,7 @@ define(['require', 'css!./emby-progressring', 'registerElement'], function (requ
 
         progress = Math.floor(progress);
 
-        var angle;
+        let angle;
 
         if (progress < 25) {
             angle = -90 + (progress / 100) * 360;
@@ -82,7 +84,7 @@ define(['require', 'css!./emby-progressring', 'registerElement'], function (requ
 
     EmbyProgressRing.detachedCallback = function () {
 
-        var observer = this.observer;
+        let observer = this.observer;
 
         if (observer) {
             // later, you can stop observing
@@ -97,5 +99,6 @@ define(['require', 'css!./emby-progressring', 'registerElement'], function (requ
         extends: 'div'
     });
 
-    return EmbyProgressRing;
-});
+    export default EmbyProgressRing;
+
+/* eslint-enable indent */
diff --git a/src/elements/emby-radio/emby-radio.js b/src/elements/emby-radio/emby-radio.js
index 46a3e3826c..c8437d77e3 100644
--- a/src/elements/emby-radio/emby-radio.js
+++ b/src/elements/emby-radio/emby-radio.js
@@ -1,7 +1,10 @@
-define(['layoutManager', 'css!./emby-radio', 'registerElement'], function (layoutManager) {
-    'use strict';
+import layoutManager from 'layoutManager';
+import 'css!./emby-radio';
+import 'webcomponents';
 
-    var EmbyRadioPrototype = Object.create(HTMLInputElement.prototype);
+/* eslint-disable indent */
+
+    let EmbyRadioPrototype = Object.create(HTMLInputElement.prototype);
 
     function onKeyDown(e) {
 
@@ -23,7 +26,7 @@ define(['layoutManager', 'css!./emby-radio', 'registerElement'], function (layou
     }
 
     EmbyRadioPrototype.attachedCallback = function () {
-        var showFocus = !layoutManager.mobile;
+        const showFocus = !layoutManager.mobile;
 
         if (this.getAttribute('data-radio') === 'true') {
             return;
@@ -33,7 +36,7 @@ define(['layoutManager', 'css!./emby-radio', 'registerElement'], function (layou
 
         this.classList.add('mdl-radio__button');
 
-        var labelElement = this.parentNode;
+        let labelElement = this.parentNode;
         //labelElement.classList.add('"mdl-radio mdl-js-radio mdl-js-ripple-effect');
         labelElement.classList.add('mdl-radio');
         labelElement.classList.add('mdl-js-radio');
@@ -42,12 +45,12 @@ define(['layoutManager', 'css!./emby-radio', 'registerElement'], function (layou
             labelElement.classList.add('show-focus');
         }
 
-        var labelTextElement = labelElement.querySelector('span');
+        let labelTextElement = labelElement.querySelector('span');
 
         labelTextElement.classList.add('radioButtonLabel');
         labelTextElement.classList.add('mdl-radio__label');
 
-        var html = '';
+        let html = '';
 
         html += '<div class="mdl-radio__circles">';
 
@@ -76,4 +79,5 @@ define(['layoutManager', 'css!./emby-radio', 'registerElement'], function (layou
         prototype: EmbyRadioPrototype,
         extends: 'input'
     });
-});
+
+/* eslint-enable indent */
diff --git a/src/elements/emby-ratingbutton/emby-ratingbutton.js b/src/elements/emby-ratingbutton/emby-ratingbutton.js
index 142920ca15..b455495a2e 100644
--- a/src/elements/emby-ratingbutton/emby-ratingbutton.js
+++ b/src/elements/emby-ratingbutton/emby-ratingbutton.js
@@ -1,16 +1,21 @@
-define(['connectionManager', 'serverNotifications', 'events', 'globalize', 'emby-button'], function (connectionManager, serverNotifications, events, globalize, EmbyButtonPrototype) {
-    'use strict';
+import connectionManager from 'connectionManager';
+import serverNotifications from 'serverNotifications';
+import events from 'events';
+import globalize from 'globalize';
+import EmbyButtonPrototype from 'emby-button';
+
+/* eslint-disable indent */
 
     function addNotificationEvent(instance, name, handler) {
 
-        var localHandler = handler.bind(instance);
+        const localHandler = handler.bind(instance);
         events.on(serverNotifications, name, localHandler);
         instance[name] = localHandler;
     }
 
     function removeNotificationEvent(instance, name) {
 
-        var handler = instance[name];
+        const handler = instance[name];
         if (handler) {
             events.off(serverNotifications, name, handler);
             instance[name] = null;
@@ -24,13 +29,13 @@ define(['connectionManager', 'serverNotifications', 'events', 'globalize', 'emby
 
     function onClick(e) {
 
-        var button = this;
-        var id = button.getAttribute('data-id');
-        var serverId = button.getAttribute('data-serverid');
-        var apiClient = connectionManager.getApiClient(serverId);
+        const button = this;
+        const id = button.getAttribute('data-id');
+        const serverId = button.getAttribute('data-serverid');
+        const apiClient = connectionManager.getApiClient(serverId);
 
-        var likes = this.getAttribute('data-likes');
-        var isFavorite = this.getAttribute('data-isfavorite') === 'true';
+        let likes = this.getAttribute('data-likes');
+        const isFavorite = this.getAttribute('data-isfavorite') === 'true';
         if (likes === 'true') {
             likes = true;
         } else if (likes === 'false') {
@@ -47,7 +52,7 @@ define(['connectionManager', 'serverNotifications', 'events', 'globalize', 'emby
 
     function onUserDataChanged(e, apiClient, userData) {
 
-        var button = this;
+        const button = this;
 
         if (userData.ItemId === button.getAttribute('data-id')) {
 
@@ -57,7 +62,7 @@ define(['connectionManager', 'serverNotifications', 'events', 'globalize', 'emby
 
     function setState(button, likes, isFavorite, updateAttribute) {
 
-        var icon = button.querySelector('.material-icons');
+        const icon = button.querySelector('.material-icons');
 
         if (isFavorite) {
 
@@ -106,7 +111,7 @@ define(['connectionManager', 'serverNotifications', 'events', 'globalize', 'emby
     function setTitle(button) {
         button.title = globalize.translate('Favorite');
 
-        var text = button.querySelector('.button-text');
+        const text = button.querySelector('.button-text');
         if (text) {
             text.innerHTML = button.title;
         }
@@ -126,7 +131,7 @@ define(['connectionManager', 'serverNotifications', 'events', 'globalize', 'emby
         addNotificationEvent(button, 'UserDataChanged', onUserDataChanged);
     }
 
-    var EmbyRatingButtonPrototype = Object.create(EmbyButtonPrototype);
+    const EmbyRatingButtonPrototype = Object.create(EmbyButtonPrototype);
 
     EmbyRatingButtonPrototype.createdCallback = function () {
 
@@ -143,12 +148,12 @@ define(['connectionManager', 'serverNotifications', 'events', 'globalize', 'emby
             EmbyButtonPrototype.attachedCallback.call(this);
         }
 
-        var itemId = this.getAttribute('data-id');
-        var serverId = this.getAttribute('data-serverid');
+        const itemId = this.getAttribute('data-id');
+        const serverId = this.getAttribute('data-serverid');
         if (itemId && serverId) {
 
-            var likes = this.getAttribute('data-likes');
-            var isFavorite = this.getAttribute('data-isfavorite') === 'true';
+            let likes = this.getAttribute('data-likes');
+            const isFavorite = this.getAttribute('data-isfavorite') === 'true';
             if (likes === 'true') {
                 likes = true;
             } else if (likes === 'false') {
@@ -181,7 +186,7 @@ define(['connectionManager', 'serverNotifications', 'events', 'globalize', 'emby
             this.setAttribute('data-id', item.Id);
             this.setAttribute('data-serverid', item.ServerId);
 
-            var userData = item.UserData || {};
+            const userData = item.UserData || {};
             setState(this, userData.Likes, userData.IsFavorite);
             bindEvents(this);
 
@@ -199,4 +204,5 @@ define(['connectionManager', 'serverNotifications', 'events', 'globalize', 'emby
         prototype: EmbyRatingButtonPrototype,
         extends: 'button'
     });
-});
+
+/* eslint-enable indent */
diff --git a/src/elements/emby-scrollbuttons/emby-scrollbuttons.css b/src/elements/emby-scrollbuttons/emby-scrollbuttons.css
index b2e0d3bc23..5af739bac1 100644
--- a/src/elements/emby-scrollbuttons/emby-scrollbuttons.css
+++ b/src/elements/emby-scrollbuttons/emby-scrollbuttons.css
@@ -6,7 +6,7 @@
     justify-content: center;
     min-width: 104px;
     min-height: 24px;
-    padding-top: 1.25em;
+    padding-top: 0.85em;
     z-index: 1;
     color: #fff;
     display: flex;
diff --git a/src/elements/emby-scrollbuttons/emby-scrollbuttons.js b/src/elements/emby-scrollbuttons/emby-scrollbuttons.js
index a4c37384c8..239fbcfcda 100644
--- a/src/elements/emby-scrollbuttons/emby-scrollbuttons.js
+++ b/src/elements/emby-scrollbuttons/emby-scrollbuttons.js
@@ -1,13 +1,16 @@
-define(['layoutManager', 'dom', 'css!./emby-scrollbuttons', 'registerElement', 'paper-icon-button-light'], function (layoutManager, dom) {
-    'use strict';
+import 'css!./emby-scrollbuttons';
+import 'webcomponents';
+import 'paper-icon-button-light';
 
-    var EmbyScrollButtonsPrototype = Object.create(HTMLDivElement.prototype);
+/* eslint-disable indent */
+
+const EmbyScrollButtonsPrototype = Object.create(HTMLDivElement.prototype);
 
     EmbyScrollButtonsPrototype.createdCallback = function () {};
 
     function getScrollButtonHtml(direction) {
-        var html = '';
-        var icon = direction === 'left' ? 'chevron_left' : 'chevron_right';
+        let html = '';
+        const icon = direction === 'left' ? 'chevron_left' : 'chevron_right';
 
         html += '<button type="button" is="paper-icon-button-light" data-ripple="false" data-direction="' + direction + '" class="emby-scrollbuttons-button">';
         html += '<span class="material-icons ' + icon + '"></span>';
@@ -45,7 +48,7 @@ define(['layoutManager', 'dom', 'css!./emby-scrollbuttons', 'registerElement', '
             scrollButtons.scrollButtonsLeft.disabled = true;
         }
 
-        var scrollPosEnd = scrollPos + scrollSize;
+        const scrollPosEnd = scrollPos + scrollSize;
         if (scrollWidth > 0 && scrollPosEnd >= scrollWidth) {
             scrollButtons.scrollButtonsRight.disabled = true;
         } else {
@@ -54,18 +57,18 @@ define(['layoutManager', 'dom', 'css!./emby-scrollbuttons', 'registerElement', '
     }
 
     function onScroll(e) {
-        var scrollButtons = this;
-        var scroller = this.scroller;
+        const scrollButtons = this;
+        const scroller = this.scroller;
 
-        var scrollSize = getScrollSize(scroller);
-        var scrollPos = getScrollPosition(scroller);
-        var scrollWidth = getScrollWidth(scroller);
+        const scrollSize = getScrollSize(scroller);
+        const scrollPos = getScrollPosition(scroller);
+        const scrollWidth = getScrollWidth(scroller);
 
         updateScrollButtons(scrollButtons, scrollSize, scrollPos, scrollWidth);
     }
 
     function getStyleValue(style, name) {
-        var value = style.getPropertyValue(name);
+        let value = style.getPropertyValue(name);
         if (!value) {
             return 0;
         }
@@ -84,20 +87,20 @@ define(['layoutManager', 'dom', 'css!./emby-scrollbuttons', 'registerElement', '
     }
 
     function getScrollSize(elem) {
-        var scrollSize = elem.offsetWidth;
-        var style = window.getComputedStyle(elem, null);
+        let scrollSize = elem.offsetWidth;
+        let style = window.getComputedStyle(elem, null);
 
-        var paddingLeft = getStyleValue(style, 'padding-left');
+        let paddingLeft = getStyleValue(style, 'padding-left');
         if (paddingLeft) {
             scrollSize -= paddingLeft;
         }
 
-        var paddingRight = getStyleValue(style, 'padding-right');
+        let paddingRight = getStyleValue(style, 'padding-right');
         if (paddingRight) {
             scrollSize -= paddingRight;
         }
 
-        var slider = elem.getScrollSlider();
+        const slider = elem.getScrollSlider();
         style = window.getComputedStyle(slider, null);
 
         paddingLeft = getStyleValue(style, 'padding-left');
@@ -114,14 +117,14 @@ define(['layoutManager', 'dom', 'css!./emby-scrollbuttons', 'registerElement', '
     }
 
     function onScrollButtonClick(e) {
-        var scroller = this.parentNode.nextSibling;
+        let scroller = this.parentNode.nextSibling;
 
-        var direction = this.getAttribute('data-direction');
-        var scrollSize = getScrollSize(scroller);
-        var scrollPos = getScrollPosition(scroller);
-        var scrollWidth = getScrollWidth(scroller);
+        const direction = this.getAttribute('data-direction');
+        const scrollSize = getScrollSize(scroller);
+        const scrollPos = getScrollPosition(scroller);
+        const scrollWidth = getScrollWidth(scroller);
 
-        var newPos;
+        let newPos;
         if (direction === 'left') {
             newPos = Math.max(0, scrollPos - scrollSize);
         } else {
@@ -132,21 +135,21 @@ define(['layoutManager', 'dom', 'css!./emby-scrollbuttons', 'registerElement', '
     }
 
     EmbyScrollButtonsPrototype.attachedCallback = function () {
-        var scroller = this.nextSibling;
+        const scroller = this.nextSibling;
         this.scroller = scroller;
 
-        var parent = this.parentNode;
+        const parent = this.parentNode;
         parent.classList.add('emby-scroller-container');
 
         this.innerHTML = getScrollButtonHtml('left') + getScrollButtonHtml('right');
 
-        var buttons = this.querySelectorAll('.emby-scrollbuttons-button');
+        const buttons = this.querySelectorAll('.emby-scrollbuttons-button');
         buttons[0].addEventListener('click', onScrollButtonClick);
         buttons[1].addEventListener('click', onScrollButtonClick);
         this.scrollButtonsLeft = buttons[0];
         this.scrollButtonsRight = buttons[1];
 
-        var scrollHandler = onScroll.bind(this);
+        const scrollHandler = onScroll.bind(this);
         this.scrollHandler = scrollHandler;
         scroller.addScrollEventListener(scrollHandler, {
             capture: false,
@@ -155,10 +158,10 @@ define(['layoutManager', 'dom', 'css!./emby-scrollbuttons', 'registerElement', '
     };
 
     EmbyScrollButtonsPrototype.detachedCallback = function () {
-        var parent = this.scroller;
+        const parent = this.scroller;
         this.scroller = null;
 
-        var scrollHandler = this.scrollHandler;
+        let scrollHandler = this.scrollHandler;
         if (parent && scrollHandler) {
             parent.removeScrollEventListener(scrollHandler, {
                 capture: false,
@@ -175,4 +178,5 @@ define(['layoutManager', 'dom', 'css!./emby-scrollbuttons', 'registerElement', '
         prototype: EmbyScrollButtonsPrototype,
         extends: 'div'
     });
-});
+
+/* eslint-enable indent */
diff --git a/src/elements/emby-scroller/emby-scroller.js b/src/elements/emby-scroller/emby-scroller.js
index 3df40fa6c2..fb903d839c 100644
--- a/src/elements/emby-scroller/emby-scroller.js
+++ b/src/elements/emby-scroller/emby-scroller.js
@@ -1,7 +1,15 @@
-define(['scroller', 'dom', 'layoutManager', 'inputManager', 'focusManager', 'browser', 'registerElement', 'css!./emby-scroller'], function (scroller, dom, layoutManager, inputManager, focusManager, browser) {
-    'use strict';
+import scroller from 'scroller';
+import dom from 'dom';
+import layoutManager from 'layoutManager';
+import inputManager from 'inputManager';
+import focusManager from 'focusManager';
+import browser from 'browser';
+import 'webcomponents';
+import 'css!./emby-scroller';
 
-    var ScrollerPrototype = Object.create(HTMLDivElement.prototype);
+/* eslint-disable indent */
+
+    let ScrollerPrototype = Object.create(HTMLDivElement.prototype);
 
     ScrollerPrototype.createdCallback = function () {
         this.classList.add('emby-scroller');
@@ -9,7 +17,7 @@ define(['scroller', 'dom', 'layoutManager', 'inputManager', 'focusManager', 'bro
 
     function initCenterFocus(elem, scrollerInstance) {
         dom.addEventListener(elem, 'focus', function (e) {
-            var focused = focusManager.focusableParent(e.target);
+            const focused = focusManager.focusableParent(e.target);
             if (focused) {
                 scrollerInstance.toCenter(focused);
             }
@@ -80,7 +88,7 @@ define(['scroller', 'dom', 'layoutManager', 'inputManager', 'focusManager', 'bro
     };
 
     function onInputCommand(e) {
-        var cmd = e.detail.command;
+        const cmd = e.detail.command;
         if (cmd === 'end') {
             focusManager.focusLast(this, '.' + this.getAttribute('data-navcommands'));
             e.preventDefault();
@@ -101,18 +109,18 @@ define(['scroller', 'dom', 'layoutManager', 'inputManager', 'focusManager', 'bro
             inputManager.on(this, onInputCommand);
         }
 
-        var horizontal = this.getAttribute('data-horizontal') !== 'false';
+        const horizontal = this.getAttribute('data-horizontal') !== 'false';
 
-        var slider = this.querySelector('.scrollSlider');
+        const slider = this.querySelector('.scrollSlider');
 
         if (horizontal) {
             slider.style['white-space'] = 'nowrap';
         }
 
-        var scrollFrame = this;
-        var enableScrollButtons = layoutManager.desktop && horizontal && this.getAttribute('data-scrollbuttons') !== 'false';
+        const scrollFrame = this;
+        const enableScrollButtons = layoutManager.desktop && horizontal && this.getAttribute('data-scrollbuttons') !== 'false';
 
-        var options = {
+        const options = {
             horizontal: horizontal,
             mouseDragging: 1,
             mouseWheel: this.getAttribute('data-mousewheel') !== 'false',
@@ -148,20 +156,20 @@ define(['scroller', 'dom', 'layoutManager', 'inputManager', 'focusManager', 'bro
     };
 
     function loadScrollButtons(scroller) {
-        require(['emby-scrollbuttons'], function () {
+        import('emby-scrollbuttons').then(() => {
             scroller.insertAdjacentHTML('beforebegin', '<div is="emby-scrollbuttons" class="emby-scrollbuttons padded-right"></div>');
         });
     }
 
     ScrollerPrototype.pause = function () {
-        var headroom = this.headroom;
+        const headroom = this.headroom;
         if (headroom) {
             headroom.pause();
         }
     };
 
     ScrollerPrototype.resume = function () {
-        var headroom = this.headroom;
+        const headroom = this.headroom;
         if (headroom) {
             headroom.resume();
         }
@@ -172,13 +180,13 @@ define(['scroller', 'dom', 'layoutManager', 'inputManager', 'focusManager', 'bro
             inputManager.off(this, onInputCommand);
         }
 
-        var headroom = this.headroom;
+        const headroom = this.headroom;
         if (headroom) {
             headroom.destroy();
             this.headroom = null;
         }
 
-        var scrollerInstance = this.scroller;
+        const scrollerInstance = this.scroller;
         if (scrollerInstance) {
             scrollerInstance.destroy();
             this.scroller = null;
@@ -189,4 +197,5 @@ define(['scroller', 'dom', 'layoutManager', 'inputManager', 'focusManager', 'bro
         prototype: ScrollerPrototype,
         extends: 'div'
     });
-});
+
+/* eslint-enable indent */
diff --git a/src/elements/emby-select/emby-select.js b/src/elements/emby-select/emby-select.js
index 2716967560..d45e7ef7a7 100644
--- a/src/elements/emby-select/emby-select.js
+++ b/src/elements/emby-select/emby-select.js
@@ -1,7 +1,12 @@
-define(['layoutManager', 'browser', 'actionsheet', 'css!./emby-select', 'registerElement'], function (layoutManager, browser, actionsheet) {
-    'use strict';
+import layoutManager from 'layoutManager';
+import browser from 'browser';
+import actionsheet from 'actionsheet';
+import 'css!./emby-select';
+import 'webcomponents';
 
-    var EmbySelectPrototype = Object.create(HTMLSelectElement.prototype);
+/* eslint-disable indent */
+
+    const EmbySelectPrototype = Object.create(HTMLSelectElement.prototype);
 
     function enableNativeMenu() {
 
@@ -27,7 +32,7 @@ define(['layoutManager', 'browser', 'actionsheet', 'css!./emby-select', 'registe
     }
 
     function triggerChange(select) {
-        var evt = document.createEvent('HTMLEvents');
+        const evt = document.createEvent('HTMLEvents');
         evt.initEvent('change', false, true);
         select.dispatchEvent(evt);
     }
@@ -39,8 +44,8 @@ define(['layoutManager', 'browser', 'actionsheet', 'css!./emby-select', 'registe
 
     function showActionSheet(select) {
 
-        var labelElem = getLabel(select);
-        var title = labelElem ? (labelElem.textContent || labelElem.innerText) : null;
+        const labelElem = getLabel(select);
+        const title = labelElem ? (labelElem.textContent || labelElem.innerText) : null;
 
         actionsheet.show({
             items: select.options,
@@ -54,7 +59,7 @@ define(['layoutManager', 'browser', 'actionsheet', 'css!./emby-select', 'registe
     }
 
     function getLabel(select) {
-        var elem = select.previousSibling;
+        let elem = select.previousSibling;
         while (elem && elem.tagName !== 'LABEL') {
             elem = elem.previousSibling;
         }
@@ -62,21 +67,20 @@ define(['layoutManager', 'browser', 'actionsheet', 'css!./emby-select', 'registe
     }
 
     function onFocus(e) {
-        var label = getLabel(this);
+        const label = getLabel(this);
         if (label) {
             label.classList.add('selectLabelFocused');
         }
     }
 
     function onBlur(e) {
-        var label = getLabel(this);
+        const label = getLabel(this);
         if (label) {
             label.classList.remove('selectLabelFocused');
         }
     }
 
     function onMouseDown(e) {
-
         // e.button=0 for primary (left) mouse button click
         if (!e.button && !enableNativeMenu()) {
             e.preventDefault();
@@ -85,9 +89,7 @@ define(['layoutManager', 'browser', 'actionsheet', 'css!./emby-select', 'registe
     }
 
     function onKeyDown(e) {
-
         switch (e.keyCode) {
-
             case 13:
                 if (!enableNativeMenu()) {
                     e.preventDefault();
@@ -107,7 +109,7 @@ define(['layoutManager', 'browser', 'actionsheet', 'css!./emby-select', 'registe
         }
     }
 
-    var inputId = 0;
+    let inputId = 0;
 
     EmbySelectPrototype.createdCallback = function () {
 
@@ -137,7 +139,7 @@ define(['layoutManager', 'browser', 'actionsheet', 'css!./emby-select', 'registe
 
         this.classList.add('emby-select');
 
-        var label = this.ownerDocument.createElement('label');
+        const label = this.ownerDocument.createElement('label');
         label.innerHTML = this.getAttribute('label') || '';
         label.classList.add('selectLabel');
         label.htmlFor = this.id;
@@ -150,7 +152,7 @@ define(['layoutManager', 'browser', 'actionsheet', 'css!./emby-select', 'registe
 
     EmbySelectPrototype.setLabel = function (text) {
 
-        var label = this.parentNode.querySelector('label');
+        const label = this.parentNode.querySelector('label');
 
         label.innerHTML = text;
     };
@@ -159,4 +161,5 @@ define(['layoutManager', 'browser', 'actionsheet', 'css!./emby-select', 'registe
         prototype: EmbySelectPrototype,
         extends: 'select'
     });
-});
+
+/* eslint-enable indent */
diff --git a/src/elements/emby-slider/emby-slider.js b/src/elements/emby-slider/emby-slider.js
index e37455dfe1..e872f6c78b 100644
--- a/src/elements/emby-slider/emby-slider.js
+++ b/src/elements/emby-slider/emby-slider.js
@@ -1,15 +1,22 @@
-define(['browser', 'dom', 'layoutManager', 'keyboardnavigation', 'css!./emby-slider', 'registerElement', 'emby-input'], function (browser, dom, layoutManager, keyboardnavigation) {
-    'use strict';
+import browser from 'browser';
+import dom from 'dom';
+import layoutManager from 'layoutManager';
+import keyboardnavigation from 'keyboardnavigation';
+import 'css!./emby-slider';
+import 'webcomponents';
+import 'emby-input';
 
-    var EmbySliderPrototype = Object.create(HTMLInputElement.prototype);
+/* eslint-disable indent */
 
-    var supportsValueSetOverride = false;
+    let EmbySliderPrototype = Object.create(HTMLInputElement.prototype);
 
-    var enableWidthWithTransform;
+    let supportsValueSetOverride = false;
+
+    let enableWidthWithTransform;
 
     if (Object.getOwnPropertyDescriptor && Object.defineProperty) {
 
-        var descriptor = Object.getOwnPropertyDescriptor(HTMLInputElement.prototype, 'value');
+        const descriptor = Object.getOwnPropertyDescriptor(HTMLInputElement.prototype, 'value');
         // descriptor returning null in webos
         if (descriptor && descriptor.configurable) {
             supportsValueSetOverride = true;
@@ -24,14 +31,14 @@ define(['browser', 'dom', 'layoutManager', 'keyboardnavigation', 'css!./emby-sli
      * @return {number} slider fraction
      */
     function mapClientToFraction(range, clientX) {
-        var rect = range.sliderBubbleTrack.getBoundingClientRect();
+        const rect = range.sliderBubbleTrack.getBoundingClientRect();
 
-        var fraction = (clientX - rect.left) / rect.width;
+        let fraction = (clientX - rect.left) / rect.width;
 
         // Snap to step
-        var valueRange = range.max - range.min;
+        const valueRange = range.max - range.min;
         if (range.step !== 'any' && valueRange !== 0) {
-            var step = (range.step || 1) / valueRange;
+            const step = (range.step || 1) / valueRange;
             fraction = Math.round(fraction / step) * step;
         }
 
@@ -46,7 +53,7 @@ define(['browser', 'dom', 'layoutManager', 'keyboardnavigation', 'css!./emby-sli
      * @return {number} slider value
      */
     function mapFractionToValue(range, fraction) {
-        var value = (range.max - range.min) * fraction;
+        let value = (range.max - range.min) * fraction;
 
         // Snap to step
         if (range.step !== 'any') {
@@ -67,8 +74,8 @@ define(['browser', 'dom', 'layoutManager', 'keyboardnavigation', 'css!./emby-sli
      * @return {number} slider fraction
      */
     function mapValueToFraction(range, value) {
-        var valueRange = range.max - range.min;
-        var fraction = valueRange !== 0 ? (value - range.min) / valueRange : 0;
+        const valueRange = range.max - range.min;
+        const fraction = valueRange !== 0 ? (value - range.min) / valueRange : 0;
         return Math.min(Math.max(fraction, 0), 1);
     }
 
@@ -84,18 +91,18 @@ define(['browser', 'dom', 'layoutManager', 'keyboardnavigation', 'css!./emby-sli
             return;
         }
 
-        var range = this;
-        var value = range.value;
+        const range = this;
+        const value = range.value;
 
         // put this on a callback. Doing it within the event sometimes causes the slider to get hung up and not respond
         // Keep only one per slider frame request
         cancelAnimationFrame(range.updateValuesFrame);
         range.updateValuesFrame = requestAnimationFrame(function () {
 
-            var backgroundLower = range.backgroundLower;
+            let backgroundLower = range.backgroundLower;
 
             if (backgroundLower) {
-                var fraction = (value - range.min) / (range.max - range.min);
+                let fraction = (value - range.min) / (range.max - range.min);
 
                 if (enableWidthWithTransform) {
                     backgroundLower.style.transform = 'scaleX(' + (fraction) + ')';
@@ -110,10 +117,10 @@ define(['browser', 'dom', 'layoutManager', 'keyboardnavigation', 'css!./emby-sli
     function updateBubble(range, value, bubble, bubbleText) {
 
         requestAnimationFrame(function () {
-            var bubbleTrackRect = range.sliderBubbleTrack.getBoundingClientRect();
-            var bubbleRect = bubble.getBoundingClientRect();
+            const bubbleTrackRect = range.sliderBubbleTrack.getBoundingClientRect();
+            const bubbleRect = bubble.getBoundingClientRect();
 
-            var bubblePos = bubbleTrackRect.width * value / 100;
+            let bubblePos = bubbleTrackRect.width * value / 100;
             bubblePos = Math.min(Math.max(bubblePos, bubbleRect.width / 2), bubbleTrackRect.width - bubbleRect.width / 2);
 
             bubble.style.left = bubblePos + 'px';
@@ -148,7 +155,7 @@ define(['browser', 'dom', 'layoutManager', 'keyboardnavigation', 'css!./emby-sli
         this.classList.add('mdl-slider');
         this.classList.add('mdl-js-slider');
 
-        if (browser.edge || browser.msie) {
+        if (browser.edge) {
             this.classList.add('slider-browser-edge');
         }
         if (!layoutManager.mobile) {
@@ -158,10 +165,10 @@ define(['browser', 'dom', 'layoutManager', 'keyboardnavigation', 'css!./emby-sli
             this.classList.add('show-focus');
         }
 
-        var containerElement = this.parentNode;
+        const containerElement = this.parentNode;
         containerElement.classList.add('mdl-slider-container');
 
-        var htmlToInsert = '';
+        let htmlToInsert = '';
 
         htmlToInsert += '<div class="mdl-slider-background-flex-container">';
         htmlToInsert += '<div class="mdl-slider-background-flex">';
@@ -187,9 +194,9 @@ define(['browser', 'dom', 'layoutManager', 'keyboardnavigation', 'css!./emby-sli
         this.sliderBubbleTrack = containerElement.querySelector('.sliderBubbleTrack');
         this.backgroundLower = containerElement.querySelector('.mdl-slider-background-lower');
         this.backgroundUpper = containerElement.querySelector('.mdl-slider-background-upper');
-        var sliderBubble = containerElement.querySelector('.sliderBubble');
+        const sliderBubble = containerElement.querySelector('.sliderBubble');
 
-        var hasHideClass = sliderBubble.classList.contains('hide');
+        let hasHideClass = sliderBubble.classList.contains('hide');
 
         dom.addEventListener(this, 'input', function (e) {
             this.dragging = true;
@@ -198,7 +205,7 @@ define(['browser', 'dom', 'layoutManager', 'keyboardnavigation', 'css!./emby-sli
                 updateValues.call(this);
             }
 
-            var bubbleValue = mapValueToFraction(this, this.value) * 100;
+            const bubbleValue = mapValueToFraction(this, this.value) * 100;
             updateBubble(this, bubbleValue, sliderBubble);
 
             if (hasHideClass) {
@@ -223,10 +230,11 @@ define(['browser', 'dom', 'layoutManager', 'keyboardnavigation', 'css!./emby-sli
             passive: true
         });
 
+        /* eslint-disable-next-line compat/compat */
         dom.addEventListener(this, (window.PointerEvent ? 'pointermove' : 'mousemove'), function (e) {
 
             if (!this.dragging) {
-                var bubbleValue = mapClientToFraction(this, e.clientX) * 100;
+                const bubbleValue = mapClientToFraction(this, e.clientX) * 100;
 
                 updateBubble(this, bubbleValue, sliderBubble);
 
@@ -240,6 +248,7 @@ define(['browser', 'dom', 'layoutManager', 'keyboardnavigation', 'css!./emby-sli
             passive: true
         });
 
+        /* eslint-disable-next-line compat/compat */
         dom.addEventListener(this, (window.PointerEvent ? 'pointerleave' : 'mouseleave'), function () {
             sliderBubble.classList.add('hide');
             hasHideClass = true;
@@ -256,7 +265,7 @@ define(['browser', 'dom', 'layoutManager', 'keyboardnavigation', 'css!./emby-sli
 
                 this.touched = true;
 
-                var fraction = mapClientToFraction(this, e.targetTouches[0].clientX);
+                const fraction = mapClientToFraction(this, e.targetTouches[0].clientX);
                 this.value = mapFractionToValue(this, fraction);
 
                 this.dispatchEvent(new Event('input', {
@@ -276,7 +285,7 @@ define(['browser', 'dom', 'layoutManager', 'keyboardnavigation', 'css!./emby-sli
                     return;
                 }
 
-                var fraction = mapClientToFraction(this, e.targetTouches[0].clientX);
+                const fraction = mapClientToFraction(this, e.targetTouches[0].clientX);
                 this.value = mapFractionToValue(this, fraction);
 
                 this.dispatchEvent(new Event('input', {
@@ -288,7 +297,7 @@ define(['browser', 'dom', 'layoutManager', 'keyboardnavigation', 'css!./emby-sli
             });
 
             dom.addEventListener(this, 'touchend', function (e) {
-                var range = this;
+                const range = this;
 
                 setTimeout(function () {
                     range.touched = false;
@@ -314,12 +323,12 @@ define(['browser', 'dom', 'layoutManager', 'keyboardnavigation', 'css!./emby-sli
      * Keyboard dragging timeout.
      * After this delay "change" event will be fired.
      */
-    var KeyboardDraggingTimeout = 1000;
+    const KeyboardDraggingTimeout = 1000;
 
     /**
      * Keyboard dragging timer.
      */
-    var keyboardDraggingTimer;
+    let keyboardDraggingTimer;
 
     /**
      * Start keyboard dragging.
@@ -346,7 +355,7 @@ define(['browser', 'dom', 'layoutManager', 'keyboardnavigation', 'css!./emby-sli
 
         elem.keyboardDragging = false;
 
-        var event = new Event('change', {
+        const event = new Event('change', {
             bubbles: true,
             cancelable: false
         });
@@ -364,7 +373,7 @@ define(['browser', 'dom', 'layoutManager', 'keyboardnavigation', 'css!./emby-sli
 
         elem.value = Math.max(elem.min, Math.min(elem.max, parseFloat(elem.value) + delta));
 
-        var event = new Event('input', {
+        const event = new Event('input', {
             bubbles: true,
             cancelable: false
         });
@@ -414,10 +423,10 @@ define(['browser', 'dom', 'layoutManager', 'keyboardnavigation', 'css!./emby-sli
 
     function setRange(elem, startPercent, endPercent) {
 
-        var style = elem.style;
+        const style = elem.style;
         style.left = Math.max(startPercent, 0) + '%';
 
-        var widthPercent = endPercent - startPercent;
+        const widthPercent = endPercent - startPercent;
         style.width = Math.max(Math.min(widthPercent, 100), 0) + '%';
     }
 
@@ -438,7 +447,7 @@ define(['browser', 'dom', 'layoutManager', 'keyboardnavigation', 'css!./emby-sli
 
     EmbySliderPrototype.setBufferedRanges = function (ranges, runtime, position) {
 
-        var elem = this.backgroundUpper;
+        const elem = this.backgroundUpper;
         if (!elem) {
             return;
         }
@@ -449,9 +458,7 @@ define(['browser', 'dom', 'layoutManager', 'keyboardnavigation', 'css!./emby-sli
             position = (position / runtime) * 100;
         }
 
-        for (var i = 0, length = ranges.length; i < length; i++) {
-
-            var range = ranges[i];
+        for (const range in ranges) {
 
             if (position != null) {
                 if (position >= range.end) {
@@ -468,7 +475,7 @@ define(['browser', 'dom', 'layoutManager', 'keyboardnavigation', 'css!./emby-sli
 
     EmbySliderPrototype.setIsClear = function (isClear) {
 
-        var backgroundLower = this.backgroundLower;
+        const backgroundLower = this.backgroundLower;
         if (backgroundLower) {
             if (isClear) {
                 backgroundLower.classList.add('mdl-slider-background-lower-clear');
@@ -479,7 +486,7 @@ define(['browser', 'dom', 'layoutManager', 'keyboardnavigation', 'css!./emby-sli
     };
 
     function startInterval(range) {
-        var interval = range.interval;
+        const interval = range.interval;
         if (interval) {
             clearInterval(interval);
         }
@@ -488,7 +495,7 @@ define(['browser', 'dom', 'layoutManager', 'keyboardnavigation', 'css!./emby-sli
 
     EmbySliderPrototype.detachedCallback = function () {
 
-        var interval = this.interval;
+        const interval = this.interval;
         if (interval) {
             clearInterval(interval);
         }
@@ -501,4 +508,5 @@ define(['browser', 'dom', 'layoutManager', 'keyboardnavigation', 'css!./emby-sli
         prototype: EmbySliderPrototype,
         extends: 'input'
     });
-});
+
+/* eslint-enable indent */
diff --git a/src/elements/emby-tabs/emby-tabs.css b/src/elements/emby-tabs/emby-tabs.css
index 355f904cb8..fe29f46143 100644
--- a/src/elements/emby-tabs/emby-tabs.css
+++ b/src/elements/emby-tabs/emby-tabs.css
@@ -31,11 +31,6 @@
 
 .emby-tabs-slider {
     position: relative;
-    overflow: hidden;
-}
-
-.layout-mobile .emby-tabs-slider {
-    overflow: auto;
 }
 
 .tabContent:not(.is-active) {
diff --git a/src/elements/emby-tabs/emby-tabs.js b/src/elements/emby-tabs/emby-tabs.js
index 5e03c3f096..f3cd9d38cc 100644
--- a/src/elements/emby-tabs/emby-tabs.js
+++ b/src/elements/emby-tabs/emby-tabs.js
@@ -1,9 +1,16 @@
-define(['dom', 'scroller', 'browser', 'layoutManager', 'focusManager', 'registerElement', 'css!./emby-tabs', 'scrollStyles'], function (dom, scroller, browser, layoutManager, focusManager) {
-    'use strict';
+import dom from 'dom';
+import scroller from 'scroller';
+import browser from 'browser';
+import focusManager from 'focusManager';
+import 'webcomponents';
+import 'css!./emby-tabs';
+import 'scrollStyles';
 
-    var EmbyTabs = Object.create(HTMLDivElement.prototype);
-    var buttonClass = 'emby-tab-button';
-    var activeButtonClass = buttonClass + '-active';
+/* eslint-disable indent */
+
+    let EmbyTabs = Object.create(HTMLDivElement.prototype);
+    const buttonClass = 'emby-tab-button';
+    const activeButtonClass = buttonClass + '-active';
 
     function setActiveTabButton(tabs, newButton, oldButton, animate) {
 
@@ -16,14 +23,14 @@ define(['dom', 'scroller', 'browser', 'layoutManager', 'focusManager', 'register
     }
 
     function removeActivePanelClass(tabs, index) {
-        var tabPanel = getTabPanel(tabs, index);
+        let tabPanel = getTabPanel(tabs, index);
         if (tabPanel) {
             tabPanel.classList.remove('is-active');
         }
     }
 
     function addActivePanelClass(tabs, index) {
-        var tabPanel = getTabPanel(tabs, index);
+        let tabPanel = getTabPanel(tabs, index);
         if (tabPanel) {
             tabPanel.classList.add('is-active');
         }
@@ -31,9 +38,9 @@ define(['dom', 'scroller', 'browser', 'layoutManager', 'focusManager', 'register
 
     function fadeInRight(elem) {
 
-        var pct = browser.mobile ? '4%' : '0.5%';
+        const pct = browser.mobile ? '4%' : '0.5%';
 
-        var keyframes = [
+        const keyframes = [
             { opacity: '0', transform: 'translate3d(' + pct + ', 0, 0)', offset: 0 },
             { opacity: '1', transform: 'none', offset: 1 }];
 
@@ -56,7 +63,7 @@ define(['dom', 'scroller', 'browser', 'layoutManager', 'focusManager', 'register
             removeActivePanelClass(tabs, previousIndex);
         }
 
-        var newPanel = getTabPanel(tabs, index);
+        let newPanel = getTabPanel(tabs, index);
 
         if (newPanel) {
             // animate new panel ?
@@ -70,10 +77,10 @@ define(['dom', 'scroller', 'browser', 'layoutManager', 'focusManager', 'register
 
     function onClick(e) {
 
-        var tabs = this;
+        const tabs = this;
 
-        var current = tabs.querySelector('.' + activeButtonClass);
-        var tabButton = dom.parentWithClass(e.target, buttonClass);
+        const current = tabs.querySelector('.' + activeButtonClass);
+        const tabButton = dom.parentWithClass(e.target, buttonClass);
 
         if (tabButton && tabButton !== current) {
 
@@ -81,11 +88,11 @@ define(['dom', 'scroller', 'browser', 'layoutManager', 'focusManager', 'register
                 current.classList.remove(activeButtonClass);
             }
 
-            var previousIndex = current ? parseInt(current.getAttribute('data-index')) : null;
+            const previousIndex = current ? parseInt(current.getAttribute('data-index')) : null;
 
             setActiveTabButton(tabs, tabButton, current, true);
 
-            var index = parseInt(tabButton.getAttribute('data-index'));
+            const index = parseInt(tabButton.getAttribute('data-index'));
 
             triggerBeforeTabChange(tabs, index, previousIndex);
 
@@ -115,7 +122,7 @@ define(['dom', 'scroller', 'browser', 'layoutManager', 'focusManager', 'register
             return;
         }
 
-        var contentScrollSlider = tabs.querySelector('.emby-tabs-slider');
+        const contentScrollSlider = tabs.querySelector('.emby-tabs-slider');
         if (contentScrollSlider) {
             tabs.scroller = new scroller(tabs, {
                 horizontal: 1,
@@ -160,7 +167,7 @@ define(['dom', 'scroller', 'browser', 'layoutManager', 'focusManager', 'register
 
     EmbyTabs.focus = function () {
 
-        var selected = this.querySelector('.' + activeButtonClass);
+        const selected = this.querySelector('.' + activeButtonClass);
 
         if (selected) {
             focusManager.focus(selected);
@@ -180,16 +187,16 @@ define(['dom', 'scroller', 'browser', 'layoutManager', 'focusManager', 'register
 
         initScroller(this);
 
-        var current = this.querySelector('.' + activeButtonClass);
-        var currentIndex = current ? parseInt(current.getAttribute('data-index')) : parseInt(this.getAttribute('data-index') || '0');
+        const current = this.querySelector('.' + activeButtonClass);
+        const currentIndex = current ? parseInt(current.getAttribute('data-index')) : parseInt(this.getAttribute('data-index') || '0');
 
         if (currentIndex !== -1) {
 
             this.selectedTabIndex = currentIndex;
 
-            var tabButtons = this.querySelectorAll('.' + buttonClass);
+            const tabButtons = this.querySelectorAll('.' + buttonClass);
 
-            var newTabButton = tabButtons[currentIndex];
+            const newTabButton = tabButtons[currentIndex];
 
             if (newTabButton) {
                 setActiveTabButton(this, newTabButton, current, false);
@@ -221,18 +228,18 @@ define(['dom', 'scroller', 'browser', 'layoutManager', 'focusManager', 'register
 
     EmbyTabs.selectedIndex = function (selected, triggerEvent) {
 
-        var tabs = this;
+        const tabs = this;
 
         if (selected == null) {
 
             return tabs.selectedTabIndex || 0;
         }
 
-        var current = tabs.selectedIndex();
+        const current = tabs.selectedIndex();
 
         tabs.selectedTabIndex = selected;
 
-        var tabButtons = tabs.querySelectorAll('.' + buttonClass);
+        const tabButtons = tabs.querySelectorAll('.' + buttonClass);
 
         if (current === selected || triggerEvent === false) {
 
@@ -244,7 +251,7 @@ define(['dom', 'scroller', 'browser', 'layoutManager', 'focusManager', 'register
                 }
             }));
 
-            var currentTabButton = tabButtons[current];
+            let currentTabButton = tabButtons[current];
             setActiveTabButton(tabs, tabButtons[selected], currentTabButton, false);
 
             if (current !== selected && currentTabButton) {
@@ -262,7 +269,7 @@ define(['dom', 'scroller', 'browser', 'layoutManager', 'focusManager', 'register
 
     function getSibling(elem, method) {
 
-        var sibling = elem[method];
+        let sibling = elem[method];
 
         while (sibling) {
             if (sibling.classList.contains(buttonClass)) {
@@ -280,9 +287,9 @@ define(['dom', 'scroller', 'browser', 'layoutManager', 'focusManager', 'register
 
     EmbyTabs.selectNext = function () {
 
-        var current = getSelectedTabButton(this);
+        const current = getSelectedTabButton(this);
 
-        var sibling = getSibling(current, 'nextSibling');
+        const sibling = getSibling(current, 'nextSibling');
 
         if (sibling) {
             onClick.call(this, {
@@ -293,9 +300,9 @@ define(['dom', 'scroller', 'browser', 'layoutManager', 'focusManager', 'register
 
     EmbyTabs.selectPrevious = function () {
 
-        var current = getSelectedTabButton(this);
+        const current = getSelectedTabButton(this);
 
-        var sibling = getSibling(current, 'previousSibling');
+        const sibling = getSibling(current, 'previousSibling');
 
         if (sibling) {
             onClick.call(this, {
@@ -306,14 +313,14 @@ define(['dom', 'scroller', 'browser', 'layoutManager', 'focusManager', 'register
 
     EmbyTabs.triggerBeforeTabChange = function (selected) {
 
-        var tabs = this;
+        const tabs = this;
 
         triggerBeforeTabChange(tabs, tabs.selectedIndex());
     };
 
     EmbyTabs.triggerTabChange = function (selected) {
 
-        var tabs = this;
+        const tabs = this;
 
         tabs.dispatchEvent(new CustomEvent('tabchange', {
             detail: {
@@ -324,8 +331,8 @@ define(['dom', 'scroller', 'browser', 'layoutManager', 'focusManager', 'register
 
     EmbyTabs.setTabEnabled = function (index, enabled) {
 
-        var tabs = this;
-        var btn = this.querySelector('.emby-tab-button[data-index="' + index + '"]');
+        const tabs = this;
+        const btn = this.querySelector('.emby-tab-button[data-index="' + index + '"]');
 
         if (enabled) {
             btn.classList.remove('hide');
@@ -338,4 +345,5 @@ define(['dom', 'scroller', 'browser', 'layoutManager', 'focusManager', 'register
         prototype: EmbyTabs,
         extends: 'div'
     });
-});
+
+/* eslint-enable indent */
diff --git a/src/elements/emby-textarea/emby-textarea.js b/src/elements/emby-textarea/emby-textarea.js
index e0ce77aa51..d98cc8c07e 100644
--- a/src/elements/emby-textarea/emby-textarea.js
+++ b/src/elements/emby-textarea/emby-textarea.js
@@ -1,8 +1,11 @@
-define(['layoutManager', 'browser', 'css!./emby-textarea', 'registerElement', 'emby-input'], function (layoutManager, browser) {
-    'use strict';
+import 'css!./emby-textarea';
+import 'webcomponents';
+import 'emby-input';
+
+/* eslint-disable indent */
 
     function autoGrow(textarea, maxLines) {
-        var self = this;
+        const self = this;
 
         if (maxLines === undefined) {
             maxLines = 999;
@@ -14,17 +17,17 @@ define(['layoutManager', 'browser', 'css!./emby-textarea', 'registerElement', 'e
          * @returns {number}
          */
         self.getOffset = function (textarea) {
-            var style = window.getComputedStyle(textarea, null);
-            var props = ['paddingTop', 'paddingBottom'];
-            var offset = 0;
+            const style = window.getComputedStyle(textarea, null);
+            const props = ['paddingTop', 'paddingBottom'];
+            let offset = 0;
 
-            for (var i = 0; i < props.length; i++) {
+            for (let i = 0; i < props.length; i++) {
                 offset += parseInt(style[props[i]]);
             }
             return offset;
         };
 
-        var offset;
+        let offset;
         function reset() {
             textarea.rows = 1;
             offset = self.getOffset(textarea);
@@ -43,8 +46,8 @@ define(['layoutManager', 'browser', 'css!./emby-textarea', 'registerElement', 'e
                 textarea.rows = 3;
                 return;
             }
-            var newHeight = 0;
-            var hasGrown = false;
+            let newHeight = 0;
+            let hasGrown = false;
 
             if ((textarea.scrollHeight - offset) > self.maxAllowedHeight) {
                 textarea.style.overflowY = 'scroll';
@@ -55,6 +58,7 @@ define(['layoutManager', 'browser', 'css!./emby-textarea', 'registerElement', 'e
                 newHeight = textarea.scrollHeight/* - offset*/;
                 hasGrown = true;
             }
+            $('.customCssContainer').css('height', newHeight + 'px');
             textarea.style.height = newHeight + 'px';
         }
 
@@ -66,17 +70,17 @@ define(['layoutManager', 'browser', 'css!./emby-textarea', 'registerElement', 'e
         autogrowFn();
     }
 
-    var EmbyTextAreaPrototype = Object.create(HTMLTextAreaElement.prototype);
+    const EmbyTextAreaPrototype = Object.create(HTMLTextAreaElement.prototype);
 
-    var elementId = 0;
+    let elementId = 0;
 
     if (Object.getOwnPropertyDescriptor && Object.defineProperty) {
 
-        var descriptor = Object.getOwnPropertyDescriptor(HTMLTextAreaElement.prototype, 'value');
+        const descriptor = Object.getOwnPropertyDescriptor(HTMLTextAreaElement.prototype, 'value');
 
         // descriptor returning null in webos
         if (descriptor && descriptor.configurable) {
-            var baseSetMethod = descriptor.set;
+            const baseSetMethod = descriptor.set;
             descriptor.set = function (value) {
                 baseSetMethod.call(this, value);
 
@@ -107,8 +111,8 @@ define(['layoutManager', 'browser', 'css!./emby-textarea', 'registerElement', 'e
         this.rows = 1;
         this.classList.add('emby-textarea');
 
-        var parentNode = this.parentNode;
-        var label = this.ownerDocument.createElement('label');
+        const parentNode = this.parentNode;
+        const label = this.ownerDocument.createElement('label');
         label.innerHTML = this.getAttribute('label') || '';
         label.classList.add('textareaLabel');
 
@@ -135,4 +139,5 @@ define(['layoutManager', 'browser', 'css!./emby-textarea', 'registerElement', 'e
         prototype: EmbyTextAreaPrototype,
         extends: 'textarea'
     });
-});
+
+/* eslint-enable indent */
diff --git a/src/elements/emby-toggle/emby-toggle.js b/src/elements/emby-toggle/emby-toggle.js
index bd7eba3078..8e82160806 100644
--- a/src/elements/emby-toggle/emby-toggle.js
+++ b/src/elements/emby-toggle/emby-toggle.js
@@ -1,7 +1,9 @@
-define(['css!./emby-toggle', 'registerElement'], function () {
-    'use strict';
+import 'css!./emby-toggle';
+import 'webcomponents';
 
-    var EmbyTogglePrototype = Object.create(HTMLInputElement.prototype);
+/* eslint-disable indent */
+
+    const EmbyTogglePrototype = Object.create(HTMLInputElement.prototype);
 
     function onKeyDown(e) {
 
@@ -29,11 +31,11 @@ define(['css!./emby-toggle', 'registerElement'], function () {
 
         this.classList.add('mdl-switch__input');
 
-        var labelElement = this.parentNode;
+        const labelElement = this.parentNode;
         labelElement.classList.add('mdl-switch');
         labelElement.classList.add('mdl-js-switch');
 
-        var labelTextElement = labelElement.querySelector('span');
+        const labelTextElement = labelElement.querySelector('span');
 
         labelElement.insertAdjacentHTML('beforeend', '<div class="mdl-switch__trackContainer"><div class="mdl-switch__track"></div><div class="mdl-switch__thumb"><span class="mdl-switch__focus-helper"></span></div></div>');
 
@@ -47,4 +49,5 @@ define(['css!./emby-toggle', 'registerElement'], function () {
         prototype: EmbyTogglePrototype,
         extends: 'input'
     });
-});
+
+/* eslint-enable indent */
diff --git a/src/encodingsettings.html b/src/encodingsettings.html
index 8971957b71..858375b145 100644
--- a/src/encodingsettings.html
+++ b/src/encodingsettings.html
@@ -19,6 +19,7 @@
                         <option value="nvenc">Nvidia NVENC</option>
                         <option value="vaapi">Video Acceleration API (VAAPI)</option>
                         <option value="h264_v4l2m2m">Exynos V4L2 MFC</option>
+                        <option value="videotoolbox">Video ToolBox</option>
                     </select>
                     <div class="fieldDescription">
                         <a is="emby-linkbutton" rel="noopener noreferrer" class="button-link" href="https://docs.jellyfin.org/general/administration/hardware-acceleration.html" target="_blank">${LabelHardwareAccelerationTypeHelp}</a>
@@ -35,36 +36,49 @@
                         <h3 class="checkboxListLabel">${LabelEnableHardwareDecodingFor}</h3>
                         <div class="checkboxList">
                             <label>
-                                <input type="checkbox" is="emby-checkbox" class="chkDecodeCodec" data-codec="h264" data-types="qsv,nvenc,omx,mediacodec" />
+                                <input type="checkbox" is="emby-checkbox" class="chkDecodeCodec" data-codec="h264" data-types="amf,qsv,nvenc,vaapi,omx,mediacodec,videotoolbox" />
                                 <span>H264</span>
                             </label>
                             <label>
-                                <input type="checkbox" is="emby-checkbox" class="chkDecodeCodec" data-codec="hevc" data-types="qsv,nvenc,mediacodec" />
+                                <input type="checkbox" is="emby-checkbox" class="chkDecodeCodec" data-codec="hevc" data-types="amf,qsv,nvenc,vaapi,mediacodec,videotoolbox" />
                                 <span>HEVC</span>
                             </label>
                             <label>
-                                <input type="checkbox" is="emby-checkbox" class="chkDecodeCodec" data-codec="mpeg2video" data-types="qsv,nvenc,omx,mediacodec" />
+                                <input type="checkbox" is="emby-checkbox" class="chkDecodeCodec" data-codec="mpeg2video" data-types="amf,qsv,nvenc,vaapi,omx,mediacodec,videotoolbox" />
                                 <span>MPEG2</span>
                             </label>
                             <label>
-                                <input type="checkbox" is="emby-checkbox" class="chkDecodeCodec" data-codec="mpeg4" data-types="nvenc,mediacodec" />
+                                <input type="checkbox" is="emby-checkbox" class="chkDecodeCodec" data-codec="mpeg4" data-types="amf,nvenc,omx,mediacodec,videotoolbox" />
                                 <span>MPEG4</span>
                             </label>
                             <label>
-                                <input type="checkbox" is="emby-checkbox" class="chkDecodeCodec" data-codec="vc1" data-types="qsv,nvenc" />
+                                <input type="checkbox" is="emby-checkbox" class="chkDecodeCodec" data-codec="vc1" data-types="amf,qsv,nvenc,vaapi,omx,videotoolbox" />
                                 <span>VC1</span>
                             </label>
                             <label>
-                                <input type="checkbox" is="emby-checkbox" class="chkDecodeCodec" data-codec="vp8" data-types="mediacodec" />
+                                <input type="checkbox" is="emby-checkbox" class="chkDecodeCodec" data-codec="vp8" data-types="qsv,nvenc,vaapi,mediacodec,videotoolbox" />
                                 <span>VP8</span>
                             </label>
                             <label>
-                                <input type="checkbox" is="emby-checkbox" class="chkDecodeCodec" data-codec="vp9" data-types="mediacodec" />
+                                <input type="checkbox" is="emby-checkbox" class="chkDecodeCodec" data-codec="vp9" data-types="amf,qsv,nvenc,vaapi,mediacodec,videotoolbox" />
                                 <span>VP9</span>
                             </label>
                         </div>
                     </div>
 
+                    <div class="checkboxListContainer">
+                        <label>
+                            <input type="checkbox" is="emby-checkbox" id="chkDecodingColorDepth10Hevc" />
+                            <span>${EnableDecodingColorDepth10Hevc}</span>
+                        </label>
+                    </div>
+                    <div class="checkboxListContainer">
+                        <label>
+                            <input type="checkbox" is="emby-checkbox" id="chkDecodingColorDepth10Vp9" />
+                            <span>${EnableDecodingColorDepth10Vp9}</span>
+                        </label>
+                    </div>
+
                     <div class="checkboxListContainer">
                         <div class="checkboxList">
                             <label>
diff --git a/src/index.html b/src/index.html
index ed63ca1a98..f8d867cb1a 100644
--- a/src/index.html
+++ b/src/index.html
@@ -52,7 +52,7 @@
     <!-- iPad Pro 1 -->
     <link href="assets/splash/ipadpro1_splash.png" media="screen and (device-width: 834px) and (device-height: 1112px) and (-webkit-device-pixel-ratio: 2) and (orientation: portrait)" rel="apple-touch-startup-image" />
     <link href="assets/splash/ipadpro1_splash_l.png" media="screen and (device-width: 834px) and (device-height: 1112px) and (-webkit-device-pixel-ratio: 2) and (orientation: landscape)" rel="apple-touch-startup-image" />
-    
+
     <!-- iPad Pro 3 -->
     <link href="assets/splash/ipadpro3_splash.png" media="screen and (device-width: 834px) and (device-height: 1194px) and (-webkit-device-pixel-ratio: 2) and (orientation: portrait)" rel="apple-touch-startup-image" />
     <link href="assets/splash/ipadpro3_splash_l.png" media="screen and (device-width: 834px) and (device-height: 1194px) and (-webkit-device-pixel-ratio: 2) and (orientation: landscape)" rel="apple-touch-startup-image" />
@@ -69,12 +69,19 @@
     <title>Jellyfin</title>
 
     <style>
-        .transparentDocument, .backgroundContainer-transparent:not(.withBackdrop) {
+        .transparentDocument,
+        .backgroundContainer-transparent:not(.withBackdrop) {
             background: none !important;
             background-color: transparent !important;
         }
 
-        .mouseIdle, .mouseIdle button, .mouseIdle select, .mouseIdle input, .mouseIdle textarea, .mouseIdle a, .mouseIdle label {
+        .mouseIdle,
+        .mouseIdle button,
+        .mouseIdle select,
+        .mouseIdle input,
+        .mouseIdle textarea,
+        .mouseIdle a,
+        .mouseIdle label {
             cursor: none !important;
         }
 
@@ -82,7 +89,9 @@
             background-color: #101010;
         }
 
-        .hide, .mouseIdle .hide-mouse-idle, .mouseIdle-tv .hide-mouse-idle-tv {
+        .hide,
+        .mouseIdle .hide-mouse-idle,
+        .mouseIdle-tv .hide-mouse-idle-tv {
             display: none !important;
         }
 
@@ -94,6 +103,42 @@
             z-index: 1;
             width: 0.8em;
         }
+
+        @-webkit-keyframes fadein {
+            from {
+                opacity: 0;
+            }
+
+            to {
+                opacity: 1;
+            }
+        }
+
+        @keyframes fadein {
+            from {
+                opacity: 0;
+            }
+
+            to {
+                opacity: 1;
+            }
+        }
+
+        .splashLogo {
+            -webkit-animation: fadein 0.5s;
+            animation: fadein 0.5s;
+            width: 30%;
+            height: 30%;
+            background-image: url(assets/img/banner-light.png);
+            background-position: center center;
+            background-repeat: no-repeat;
+            background-size: contain;
+            position: fixed;
+            top: 50%;
+            left: 50%;
+            -webkit-transform: translate(-50%, -50%);
+            transform: translate(-50%, -50%);
+        }
     </style>
 </head>
 <body>
@@ -103,7 +148,9 @@
         <div class="mainDrawer-scrollContainer scrollContainer focuscontainer-y"></div>
     </div>
     <div class="skinHeader focuscontainer-x"></div>
-    <div class="mainAnimatedPages skinBody"></div>
+    <div class="mainAnimatedPages skinBody">
+        <div class="splashLogo"></div>
+    </div>
     <div class="mainDrawerHandle"></div>
 
     <!-- inject:js -->
diff --git a/src/legacy/dashboard.js b/src/legacy/dashboard.js
deleted file mode 100644
index 08c5e8330b..0000000000
--- a/src/legacy/dashboard.js
+++ /dev/null
@@ -1,24 +0,0 @@
-Dashboard.confirm = function(message, title, callback) {
-    'use strict';
-    require(['confirm'], function(confirm) {
-        confirm(message, title).then(function() {
-            callback(!0);
-        }).catch(function() {
-            callback(!1);
-        });
-    });
-};
-
-Dashboard.showLoadingMsg = function() {
-    'use strict';
-    require(['loading'], function(loading) {
-        loading.show();
-    });
-};
-
-Dashboard.hideLoadingMsg = function() {
-    'use strict';
-    require(['loading'], function(loading) {
-        loading.hide();
-    });
-};
diff --git a/src/legacy/fnchecked.js b/src/legacy/fnchecked.js
deleted file mode 100644
index c3eff813e0..0000000000
--- a/src/legacy/fnchecked.js
+++ /dev/null
@@ -1,12 +0,0 @@
-define(['jQuery'], function($) {
-    'use strict';
-    $.fn.checked = function(value) {
-        return !0 === value || !1 === value ? $(this).each(function() {
-            this.checked = value;
-        }) : this.length && this[0].checked;
-    };
-
-    $.fn.checkboxradio = function() {
-        return this;
-    };
-});
diff --git a/src/legacy/selectmenu.js b/src/legacy/selectmenu.js
deleted file mode 100644
index f4cc5466b1..0000000000
--- a/src/legacy/selectmenu.js
+++ /dev/null
@@ -1,6 +0,0 @@
-define(['jQuery'], function($) {
-    'use strict';
-    $.fn.selectmenu = function() {
-        return this;
-    };
-});
diff --git a/src/plugins/backdropScreensaver/plugin.js b/src/plugins/backdropScreensaver/plugin.js
new file mode 100644
index 0000000000..88bfa1f4b7
--- /dev/null
+++ b/src/plugins/backdropScreensaver/plugin.js
@@ -0,0 +1,52 @@
+/* eslint-disable indent */
+import connectionManager from 'connectionManager';
+
+class BackdropScreensaver {
+    constructor() {
+        this.name = 'Backdrop ScreenSaver';
+        this.type = 'screensaver';
+        this.id = 'backdropscreensaver';
+        this.supportsAnonymous = false;
+    }
+        show() {
+            const query = {
+                ImageTypes: 'Backdrop',
+                EnableImageTypes: 'Backdrop',
+                IncludeItemTypes: 'Movie,Series,MusicArtist',
+                SortBy: 'Random',
+                Recursive: true,
+                Fields: 'Taglines',
+                ImageTypeLimit: 1,
+                StartIndex: 0,
+                Limit: 200
+            };
+
+            const apiClient = connectionManager.currentApiClient();
+            apiClient.getItems(apiClient.getCurrentUserId(), query).then((result) => {
+
+                if (result.Items.length) {
+
+                    import('slideshow').then(({default: Slideshow}) => {
+                        const newSlideShow = new Slideshow({
+                            showTitle: true,
+                            cover: true,
+                            items: result.Items
+                        });
+
+                        newSlideShow.show();
+                        this.currentSlideshow = newSlideShow;
+                    }).catch(console.error);
+                }
+            });
+        }
+
+        hide() {
+            if (this.currentSlideshow) {
+                this.currentSlideshow.hide();
+                this.currentSlideshow = null;
+            }
+        }
+    }
+/* eslint-enable indent */
+
+export default BackdropScreensaver;
diff --git a/src/plugins/bookPlayer/plugin.js b/src/plugins/bookPlayer/plugin.js
new file mode 100644
index 0000000000..db6c344dad
--- /dev/null
+++ b/src/plugins/bookPlayer/plugin.js
@@ -0,0 +1,285 @@
+import connectionManager from 'connectionManager';
+import loading from 'loading';
+import keyboardnavigation from 'keyboardnavigation';
+import dialogHelper from 'dialogHelper';
+import events from 'events';
+import 'css!./style';
+import 'material-icons';
+import 'paper-icon-button-light';
+
+import TableOfContents from './tableOfContents';
+
+export class BookPlayer {
+    constructor() {
+        this.name = 'Book Player';
+        this.type = 'mediaplayer';
+        this.id = 'bookplayer';
+        this.priority = 1;
+
+        this.onDialogClosed = this.onDialogClosed.bind(this);
+        this.openTableOfContents = this.openTableOfContents.bind(this);
+        this.onWindowKeyUp = this.onWindowKeyUp.bind(this);
+    }
+
+    play(options) {
+        this._progress = 0;
+        this._loaded = false;
+
+        loading.show();
+        let elem = this.createMediaElement();
+        return this.setCurrentSrc(elem, options);
+    }
+
+    stop() {
+        this.unbindEvents();
+
+        let elem = this._mediaElement;
+        let tocElement = this._tocElement;
+        let rendition = this._rendition;
+
+        if (elem) {
+            dialogHelper.close(elem);
+            this._mediaElement = null;
+        }
+
+        if (tocElement) {
+            tocElement.destroy();
+            this._tocElement = null;
+        }
+
+        if (rendition) {
+            rendition.destroy();
+        }
+
+        // Hide loader in case player was not fully loaded yet
+        loading.hide();
+        this._cancellationToken.shouldCancel = true;
+    }
+
+    currentItem() {
+        return this._currentItem;
+    }
+
+    currentTime() {
+        return this._progress * 1000;
+    }
+
+    duration() {
+        return 1000;
+    }
+
+    getBufferedRanges() {
+        return [{
+            start: 0,
+            end: 10000000
+        }];
+    }
+
+    volume() {
+        return 100;
+    }
+
+    isMuted() {
+        return false;
+    }
+
+    paused() {
+        return false;
+    }
+
+    seekable() {
+        return true;
+    }
+
+    onWindowKeyUp(e) {
+        let key = keyboardnavigation.getKeyName(e);
+        let rendition = this._rendition;
+        let book = rendition.book;
+
+        switch (key) {
+            case 'l':
+            case 'ArrowRight':
+            case 'Right':
+                if (this._loaded) {
+                    book.package.metadata.direction === 'rtl' ? rendition.prev() : rendition.next();
+                }
+                break;
+            case 'j':
+            case 'ArrowLeft':
+            case 'Left':
+                if (this._loaded) {
+                    book.package.metadata.direction === 'rtl' ? rendition.next() : rendition.prev();
+                }
+                break;
+            case 'Escape':
+                if (this._tocElement) {
+                    // Close table of contents on ESC if it is open
+                    this._tocElement.destroy();
+                } else {
+                    // Otherwise stop the entire book player
+                    this.stop();
+                }
+                break;
+        }
+    }
+
+    onDialogClosed() {
+        this.stop();
+    }
+
+    bindMediaElementEvents() {
+        let elem = this._mediaElement;
+
+        elem.addEventListener('close', this.onDialogClosed, {once: true});
+        elem.querySelector('.btnBookplayerExit').addEventListener('click', this.onDialogClosed, {once: true});
+        elem.querySelector('.btnBookplayerToc').addEventListener('click', this.openTableOfContents);
+    }
+
+    bindEvents() {
+        this.bindMediaElementEvents();
+
+        document.addEventListener('keyup', this.onWindowKeyUp);
+        // FIXME: I don't really get why document keyup event is not triggered when epub is in focus
+        this._rendition.on('keyup', this.onWindowKeyUp);
+    }
+
+    unbindMediaElementEvents() {
+        let elem = this._mediaElement;
+
+        elem.removeEventListener('close', this.onDialogClosed);
+        elem.querySelector('.btnBookplayerExit').removeEventListener('click', this.onDialogClosed);
+        elem.querySelector('.btnBookplayerToc').removeEventListener('click', this.openTableOfContents);
+    }
+
+    unbindEvents() {
+        if (this._mediaElement) {
+            this.unbindMediaElementEvents();
+        }
+        document.removeEventListener('keyup', this.onWindowKeyUp);
+        if (this._rendition) {
+            this._rendition.off('keyup', this.onWindowKeyUp);
+        }
+    }
+
+    openTableOfContents() {
+        if (this._loaded) {
+            this._tocElement = new TableOfContents(this);
+        }
+    }
+
+    createMediaElement() {
+        let elem = this._mediaElement;
+
+        if (elem) {
+            return elem;
+        }
+
+        elem = document.getElementById('bookPlayer');
+
+        if (!elem) {
+            elem = dialogHelper.createDialog({
+                exitAnimationDuration: 400,
+                size: 'fullscreen',
+                autoFocus: false,
+                scrollY: false,
+                exitAnimation: 'fadeout',
+                removeOnClose: true
+            });
+            elem.id = 'bookPlayer';
+
+            let html = '';
+            html += '<div class="topRightActionButtons">';
+            html += '<button is="paper-icon-button-light" class="autoSize bookplayerButton btnBookplayerExit hide-mouse-idle-tv" tabindex="-1"><i class="material-icons bookplayerButtonIcon close"></i></button>';
+            html += '</div>';
+            html += '<div class="topLeftActionButtons">';
+            html += '<button is="paper-icon-button-light" class="autoSize bookplayerButton btnBookplayerToc hide-mouse-idle-tv" tabindex="-1"><i class="material-icons bookplayerButtonIcon toc"></i></button>';
+            html += '</div>';
+
+            elem.innerHTML = html;
+
+            dialogHelper.open(elem);
+        }
+
+        this._mediaElement = elem;
+
+        return elem;
+    }
+
+    setCurrentSrc(elem, options) {
+        let item = options.items[0];
+        this._currentItem = item;
+        this.streamInfo = {
+            started: true,
+            ended: false,
+            mediaSource: {
+                Id: item.Id
+            }
+        };
+
+        let serverId = item.ServerId;
+        let apiClient = connectionManager.getApiClient(serverId);
+
+        return new Promise((resolve, reject) => {
+            import('epubjs').then(({default: epubjs}) => {
+                let downloadHref = apiClient.getItemDownloadUrl(item.Id);
+                let book = epubjs.default(downloadHref, {openAs: 'epub'});
+                let rendition = book.renderTo(elem, {width: '100%', height: '97%'});
+
+                this._currentSrc = downloadHref;
+                this._rendition = rendition;
+                let cancellationToken = {
+                    shouldCancel: false
+                };
+                this._cancellationToken = cancellationToken;
+
+                return rendition.display().then(() => {
+                    let epubElem = document.querySelector('.epub-container');
+                    epubElem.style.display = 'none';
+
+                    this.bindEvents();
+
+                    return this._rendition.book.locations.generate(1024).then(async () => {
+                        if (cancellationToken.shouldCancel) {
+                            return reject();
+                        }
+
+                        const percentageTicks = options.startPositionTicks / 10000000;
+                        if (percentageTicks !== 0.0) {
+                            const resumeLocation = book.locations.cfiFromPercentage(percentageTicks);
+                            await rendition.display(resumeLocation);
+                        }
+
+                        this._loaded = true;
+                        epubElem.style.display = 'block';
+                        rendition.on('relocated', (locations) => {
+                            this._progress = book.locations.percentageFromCfi(locations.start.cfi);
+
+                            events.trigger(this, 'timeupdate');
+                        });
+
+                        loading.hide();
+
+                        return resolve();
+                    });
+                }, () => {
+                    console.error('Failed to display epub');
+                    return reject();
+                });
+            });
+        });
+    }
+
+    canPlayMediaType(mediaType) {
+        return (mediaType || '').toLowerCase() === 'book';
+    }
+
+    canPlayItem(item) {
+        if (item.Path && (item.Path.endsWith('epub'))) {
+            return true;
+        }
+
+        return false;
+    }
+}
+
+export default BookPlayer;
diff --git a/src/plugins/bookPlayer/style.css b/src/plugins/bookPlayer/style.css
new file mode 100644
index 0000000000..e37b995f31
--- /dev/null
+++ b/src/plugins/bookPlayer/style.css
@@ -0,0 +1,39 @@
+#bookPlayer {
+    position: relative;
+    height: 100%;
+    width: 100%;
+    overflow: auto;
+    z-index: 100;
+    background: #fff;
+}
+
+.topRightActionButtons {
+    right: 0.5vh;
+    top: 0.5vh;
+    z-index: 1002;
+    position: absolute;
+}
+
+.topLeftActionButtons {
+    left: 0.5vh;
+    top: 0.5vh;
+    z-index: 1002;
+    position: absolute;
+}
+
+.bookplayerButtonIcon {
+    color: black;
+    opacity: 0.7;
+}
+
+#dialogToc {
+    background-color: white;
+}
+
+.toc li {
+    margin-bottom: 5px;
+}
+
+.bookplayerErrorMsg {
+    text-align: center;
+}
diff --git a/src/plugins/bookPlayer/tableOfContents.js b/src/plugins/bookPlayer/tableOfContents.js
new file mode 100644
index 0000000000..23e288aff5
--- /dev/null
+++ b/src/plugins/bookPlayer/tableOfContents.js
@@ -0,0 +1,91 @@
+import dialogHelper from 'dialogHelper';
+
+export default class TableOfContents {
+    constructor(bookPlayer) {
+        this._bookPlayer = bookPlayer;
+        this._rendition = bookPlayer._rendition;
+
+        this.onDialogClosed = this.onDialogClosed.bind(this);
+
+        this.createMediaElement();
+    }
+
+    destroy() {
+        let elem = this._elem;
+        if (elem) {
+            this.unbindEvents();
+            dialogHelper.close(elem);
+        }
+
+        this._bookPlayer._tocElement = null;
+    }
+
+    bindEvents() {
+        let elem = this._elem;
+
+        elem.addEventListener('close', this.onDialogClosed, {once: true});
+        elem.querySelector('.btnBookplayerTocClose').addEventListener('click', this.onDialogClosed, {once: true});
+    }
+
+    unbindEvents() {
+        let elem = this._elem;
+
+        elem.removeEventListener('close', this.onDialogClosed);
+        elem.querySelector('.btnBookplayerTocClose').removeEventListener('click', this.onDialogClosed);
+    }
+
+    onDialogClosed() {
+        this.destroy();
+    }
+
+    replaceLinks(contents, f) {
+        let links = contents.querySelectorAll('a[href]');
+
+        links.forEach((link) => {
+            let href = link.getAttribute('href');
+
+            link.onclick = () => {
+                f(href);
+                return false;
+            };
+        });
+    }
+
+    createMediaElement() {
+        let rendition = this._rendition;
+
+        let elem = dialogHelper.createDialog({
+            size: 'small',
+            autoFocus: false,
+            removeOnClose: true
+        });
+
+        elem.id = 'dialogToc';
+
+        let tocHtml = '<div class="topRightActionButtons">';
+        tocHtml += '<button is="paper-icon-button-light" class="autoSize bookplayerButton btnBookplayerTocClose hide-mouse-idle-tv" tabindex="-1"><span class="material-icons bookplayerButtonIcon close"></span></button>';
+        tocHtml += '</div>';
+        tocHtml += '<ul class="toc">';
+        rendition.book.navigation.forEach((chapter) => {
+            tocHtml += '<li>';
+            // Remove '../' from href
+            let link = chapter.href.startsWith('../') ? chapter.href.substr(3) : chapter.href;
+            tocHtml += `<a href="${rendition.book.path.directory + link}">${chapter.label}</a>`;
+            tocHtml += '</li>';
+        });
+
+        tocHtml += '</ul>';
+        elem.innerHTML = tocHtml;
+
+        this.replaceLinks(elem, (href) => {
+            let relative = rendition.book.path.relative(href);
+            rendition.display(relative);
+            this.destroy();
+        });
+
+        this._elem = elem;
+
+        this.bindEvents();
+        dialogHelper.open(elem);
+    }
+}
diff --git a/src/components/chromecast/chromecasthelpers.js b/src/plugins/chromecastPlayer/chromecastHelpers.js
similarity index 100%
rename from src/components/chromecast/chromecasthelpers.js
rename to src/plugins/chromecastPlayer/chromecastHelpers.js
diff --git a/src/components/chromecast/chromecastplayer.js b/src/plugins/chromecastPlayer/plugin.js
similarity index 97%
rename from src/components/chromecast/chromecastplayer.js
rename to src/plugins/chromecastPlayer/plugin.js
index 5a9945539a..3d4f293cc8 100644
--- a/src/components/chromecast/chromecastplayer.js
+++ b/src/plugins/chromecastPlayer/plugin.js
@@ -57,11 +57,6 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
     var applicationStable = 'F007D354';
     var applicationNightly = '6F511C87';
 
-    var applicationID = applicationStable;
-    if (userSettings.chromecastVersion === 'nightly') {
-        applicationID = applicationNightly;
-    }
-
     var messageNamespace = 'urn:x-cast:com.connectsdk';
 
     var CastPlayer = function () {
@@ -105,6 +100,11 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
             return;
         }
 
+        var applicationID = applicationStable;
+        if (userSettings.chromecastVersion() === 'nightly') {
+            applicationID = applicationNightly;
+        }
+
         // request session
         var sessionRequest = new chrome.cast.SessionRequest(applicationID);
         var apiConfig = new chrome.cast.ApiConfig(sessionRequest,
@@ -150,7 +150,7 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
 
     function alertText(text, title) {
         require(['alert'], function (alert) {
-            alert({
+            alert.default({
                 text: text,
                 title: title
             });
@@ -548,7 +548,7 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
 
             events.trigger(instance, 'playbackstop', [state]);
 
-            var state = instance.lastPlayerData.PlayState || {};
+            state = instance.lastPlayerData.PlayState || {};
             var volume = state.VolumeLevel || 0.5;
             var mute = state.IsMuted || false;
 
@@ -572,6 +572,7 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
         bindEventForRelay(instance, 'unpause');
         bindEventForRelay(instance, 'volumechange');
         bindEventForRelay(instance, 'repeatmodechange');
+        bindEventForRelay(instance, 'shufflequeuemodechange');
 
         events.on(instance._castPlayer, 'playstatechange', function (e, data) {
 
@@ -651,6 +652,7 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
                 'SetSubtitleStreamIndex',
                 'DisplayContent',
                 'SetRepeatMode',
+                'SetShuffleQueue',
                 'EndSession',
                 'PlayMediaSource',
                 'PlayTrailers'
@@ -864,6 +866,12 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
         return state.RepeatMode;
     };
 
+    ChromecastPlayer.prototype.getQueueShuffleMode = function () {
+        var state = this.lastPlayerData || {};
+        state = state.PlayState || {};
+        return state.ShuffleMode;
+    };
+
     ChromecastPlayer.prototype.playTrailers = function (item) {
 
         this._castPlayer.sendMessage({
@@ -884,6 +892,15 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
         });
     };
 
+    ChromecastPlayer.prototype.setQueueShuffleMode = function (value) {
+        this._castPlayer.sendMessage({
+            options: {
+                ShuffleMode: value
+            },
+            command: 'SetShuffleQueue'
+        });
+    };
+
     ChromecastPlayer.prototype.toggleMute = function () {
 
         this._castPlayer.sendMessage({
diff --git a/src/components/playback/experimentalwarnings.js b/src/plugins/experimentalWarnings/plugin.js
similarity index 100%
rename from src/components/playback/experimentalwarnings.js
rename to src/plugins/experimentalWarnings/plugin.js
diff --git a/src/components/htmlAudioPlayer/plugin.js b/src/plugins/htmlAudioPlayer/plugin.js
similarity index 100%
rename from src/components/htmlAudioPlayer/plugin.js
rename to src/plugins/htmlAudioPlayer/plugin.js
diff --git a/src/components/htmlVideoPlayer/plugin.js b/src/plugins/htmlVideoPlayer/plugin.js
similarity index 98%
rename from src/components/htmlVideoPlayer/plugin.js
rename to src/plugins/htmlVideoPlayer/plugin.js
index 0c9e15146a..cc312bb956 100644
--- a/src/components/htmlVideoPlayer/plugin.js
+++ b/src/plugins/htmlVideoPlayer/plugin.js
@@ -281,14 +281,6 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
         }
 
         self.play = function (options) {
-
-            if (browser.msie) {
-                if (options.playMethod === 'Transcode' && !window.MediaSource) {
-                    alert('Playback of this content is not supported in Internet Explorer. For a better experience, try a modern browser such as Microsoft Edge, Google Chrome, Firefox or Opera.');
-                    return Promise.reject();
-                }
-            }
-
             self._started = false;
             self._timeUpdated = false;
 
@@ -657,7 +649,7 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
         function setTrackEventsSubtitleOffset(trackEvents, offsetValue) {
 
             if (Array.isArray(trackEvents)) {
-                offsetValue = updateCurrentTrackOffset(offsetValue);
+                offsetValue = updateCurrentTrackOffset(offsetValue) * 1e7; // ticks
                 trackEvents.forEach(function(trackEvent) {
                     trackEvent.StartPositionTicks -= offsetValue;
                     trackEvent.EndPositionTicks -= offsetValue;
@@ -1425,13 +1417,6 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
         var video = document.createElement('video');
         if (video.webkitSupportsPresentationMode && typeof video.webkitSetPresentationMode === 'function' || document.pictureInPictureEnabled) {
             list.push('PictureInPicture');
-        } else if (browser.ipad) {
-            // Unfortunately this creates a false positive on devices where its' not actually supported
-            if (navigator.userAgent.toLowerCase().indexOf('os 9') === -1) {
-                if (video.webkitSupportsPresentationMode && video.webkitSupportsPresentationMode && typeof video.webkitSetPresentationMode === 'function') {
-                    list.push('PictureInPicture');
-                }
-            }
         } else if (window.Windows) {
             if (Windows.UI.ViewManagement.ApplicationView.getForCurrentView().isViewModeSupported(Windows.UI.ViewManagement.ApplicationViewMode.compactOverlay)) {
                 list.push('PictureInPicture');
diff --git a/src/components/htmlVideoPlayer/style.css b/src/plugins/htmlVideoPlayer/style.css
similarity index 100%
rename from src/components/htmlVideoPlayer/style.css
rename to src/plugins/htmlVideoPlayer/style.css
diff --git a/src/components/logoScreensaver/plugin.js b/src/plugins/logoScreensaver/plugin.js
similarity index 100%
rename from src/components/logoScreensaver/plugin.js
rename to src/plugins/logoScreensaver/plugin.js
diff --git a/src/components/logoScreensaver/style.css b/src/plugins/logoScreensaver/style.css
similarity index 100%
rename from src/components/logoScreensaver/style.css
rename to src/plugins/logoScreensaver/style.css
diff --git a/src/components/photoPlayer/plugin.js b/src/plugins/photoPlayer/plugin.js
similarity index 51%
rename from src/components/photoPlayer/plugin.js
rename to src/plugins/photoPlayer/plugin.js
index 4dc00809dc..d8e55fa67e 100644
--- a/src/components/photoPlayer/plugin.js
+++ b/src/plugins/photoPlayer/plugin.js
@@ -1,30 +1,20 @@
-define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackManager', 'appRouter', 'appSettings', 'connectionManager'], function (browser, require, events, appHost, loading, dom, playbackManager, appRouter, appSettings, connectionManager) {
-    'use strict';
+import connectionManager from 'connectionManager';
 
-    function PhotoPlayer() {
-
-        var self = this;
-
-        self.name = 'Photo Player';
-        self.type = 'mediaplayer';
-        self.id = 'photoplayer';
-
-        // Let any players created by plugins take priority
-        self.priority = 1;
+export default class PhotoPlayer {
+    constructor() {
+        this.name = 'Photo Player';
+        this.type = 'mediaplayer';
+        this.id = 'photoplayer';
+        this.priority = 1;
     }
 
-    PhotoPlayer.prototype.play = function (options) {
-
+    play(options) {
         return new Promise(function (resolve, reject) {
-
-            require(['slideshow'], function (slideshow) {
-
+            import('slideshow').then(({default: slideshow}) => {
                 var index = options.startIndex || 0;
 
                 var apiClient = connectionManager.currentApiClient();
-
                 apiClient.getCurrentUser().then(function(result) {
-
                     var newSlideShow = new slideshow({
                         showTitle: false,
                         cover: false,
@@ -36,17 +26,13 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
                     });
 
                     newSlideShow.show();
-
                     resolve();
                 });
             });
         });
-    };
-
-    PhotoPlayer.prototype.canPlayMediaType = function (mediaType) {
+    }
 
+    canPlayMediaType(mediaType) {
         return (mediaType || '').toLowerCase() === 'photo';
-    };
-
-    return PhotoPlayer;
-});
+    }
+}
diff --git a/src/components/playback/playaccessvalidation.js b/src/plugins/playAccessValidation/plugin.js
similarity index 100%
rename from src/components/playback/playaccessvalidation.js
rename to src/plugins/playAccessValidation/plugin.js
diff --git a/src/components/sessionPlayer.js b/src/plugins/sessionPlayer/plugin.js
similarity index 97%
rename from src/components/sessionPlayer.js
rename to src/plugins/sessionPlayer/plugin.js
index 489b57493d..084aa027cf 100644
--- a/src/components/sessionPlayer.js
+++ b/src/plugins/sessionPlayer/plugin.js
@@ -263,7 +263,7 @@ define(['playbackManager', 'events', 'serverNotifications', 'connectionManager']
                         appName: s.Client,
                         playableMediaTypes: s.PlayableMediaTypes,
                         isLocalPlayer: false,
-                        supportedCommands: s.SupportedCommands,
+                        supportedCommands: s.Capabilities.SupportedCommands,
                         user: s.UserId ? {
 
                             Id: s.UserId,
@@ -506,6 +506,17 @@ define(['playbackManager', 'events', 'serverNotifications', 'connectionManager']
         });
     };
 
+    SessionPlayer.prototype.setQueueShuffleMode = function (mode) {
+
+        sendCommandByName(this, 'SetShuffleQueue', {
+            ShuffleMode: mode
+        });
+    };
+
+    SessionPlayer.prototype.getQueueShuffleMode = function () {
+
+    };
+
     SessionPlayer.prototype.displayContent = function (options) {
 
         sendCommandByName(this, 'DisplayContent', options);
diff --git a/src/plugins/youtubePlayer/plugin.js b/src/plugins/youtubePlayer/plugin.js
new file mode 100644
index 0000000000..fc7c33f87f
--- /dev/null
+++ b/src/plugins/youtubePlayer/plugin.js
@@ -0,0 +1,392 @@
+import require from 'require';
+import events from 'events';
+import browser from 'browser';
+import appRouter from 'appRouter';
+import loading from 'loading';
+
+/* globals YT */
+
+function zoomIn(elem, iterations) {
+    const keyframes = [
+        { transform: 'scale3d(.2, .2, .2)  ', opacity: '.6', offset: 0 },
+        { transform: 'none', opacity: '1', offset: 1 }
+    ];
+
+    const timing = { duration: 240, iterations: iterations };
+    return elem.animate(keyframes, timing);
+}
+
+function createMediaElement(instance, options) {
+
+    return new Promise(function (resolve, reject) {
+
+        const dlg = document.querySelector('.youtubePlayerContainer');
+
+        if (!dlg) {
+
+            import('css!./style').then(() => {
+
+                loading.show();
+
+                const dlg = document.createElement('div');
+
+                dlg.classList.add('youtubePlayerContainer');
+
+                if (options.fullscreen) {
+                    dlg.classList.add('onTop');
+                }
+
+                dlg.innerHTML = '<div id="player"></div>';
+                const videoElement = dlg.querySelector('#player');
+
+                document.body.insertBefore(dlg, document.body.firstChild);
+                instance.videoDialog = dlg;
+
+                if (options.fullscreen && dlg.animate && !browser.slow) {
+                    zoomIn(dlg, 1).onfinish = function () {
+                        resolve(videoElement);
+                    };
+                } else {
+                    resolve(videoElement);
+                }
+
+            });
+
+        } else {
+            resolve(dlg.querySelector('#player'));
+        }
+    });
+}
+
+function onVideoResize() {
+    const instance = this;
+    const player = instance.currentYoutubePlayer;
+    const dlg = instance.videoDialog;
+    if (player && dlg) {
+        player.setSize(dlg.offsetWidth, dlg.offsetHeight);
+    }
+}
+
+function clearTimeUpdateInterval(instance) {
+    if (instance.timeUpdateInterval) {
+        clearInterval(instance.timeUpdateInterval);
+    }
+    instance.timeUpdateInterval = null;
+}
+
+function onEndedInternal(instance) {
+
+    clearTimeUpdateInterval(instance);
+    const resizeListener = instance.resizeListener;
+    if (resizeListener) {
+        window.removeEventListener('resize', resizeListener);
+        window.removeEventListener('orientationChange', resizeListener);
+        instance.resizeListener = null;
+    }
+
+    const stopInfo = {
+        src: instance._currentSrc
+    };
+
+    events.trigger(instance, 'stopped', [stopInfo]);
+
+    instance._currentSrc = null;
+    if (instance.currentYoutubePlayer) {
+        instance.currentYoutubePlayer.destroy();
+    }
+    instance.currentYoutubePlayer = null;
+}
+
+// 4. The API will call this function when the video player is ready.
+function onPlayerReady(event) {
+    event.target.playVideo();
+}
+
+function onTimeUpdate(e) {
+
+    events.trigger(this, 'timeupdate');
+}
+
+function onPlaying(instance, playOptions, resolve) {
+
+    if (!instance.started) {
+
+        instance.started = true;
+        resolve();
+        clearTimeUpdateInterval(instance);
+        instance.timeUpdateInterval = setInterval(onTimeUpdate.bind(instance), 500);
+
+        if (playOptions.fullscreen) {
+
+            appRouter.showVideoOsd().then(function () {
+                instance.videoDialog.classList.remove('onTop');
+            });
+
+        } else {
+            appRouter.setTransparency('backdrop');
+            instance.videoDialog.classList.remove('onTop');
+        }
+
+        import('loading').then(({default: loading}) => {
+
+            loading.hide();
+        });
+    }
+}
+
+function setCurrentSrc(instance, elem, options) {
+
+    return new Promise(function (resolve, reject) {
+
+        import('queryString').then(({default: queryString}) => {
+
+            instance._currentSrc = options.url;
+            const params = queryString.parse(options.url.split('?')[1]);
+            // 3. This function creates an <iframe> (and YouTube player)
+            //    after the API code downloads.
+            window.onYouTubeIframeAPIReady = function () {
+                instance.currentYoutubePlayer = new YT.Player('player', {
+                    height: instance.videoDialog.offsetHeight,
+                    width: instance.videoDialog.offsetWidth,
+                    videoId: params.v,
+                    events: {
+                        'onReady': onPlayerReady,
+                        'onStateChange': function (event) {
+                            if (event.data === YT.PlayerState.PLAYING) {
+                                onPlaying(instance, options, resolve);
+                            } else if (event.data === YT.PlayerState.ENDED) {
+                                onEndedInternal(instance);
+                            } else if (event.data === YT.PlayerState.PAUSED) {
+                                events.trigger(instance, 'pause');
+                            }
+                        }
+                    },
+                    playerVars: {
+                        controls: 0,
+                        enablejsapi: 1,
+                        modestbranding: 1,
+                        rel: 0,
+                        showinfo: 0,
+                        fs: 0,
+                        playsinline: 1
+                    }
+                });
+
+                let resizeListener = instance.resizeListener;
+                if (resizeListener) {
+                    window.removeEventListener('resize', resizeListener);
+                    window.addEventListener('resize', resizeListener);
+                } else {
+                    resizeListener = instance.resizeListener = onVideoResize.bind(instance);
+                    window.addEventListener('resize', resizeListener);
+                }
+                window.removeEventListener('orientationChange', resizeListener);
+                window.addEventListener('orientationChange', resizeListener);
+            };
+
+            if (!window.YT) {
+                const tag = document.createElement('script');
+                tag.src = 'https://www.youtube.com/iframe_api';
+                const firstScriptTag = document.getElementsByTagName('script')[0];
+                firstScriptTag.parentNode.insertBefore(tag, firstScriptTag);
+            } else {
+                window.onYouTubeIframeAPIReady();
+            }
+        });
+
+    });
+}
+
+class YoutubePlayer {
+    constructor() {
+
+        this.name = 'Youtube Player';
+        this.type = 'mediaplayer';
+        this.id = 'youtubeplayer';
+
+        // Let any players created by plugins take priority
+        this.priority = 1;
+    }
+    play(options) {
+
+        this.started = false;
+        const instance = this;
+
+        return createMediaElement(this, options).then(function (elem) {
+
+            return setCurrentSrc(instance, elem, options);
+        });
+    }
+    stop(destroyPlayer) {
+
+        const src = this._currentSrc;
+
+        if (src) {
+
+            if (this.currentYoutubePlayer) {
+                this.currentYoutubePlayer.stopVideo();
+            }
+            onEndedInternal(this);
+
+            if (destroyPlayer) {
+                this.destroy();
+            }
+        }
+
+        return Promise.resolve();
+    }
+    destroy() {
+
+        appRouter.setTransparency('none');
+
+        const dlg = this.videoDialog;
+        if (dlg) {
+
+            this.videoDialog = null;
+
+            dlg.parentNode.removeChild(dlg);
+        }
+    }
+    canPlayMediaType(mediaType) {
+
+        mediaType = (mediaType || '').toLowerCase();
+
+        return mediaType === 'audio' || mediaType === 'video';
+    }
+    canPlayItem(item) {
+
+        // Does not play server items
+        return false;
+    }
+    canPlayUrl(url) {
+
+        return url.toLowerCase().indexOf('youtube.com') !== -1;
+    }
+    getDeviceProfile() {
+
+        return Promise.resolve({});
+    }
+    currentSrc() {
+        return this._currentSrc;
+    }
+    setSubtitleStreamIndex(index) {
+    }
+    canSetAudioStreamIndex() {
+        return false;
+    }
+    setAudioStreamIndex(index) {
+    }
+    // Save this for when playback stops, because querying the time at that point might return 0
+    currentTime(val) {
+
+        const currentYoutubePlayer = this.currentYoutubePlayer;
+
+        if (currentYoutubePlayer) {
+            if (val != null) {
+                currentYoutubePlayer.seekTo(val / 1000, true);
+                return;
+            }
+
+            return currentYoutubePlayer.getCurrentTime() * 1000;
+        }
+    }
+    duration(val) {
+
+        const currentYoutubePlayer = this.currentYoutubePlayer;
+
+        if (currentYoutubePlayer) {
+            return currentYoutubePlayer.getDuration() * 1000;
+        }
+        return null;
+    }
+    pause() {
+
+        const currentYoutubePlayer = this.currentYoutubePlayer;
+
+        if (currentYoutubePlayer) {
+            currentYoutubePlayer.pauseVideo();
+
+            const instance = this;
+
+            // This needs a delay before the youtube player will report the correct player state
+            setTimeout(function () {
+                events.trigger(instance, 'pause');
+            }, 200);
+        }
+    }
+    unpause() {
+
+        const currentYoutubePlayer = this.currentYoutubePlayer;
+
+        if (currentYoutubePlayer) {
+            currentYoutubePlayer.playVideo();
+
+            const instance = this;
+
+            // This needs a delay before the youtube player will report the correct player state
+            setTimeout(function () {
+                events.trigger(instance, 'unpause');
+            }, 200);
+        }
+    }
+    paused() {
+
+        const currentYoutubePlayer = this.currentYoutubePlayer;
+
+        if (currentYoutubePlayer) {
+            return currentYoutubePlayer.getPlayerState() === 2;
+        }
+
+        return false;
+    }
+    volume(val) {
+        if (val != null) {
+            return this.setVolume(val);
+        }
+
+        return this.getVolume();
+    }
+    setVolume(val) {
+
+        const currentYoutubePlayer = this.currentYoutubePlayer;
+
+        if (currentYoutubePlayer) {
+            if (val != null) {
+                currentYoutubePlayer.setVolume(val);
+            }
+        }
+    }
+    getVolume() {
+
+        const currentYoutubePlayer = this.currentYoutubePlayer;
+
+        if (currentYoutubePlayer) {
+            return currentYoutubePlayer.getVolume();
+        }
+    }
+    setMute(mute) {
+
+        const currentYoutubePlayer = this.currentYoutubePlayer;
+
+        if (mute) {
+            if (currentYoutubePlayer) {
+                currentYoutubePlayer.mute();
+            }
+        } else {
+
+            if (currentYoutubePlayer) {
+                currentYoutubePlayer.unMute();
+            }
+        }
+    }
+    isMuted() {
+
+        const currentYoutubePlayer = this.currentYoutubePlayer;
+
+        if (currentYoutubePlayer) {
+            return currentYoutubePlayer.isMuted();
+        }
+    }
+}
+
+export default YoutubePlayer;
diff --git a/src/components/youtubeplayer/style.css b/src/plugins/youtubePlayer/style.css
similarity index 100%
rename from src/components/youtubeplayer/style.css
rename to src/plugins/youtubePlayer/style.css
diff --git a/src/scripts/alphanumericshortcuts.js b/src/scripts/alphanumericshortcuts.js
index 2bcf3712bb..a69f3bcd4d 100644
--- a/src/scripts/alphanumericshortcuts.js
+++ b/src/scripts/alphanumericshortcuts.js
@@ -1,110 +1,111 @@
-define(['dom', 'focusManager'], function (dom, focusManager) {
-    'use strict';
+import dom from 'dom';
+import focusManager from 'focusManager';
 
-    var inputDisplayElement;
-    var currentDisplayText = '';
-    var currentDisplayTextContainer;
+let inputDisplayElement;
+let currentDisplayText = '';
+let currentDisplayTextContainer;
 
-    function onKeyDown(e) {
+function onKeyDown(e) {
 
-        if (e.ctrlKey) {
-            return;
-        }
-        if (e.shiftKey) {
-            return;
-        }
-        if (e.altKey) {
-            return;
-        }
-
-        var key = e.key;
-        var chr = key ? alphanumeric(key) : null;
-
-        if (chr) {
-
-            chr = chr.toString().toUpperCase();
-
-            if (chr.length === 1) {
-                currentDisplayTextContainer = this.options.itemsContainer;
-                onAlphanumericKeyPress(e, chr);
-            }
-        }
+    if (e.ctrlKey) {
+        return;
+    }
+    if (e.shiftKey) {
+        return;
+    }
+    if (e.altKey) {
+        return;
     }
 
-    function alphanumeric(value) {
-        var letterNumber = /^[0-9a-zA-Z]+$/;
-        return value.match(letterNumber);
-    }
+    const key = e.key;
+    let chr = key ? alphanumeric(key) : null;
 
-    function ensureInputDisplayElement() {
-        if (!inputDisplayElement) {
-            inputDisplayElement = document.createElement('div');
-            inputDisplayElement.classList.add('alphanumeric-shortcut');
-            inputDisplayElement.classList.add('hide');
+    if (chr) {
 
-            document.body.appendChild(inputDisplayElement);
+        chr = chr.toString().toUpperCase();
+
+        if (chr.length === 1) {
+            currentDisplayTextContainer = this.options.itemsContainer;
+            onAlphanumericKeyPress(e, chr);
         }
     }
+}
 
-    var alpanumericShortcutTimeout;
-    function clearAlphaNumericShortcutTimeout() {
-        if (alpanumericShortcutTimeout) {
-            clearTimeout(alpanumericShortcutTimeout);
-            alpanumericShortcutTimeout = null;
-        }
-    }
-    function resetAlphaNumericShortcutTimeout() {
-        clearAlphaNumericShortcutTimeout();
-        alpanumericShortcutTimeout = setTimeout(onAlphanumericShortcutTimeout, 2000);
-    }
+function alphanumeric(value) {
+    const letterNumber = /^[0-9a-zA-Z]+$/;
+    return value.match(letterNumber);
+}
 
-    function onAlphanumericKeyPress(e, chr) {
-        if (currentDisplayText.length >= 3) {
-            return;
-        }
-        ensureInputDisplayElement();
-        currentDisplayText += chr;
-        inputDisplayElement.innerHTML = currentDisplayText;
-        inputDisplayElement.classList.remove('hide');
-        resetAlphaNumericShortcutTimeout();
-    }
-
-    function onAlphanumericShortcutTimeout() {
-        var value = currentDisplayText;
-        var container = currentDisplayTextContainer;
-
-        currentDisplayText = '';
-        currentDisplayTextContainer = null;
-        inputDisplayElement.innerHTML = '';
+function ensureInputDisplayElement() {
+    if (!inputDisplayElement) {
+        inputDisplayElement = document.createElement('div');
+        inputDisplayElement.classList.add('alphanumeric-shortcut');
         inputDisplayElement.classList.add('hide');
-        clearAlphaNumericShortcutTimeout();
-        selectByShortcutValue(container, value);
+
+        document.body.appendChild(inputDisplayElement);
+    }
+}
+
+let alpanumericShortcutTimeout;
+function clearAlphaNumericShortcutTimeout() {
+    if (alpanumericShortcutTimeout) {
+        clearTimeout(alpanumericShortcutTimeout);
+        alpanumericShortcutTimeout = null;
+    }
+}
+function resetAlphaNumericShortcutTimeout() {
+    clearAlphaNumericShortcutTimeout();
+    alpanumericShortcutTimeout = setTimeout(onAlphanumericShortcutTimeout, 2000);
+}
+
+function onAlphanumericKeyPress(e, chr) {
+    if (currentDisplayText.length >= 3) {
+        return;
+    }
+    ensureInputDisplayElement();
+    currentDisplayText += chr;
+    inputDisplayElement.innerHTML = currentDisplayText;
+    inputDisplayElement.classList.remove('hide');
+    resetAlphaNumericShortcutTimeout();
+}
+
+function onAlphanumericShortcutTimeout() {
+    const value = currentDisplayText;
+    const container = currentDisplayTextContainer;
+
+    currentDisplayText = '';
+    currentDisplayTextContainer = null;
+    inputDisplayElement.innerHTML = '';
+    inputDisplayElement.classList.add('hide');
+    clearAlphaNumericShortcutTimeout();
+    selectByShortcutValue(container, value);
+}
+
+function selectByShortcutValue(container, value) {
+
+    value = value.toUpperCase();
+
+    let focusElem;
+    if (value === '#') {
+
+        focusElem = container.querySelector('*[data-prefix]');
     }
 
-    function selectByShortcutValue(container, value) {
-
-        value = value.toUpperCase();
-
-        var focusElem;
-        if (value === '#') {
-
-            focusElem = container.querySelector('*[data-prefix]');
-        }
-
-        if (!focusElem) {
-            focusElem = container.querySelector('*[data-prefix^=\'' + value + '\']');
-        }
-
-        if (focusElem) {
-            focusManager.focus(focusElem);
-        }
+    if (!focusElem) {
+        focusElem = container.querySelector('*[data-prefix^=\'' + value + '\']');
     }
 
-    function AlphaNumericShortcuts(options) {
+    if (focusElem) {
+        focusManager.focus(focusElem);
+    }
+}
+
+class AlphaNumericShortcuts {
+    constructor(options) {
 
         this.options = options;
 
-        var keyDownHandler = onKeyDown.bind(this);
+        const keyDownHandler = onKeyDown.bind(this);
 
         dom.addEventListener(window, 'keydown', keyDownHandler, {
             passive: true
@@ -112,10 +113,9 @@ define(['dom', 'focusManager'], function (dom, focusManager) {
 
         this.keyDownHandler = keyDownHandler;
     }
+    destroy() {
 
-    AlphaNumericShortcuts.prototype.destroy = function () {
-
-        var keyDownHandler = this.keyDownHandler;
+        const keyDownHandler = this.keyDownHandler;
 
         if (keyDownHandler) {
             dom.removeEventListener(window, 'keydown', keyDownHandler, {
@@ -124,7 +124,7 @@ define(['dom', 'focusManager'], function (dom, focusManager) {
             this.keyDownHandler = null;
         }
         this.options = null;
-    };
+    }
+}
 
-    return AlphaNumericShortcuts;
-});
+export default AlphaNumericShortcuts;
diff --git a/src/scripts/apploader.js b/src/scripts/apploader.js
index 0353c9535c..183b765d16 100644
--- a/src/scripts/apploader.js
+++ b/src/scripts/apploader.js
@@ -11,6 +11,7 @@
             src += `?v=${self.dashboardVersion}`;
         }
         script.src = src;
+        script.setAttribute('async', '');
 
         if (onload) {
             script.onload = onload;
diff --git a/src/scripts/autoBackdrops.js b/src/scripts/autoBackdrops.js
index abd86c9dbf..051204ef18 100644
--- a/src/scripts/autoBackdrops.js
+++ b/src/scripts/autoBackdrops.js
@@ -1,77 +1,78 @@
-define(['backdrop', 'userSettings', 'libraryMenu'], function (backdrop, userSettings, libraryMenu) {
-    'use strict';
+import backdrop from 'backdrop';
+import * as userSettings from 'userSettings';
+import libraryMenu from 'libraryMenu';
 
-    var cache = {};
+const cache = {};
 
-    function enabled() {
-        return userSettings.enableBackdrops();
+function enabled() {
+    return userSettings.enableBackdrops();
+}
+
+function getBackdropItemIds(apiClient, userId, types, parentId) {
+    const key = `backdrops2_${userId + (types || '') + (parentId || '')}`;
+    let data = cache[key];
+
+    if (data) {
+        console.debug(`Found backdrop id list in cache. Key: ${key}`);
+        data = JSON.parse(data);
+        return Promise.resolve(data);
     }
 
-    function getBackdropItemIds(apiClient, userId, types, parentId) {
-        var key = `backdrops2_${userId + (types || '') + (parentId || '')}`;
-        var data = cache[key];
+    const options = {
+        SortBy: 'IsFavoriteOrLiked,Random',
+        Limit: 20,
+        Recursive: true,
+        IncludeItemTypes: types,
+        ImageTypes: 'Backdrop',
+        ParentId: parentId,
+        EnableTotalRecordCount: false
+    };
+    return apiClient.getItems(apiClient.getCurrentUserId(), options).then(function (result) {
+        const images = result.Items.map(function (i) {
+            return {
+                Id: i.Id,
+                tag: i.BackdropImageTags[0],
+                ServerId: i.ServerId
+            };
+        });
+        cache[key] = JSON.stringify(images);
+        return images;
+    });
+}
 
-        if (data) {
-            console.debug(`Found backdrop id list in cache. Key: ${key}`);
-            data = JSON.parse(data);
-            return Promise.resolve(data);
-        }
+function showBackdrop(type, parentId) {
+    const apiClient = window.ApiClient;
 
-        var options = {
-            SortBy: 'IsFavoriteOrLiked,Random',
-            Limit: 20,
-            Recursive: true,
-            IncludeItemTypes: types,
-            ImageTypes: 'Backdrop',
-            ParentId: parentId,
-            EnableTotalRecordCount: false
-        };
-        return apiClient.getItems(apiClient.getCurrentUserId(), options).then(function (result) {
-            var images = result.Items.map(function (i) {
-                return {
-                    Id: i.Id,
-                    tag: i.BackdropImageTags[0],
-                    ServerId: i.ServerId
-                };
-            });
-            cache[key] = JSON.stringify(images);
-            return images;
+    if (apiClient) {
+        getBackdropItemIds(apiClient, apiClient.getCurrentUserId(), type, parentId).then(function (images) {
+            if (images.length) {
+                backdrop.setBackdrops(images.map(function (i) {
+                    i.BackdropImageTags = [i.tag];
+                    return i;
+                }));
+            } else {
+                backdrop.clearBackdrop();
+            }
         });
     }
+}
 
-    function showBackdrop(type, parentId) {
-        var apiClient = window.ApiClient;
+pageClassOn('pageshow', 'page', function () {
+    const page = this;
 
-        if (apiClient) {
-            getBackdropItemIds(apiClient, apiClient.getCurrentUserId(), type, parentId).then(function (images) {
-                if (images.length) {
-                    backdrop.setBackdrops(images.map(function (i) {
-                        i.BackdropImageTags = [i.tag];
-                        return i;
-                    }));
-                } else {
-                    backdrop.clear();
-                }
-            });
+    if (!page.classList.contains('selfBackdropPage')) {
+        if (page.classList.contains('backdropPage')) {
+            if (enabled()) {
+                const type = page.getAttribute('data-backdroptype');
+                const parentId = page.classList.contains('globalBackdropPage') ? '' : libraryMenu.getTopParentId();
+                showBackdrop(type, parentId);
+            } else {
+                page.classList.remove('backdropPage');
+                backdrop.clearBackdrop();
+            }
+        } else {
+            backdrop.clearBackdrop();
         }
     }
-
-    pageClassOn('pageshow', 'page', function () {
-        var page = this;
-
-        if (!page.classList.contains('selfBackdropPage')) {
-            if (page.classList.contains('backdropPage')) {
-                if (enabled()) {
-                    var type = page.getAttribute('data-backdroptype');
-                    var parentId = page.classList.contains('globalBackdropPage') ? '' : libraryMenu.getTopParentId();
-                    showBackdrop(type, parentId);
-                } else {
-                    page.classList.remove('backdropPage');
-                    backdrop.clear();
-                }
-            } else {
-                backdrop.clear();
-            }
-        }
-    });
 });
+
diff --git a/src/scripts/browser.js b/src/scripts/browser.js
index b1912862b3..a377f08fdb 100644
--- a/src/scripts/browser.js
+++ b/src/scripts/browser.js
@@ -14,10 +14,6 @@ define([], function () {
             return true;
         }
 
-        if (userAgent.indexOf('nintendo') !== -1) {
-            return true;
-        }
-
         if (userAgent.indexOf('viera') !== -1) {
             return true;
         }
@@ -93,7 +89,7 @@ define([], function () {
     var _supportsCssAnimation;
     var _supportsCssAnimationWithPrefix;
     function supportsCssAnimation(allowPrefix) {
-
+        // TODO: Assess if this is still needed, as all of our targets should natively support CSS animations.
         if (allowPrefix) {
             if (_supportsCssAnimationWithPrefix === true || _supportsCssAnimationWithPrefix === false) {
                 return _supportsCssAnimationWithPrefix;
@@ -145,7 +141,6 @@ define([], function () {
             /(chrome)[ \/]([\w.]+)/.exec(ua) ||
             /(safari)[ \/]([\w.]+)/.exec(ua) ||
             /(firefox)[ \/]([\w.]+)/.exec(ua) ||
-            /(msie) ([\w.]+)/.exec(ua) ||
             ua.indexOf('compatible') < 0 && /(mozilla)(?:.*? rv:([\w.]+)|)/.exec(ua) ||
             [];
 
@@ -161,14 +156,6 @@ define([], function () {
 
         if (browser === 'edge') {
             platform_match = [''];
-        } else {
-            if (ua.indexOf('windows phone') !== -1 || ua.indexOf('iemobile') !== -1) {
-
-                // http://www.neowin.net/news/ie11-fakes-user-agent-to-fool-gmail-in-windows-phone-81-gdr1-update
-                browser = 'msie';
-            } else if (ua.indexOf('like gecko') !== -1 && ua.indexOf('webkit') === -1 && ua.indexOf('opera') === -1 && ua.indexOf('chrome') === -1 && ua.indexOf('safari') === -1) {
-                browser = 'msie';
-            }
         }
 
         if (browser === 'opr') {
@@ -211,7 +198,7 @@ define([], function () {
         browser[matched.platform] = true;
     }
 
-    if (!browser.chrome && !browser.msie && !browser.edge && !browser.opera && userAgent.toLowerCase().indexOf('webkit') !== -1) {
+    if (!browser.chrome && !browser.edge && !browser.opera && userAgent.toLowerCase().indexOf('webkit') !== -1) {
         browser.safari = true;
     }
 
@@ -224,7 +211,10 @@ define([], function () {
         browser.mobile = true;
     }
 
-    browser.xboxOne = userAgent.toLowerCase().indexOf('xbox') !== -1;
+    if (userAgent.toLowerCase().indexOf('xbox') !== -1) {
+        browser.xboxOne = true;
+        browser.tv = true;
+    }
     browser.animate = typeof document !== 'undefined' && document.documentElement.animate != null;
     browser.tizen = userAgent.toLowerCase().indexOf('tizen') !== -1 || self.tizen != null;
     browser.web0s = userAgent.toLowerCase().indexOf('Web0S'.toLowerCase()) !== -1;
diff --git a/src/scripts/browserDeviceProfile.js b/src/scripts/browserDeviceProfile.js
index 2668f20913..fcbe002549 100644
--- a/src/scripts/browserDeviceProfile.js
+++ b/src/scripts/browserDeviceProfile.js
@@ -6,18 +6,10 @@ define(['browser'], function (browser) {
     }
 
     function canPlayH265(videoTestElement, options) {
-        if (browser.tizen || browser.orsay || browser.xboxOne || browser.web0s || options.supportsHevc) {
+        if (browser.tizen || browser.xboxOne || browser.web0s || options.supportsHevc) {
             return true;
         }
 
-        var userAgent = navigator.userAgent.toLowerCase();
-        if (browser.chromecast) {
-            var isChromecastUltra = userAgent.indexOf('aarch64') !== -1;
-            if (isChromecastUltra) {
-                return true;
-            }
-        }
-
         if (browser.ps4) {
             return false;
         }
@@ -31,7 +23,7 @@ define(['browser'], function (browser) {
 
     var _supportsTextTracks;
     function supportsTextTracks() {
-        if (browser.tizen || browser.orsay) {
+        if (browser.tizen) {
             return true;
         }
 
@@ -53,7 +45,7 @@ define(['browser'], function (browser) {
     }
 
     function canPlayNativeHls() {
-        if (browser.tizen || browser.orsay) {
+        if (browser.tizen) {
             return true;
         }
 
@@ -68,11 +60,11 @@ define(['browser'], function (browser) {
 
     function canPlayHlsWithMSE() {
         // text tracks don’t work with this in firefox
-        return window.MediaSource != null;
+        return window.MediaSource != null; /* eslint-disable-line compat/compat */
     }
 
     function supportsAc3(videoTestElement) {
-        if (browser.edgeUwp || browser.tizen || browser.orsay || browser.web0s) {
+        if (browser.edgeUwp || browser.tizen || browser.web0s) {
             return true;
         }
 
@@ -80,7 +72,7 @@ define(['browser'], function (browser) {
     }
 
     function supportsEac3(videoTestElement) {
-        if (browser.tizen || browser.orsay || browser.web0s) {
+        if (browser.tizen || browser.web0s) {
             return true;
         }
 
@@ -88,7 +80,7 @@ define(['browser'], function (browser) {
     }
 
     function supportsAc3InHls(videoTestElement) {
-        if (browser.tizen || browser.orsay || browser.web0s) {
+        if (browser.tizen || browser.web0s) {
             return true;
         }
 
@@ -104,11 +96,11 @@ define(['browser'], function (browser) {
         var typeString;
 
         if (format === 'flac') {
-            if (browser.tizen || browser.orsay || browser.web0s || browser.edgeUwp) {
+            if (browser.tizen || browser.web0s || browser.edgeUwp) {
                 return true;
             }
         } else if (format === 'wma') {
-            if (browser.tizen || browser.orsay || browser.edgeUwp) {
+            if (browser.tizen || browser.edgeUwp) {
                 return true;
             }
         } else if (format === 'asf') {
@@ -143,7 +135,7 @@ define(['browser'], function (browser) {
     }
 
     function testCanPlayMkv(videoTestElement) {
-        if (browser.tizen || browser.orsay || browser.web0s) {
+        if (browser.tizen || browser.web0s) {
             return true;
         }
 
@@ -152,23 +144,6 @@ define(['browser'], function (browser) {
             return true;
         }
 
-        // Unfortunately there's no real way to detect mkv support
-        if (browser.chrome) {
-            // Not supported on opera tv
-            if (browser.operaTv) {
-                return false;
-            }
-
-            var userAgent = navigator.userAgent.toLowerCase();
-
-            // Filter out browsers based on chromium that don't support mkv
-            if (userAgent.indexOf('vivaldi') !== -1 || userAgent.indexOf('opera') !== -1) {
-                return false;
-            }
-
-            return true;
-        }
-
         if (browser.edgeUwp) {
             return true;
         }
@@ -176,30 +151,26 @@ define(['browser'], function (browser) {
         return false;
     }
 
+    function testCanPlayAv1(videoTestElement) {
+        if (browser.tizenVersion >= 5.5) {
+            return true;
+        } else if (browser.web0sVersion >= 5 && window.outerHeight >= 2160) {
+            return true;
+        }
+
+        return videoTestElement.canPlayType('video/webm; codecs="av01.0.15M.10"').replace(/no/, '');
+    }
+
     function testCanPlayTs() {
-        return browser.tizen || browser.orsay || browser.web0s || browser.edgeUwp;
+        return browser.tizen || browser.web0s || browser.edgeUwp;
     }
 
     function supportsMpeg2Video() {
-        return browser.tizen || browser.orsay || browser.web0s || browser.edgeUwp;
+        return browser.tizen || browser.web0s || browser.edgeUwp;
     }
 
-    function supportsVc1() {
-        return browser.tizen || browser.orsay || browser.web0s || browser.edgeUwp;
-    }
-
-    function getFlvMseDirectPlayProfile() {
-        var videoAudioCodecs = ['aac'];
-        if (!browser.edge && !browser.msie) {
-            videoAudioCodecs.push('mp3');
-        }
-
-        return {
-            Container: 'flv',
-            Type: 'Video',
-            VideoCodec: 'h264',
-            AudioCodec: videoAudioCodecs.join(',')
-        };
+    function supportsVc1(videoTestElement) {
+        return browser.tizen || browser.web0s || browser.edgeUwp || videoTestElement.canPlayType('video/mp4; codecs="vc-1"').replace(/no/, '');
     }
 
     function getDirectPlayProfileForVideoContainer(container, videoAudioCodecs, videoTestElement, options) {
@@ -209,11 +180,11 @@ define(['browser'], function (browser) {
 
         switch (container) {
             case 'asf':
-                supported = browser.tizen || browser.orsay || browser.web0s || browser.edgeUwp;
+                supported = browser.tizen || browser.web0s || browser.edgeUwp;
                 videoAudioCodecs = [];
                 break;
             case 'avi':
-                supported = browser.tizen || browser.orsay || browser.web0s || browser.edgeUwp;
+                supported = browser.tizen || browser.web0s || browser.edgeUwp;
                 // New Samsung TV don't support XviD/DivX
                 // Explicitly add supported codecs to make other codecs be transcoded
                 if (browser.tizenVersion >= 4) {
@@ -226,29 +197,26 @@ define(['browser'], function (browser) {
                 break;
             case 'mpg':
             case 'mpeg':
-                supported = browser.tizen || browser.orsay || browser.web0s || browser.edgeUwp;
+                supported = browser.tizen || browser.web0s || browser.edgeUwp;
                 break;
             case 'flv':
-                supported = browser.tizen || browser.orsay;
-                //if (!supported && window.MediaSource != null && window.MediaSource.isTypeSupported('video/mp4; codecs="avc1.42E01E,mp4a.40.2"')) {
-                //    return getFlvMseDirectPlayProfile();
-                //}
+                supported = browser.tizen;
                 break;
             case '3gp':
             case 'mts':
             case 'trp':
             case 'vob':
             case 'vro':
-                supported = browser.tizen || browser.orsay;
+                supported = browser.tizen;
                 break;
             case 'mov':
-                supported = browser.tizen || browser.orsay || browser.web0s || browser.chrome || browser.edgeUwp;
+                supported = browser.tizen || browser.web0s || browser.chrome || browser.edgeUwp;
                 videoCodecs.push('h264');
                 break;
             case 'm2ts':
-                supported = browser.tizen || browser.orsay || browser.web0s || browser.edgeUwp;
+                supported = browser.tizen || browser.web0s || browser.edgeUwp;
                 videoCodecs.push('h264');
-                if (supportsVc1()) {
+                if (supportsVc1(videoTestElement)) {
                     videoCodecs.push('vc1');
                 }
                 if (supportsMpeg2Video()) {
@@ -256,7 +224,7 @@ define(['browser'], function (browser) {
                 }
                 break;
             case 'wmv':
-                supported = browser.tizen || browser.orsay || browser.web0s || browser.edgeUwp;
+                supported = browser.tizen || browser.web0s || browser.edgeUwp;
                 videoAudioCodecs = [];
                 break;
             case 'ts':
@@ -266,7 +234,7 @@ define(['browser'], function (browser) {
                     videoCodecs.push('h265');
                     videoCodecs.push('hevc');
                 }
-                if (supportsVc1()) {
+                if (supportsVc1(videoTestElement)) {
                     videoCodecs.push('vc1');
                 }
                 if (supportsMpeg2Video()) {
@@ -291,21 +259,6 @@ define(['browser'], function (browser) {
     }
 
     function getGlobalMaxVideoBitrate() {
-        var userAgent = navigator.userAgent.toLowerCase();
-        if (browser.chromecast) {
-            var isChromecastUltra = userAgent.indexOf('aarch64') !== -1;
-            if (isChromecastUltra) {
-                return null;
-            }
-
-            // This is a hack to try and detect chromecast on vizio
-            if (self.screen && self.screen.width >= 3800) {
-                return null;
-            }
-
-            return 30000000;
-        }
-
         var isTizenFhd = false;
         if (browser.tizen) {
             try {
@@ -334,7 +287,6 @@ define(['browser'], function (browser) {
 
         var canPlayVp8 = videoTestElement.canPlayType('video/webm; codecs="vp8"').replace(/no/, '');
         var canPlayVp9 = videoTestElement.canPlayType('video/webm; codecs="vp9"').replace(/no/, '');
-        var canPlayAv1 = videoTestElement.canPlayType('video/webm; codecs="av1"').replace(/no/, '');
         var webmAudioCodecs = ['vorbis'];
 
         var canPlayMkv = testCanPlayMkv(videoTestElement);
@@ -350,11 +302,12 @@ define(['browser'], function (browser) {
         var videoAudioCodecs = [];
         var hlsVideoAudioCodecs = [];
 
-        var supportsMp3VideoAudio = videoTestElement.canPlayType('video/mp4; codecs="avc1.640029, mp4a.69"').replace(/no/, '') ||
-            videoTestElement.canPlayType('video/mp4; codecs="avc1.640029, mp4a.6B"').replace(/no/, '');
+        var supportsMp3VideoAudio = videoTestElement.canPlayType('video/mp4; codecs="avc1.640029, mp4a.69"').replace(/no/, '')
+                                    || videoTestElement.canPlayType('video/mp4; codecs="avc1.640029, mp4a.6B"').replace(/no/, '')
+                                    || videoTestElement.canPlayType('video/mp4; codecs="avc1.640029, mp3"').replace(/no/, '');
 
         // Not sure how to test for this
-        var supportsMp2VideoAudio = browser.edgeUwp || browser.tizen || browser.orsay || browser.web0s;
+        var supportsMp2VideoAudio = browser.edgeUwp || browser.tizen || browser.web0s;
 
         var maxVideoWidth = browser.xboxOne ?
             (self.screen ? self.screen.width : null) :
@@ -366,11 +319,6 @@ define(['browser'], function (browser) {
 
         var canPlayAacVideoAudio = videoTestElement.canPlayType('video/mp4; codecs="avc1.640029, mp4a.40.2"').replace(/no/, '');
 
-        if (canPlayAacVideoAudio && browser.chromecast && physicalAudioChannels <= 2) {
-            // prioritize this first
-            videoAudioCodecs.push('aac');
-        }
-
         // Only put mp3 first if mkv support is there
         // Otherwise with HLS and mp3 audio we're seeing some browsers
         // safari is lying
@@ -393,11 +341,6 @@ define(['browser'], function (browser) {
             }
         }
 
-        if (canPlayAacVideoAudio && browser.chromecast && videoAudioCodecs.indexOf('aac') === -1) {
-            // prioritize this first
-            videoAudioCodecs.push('aac');
-        }
-
         if (supportsMp3VideoAudio) {
             videoAudioCodecs.push('mp3');
 
@@ -432,7 +375,7 @@ define(['browser'], function (browser) {
             videoAudioCodecs.push('mp2');
         }
 
-        var supportsDts = browser.tizen || browser.orsay || browser.web0s || options.supportsDts;
+        var supportsDts = browser.tizen || browser.web0s || options.supportsDts || videoTestElement.canPlayType('video/mp4; codecs="dts-"').replace(/no/, '') || videoTestElement.canPlayType('video/mp4; codecs="dts+"').replace(/no/, '');
 
         // DTS audio not supported in 2018 models (Tizen 4.0)
         if (browser.tizenVersion >= 4) {
@@ -444,7 +387,7 @@ define(['browser'], function (browser) {
             videoAudioCodecs.push('dts');
         }
 
-        if (browser.tizen || browser.orsay || browser.web0s) {
+        if (browser.tizen || browser.web0s) {
             videoAudioCodecs.push('pcm_s16le');
             videoAudioCodecs.push('pcm_s24le');
         }
@@ -453,7 +396,7 @@ define(['browser'], function (browser) {
             videoAudioCodecs.push('truehd');
         }
 
-        if (browser.tizen || browser.orsay) {
+        if (browser.tizen) {
             videoAudioCodecs.push('aac_latm');
         }
 
@@ -476,6 +419,7 @@ define(['browser'], function (browser) {
         });
 
         var mp4VideoCodecs = [];
+        var webmVideoCodecs = [];
         var hlsVideoCodecs = [];
 
         if (canPlayH264(videoTestElement)) {
@@ -497,26 +441,42 @@ define(['browser'], function (browser) {
             mp4VideoCodecs.push('mpeg2video');
         }
 
-        if (supportsVc1()) {
+        if (supportsVc1(videoTestElement)) {
             mp4VideoCodecs.push('vc1');
         }
 
-        if (browser.tizen || browser.orsay) {
+        if (browser.tizen) {
             mp4VideoCodecs.push('msmpeg4v2');
         }
 
         if (canPlayVp8) {
             mp4VideoCodecs.push('vp8');
+            webmVideoCodecs.push('vp8');
         }
 
         if (canPlayVp9) {
             mp4VideoCodecs.push('vp9');
+            webmVideoCodecs.push('vp9');
         }
 
-        if (canPlayVp8 || browser.tizen || browser.orsay) {
+        if (testCanPlayAv1(videoTestElement)) {
+            mp4VideoCodecs.push('av1');
+            webmVideoCodecs.push('av1');
+        }
+
+        if (canPlayVp8 || browser.tizen) {
             videoAudioCodecs.push('vorbis');
         }
 
+        if (webmVideoCodecs.length) {
+            profile.DirectPlayProfiles.push({
+                Container: 'webm',
+                Type: 'Video',
+                VideoCodec: webmVideoCodecs.join(','),
+                AudioCodec: webmAudioCodecs.join(',')
+            });
+        }
+
         if (mp4VideoCodecs.length) {
             profile.DirectPlayProfiles.push({
                 Container: 'mp4,m4v',
@@ -575,33 +535,6 @@ define(['browser'], function (browser) {
             }
         });
 
-        if (canPlayVp8) {
-            profile.DirectPlayProfiles.push({
-                Container: 'webm',
-                Type: 'Video',
-                AudioCodec: webmAudioCodecs.join(','),
-                VideoCodec: 'VP8'
-            });
-        }
-
-        if (canPlayVp9) {
-            profile.DirectPlayProfiles.push({
-                Container: 'webm',
-                Type: 'Video',
-                AudioCodec: webmAudioCodecs.join(','),
-                VideoCodec: 'VP9'
-            });
-        }
-
-        if (canPlayAv1) {
-            profile.DirectPlayProfiles.push({
-                Container: 'webm',
-                Type: 'Video',
-                AudioCodec: webmAudioCodecs.join(','),
-                VideoCodec: 'AV1'
-            });
-        }
-
         profile.TranscodingProfiles = [];
 
         var hlsBreakOnNonKeyFrames = browser.iOS || browser.osx || browser.edge || !canPlayNativeHls() ? true : false;
@@ -645,7 +578,7 @@ define(['browser'], function (browser) {
             });
         });
 
-        if (canPlayMkv && !browser.tizen && !browser.orsay && options.enableMkvProgressive !== false) {
+        if (canPlayMkv && !browser.tizen && options.enableMkvProgressive !== false) {
             profile.TranscodingProfiles.push({
                 Container: 'mkv',
                 Type: 'Video',
@@ -710,7 +643,7 @@ define(['browser'], function (browser) {
 
         profile.CodecProfiles = [];
 
-        var supportsSecondaryAudio = browser.tizen || browser.orsay || videoTestElement.audioTracks;
+        var supportsSecondaryAudio = browser.tizen || videoTestElement.audioTracks;
 
         var aacCodecProfileConditions = [];
 
@@ -733,15 +666,6 @@ define(['browser'], function (browser) {
             });
         }
 
-        if (browser.chromecast) {
-            aacCodecProfileConditions.push({
-                Condition: 'LessThanEqual',
-                Property: 'AudioChannels',
-                Value: '2',
-                IsRequired: true
-            });
-        }
-
         if (aacCodecProfileConditions.length) {
             profile.CodecProfiles.push({
                 Type: 'VideoAudio',
@@ -767,7 +691,7 @@ define(['browser'], function (browser) {
         var maxH264Level = 42;
         var h264Profiles = 'high|main|baseline|constrained baseline';
 
-        if (browser.tizen || browser.orsay || browser.web0s ||
+        if (browser.tizen || browser.web0s ||
             videoTestElement.canPlayType('video/mp4; codecs="avc1.640833"').replace(/no/, '')) {
             maxH264Level = 51;
         }
@@ -777,7 +701,7 @@ define(['browser'], function (browser) {
             maxH264Level = 52;
         }
 
-        if (browser.tizen || browser.orsay ||
+        if (browser.tizen ||
             videoTestElement.canPlayType('video/mp4; codecs="avc1.6e0033"').replace(/no/, '')) {
 
             // These tests are passing in safari, but playback is failing
@@ -811,20 +735,13 @@ define(['browser'], function (browser) {
             ]
         });
 
-        if (!browser.edgeUwp && !browser.tizen && !browser.orsay && !browser.web0s) {
-            //profile.CodecProfiles[profile.CodecProfiles.length - 1].Conditions.push({
-            //    Condition: 'NotEquals',
-            //    Property: 'IsAVC',
-            //    Value: 'false',
-            //    IsRequired: false
-            //});
-
-            //profile.CodecProfiles[profile.CodecProfiles.length - 1].Conditions.push({
-            //    Condition: 'NotEquals',
-            //    Property: 'IsInterlaced',
-            //    Value: 'true',
-            //    IsRequired: false
-            //});
+        if (!browser.edgeUwp && !browser.tizen && !browser.web0s) {
+            profile.CodecProfiles[profile.CodecProfiles.length - 1].Conditions.push({
+                Condition: 'NotEquals',
+                Property: 'IsInterlaced',
+                Value: 'true',
+                IsRequired: false
+            });
         }
 
         if (maxVideoWidth) {
@@ -875,19 +792,6 @@ define(['browser'], function (browser) {
             });
         }
 
-        if (browser.chromecast) {
-            profile.CodecProfiles.push({
-                Type: 'Audio',
-                Codec: 'flac',
-                Conditions: [
-                    {
-                        Condition: 'LessThanEqual',
-                        Property: 'AudioSampleRate',
-                        Value: '96000'
-                    }]
-            });
-        }
-
         // Subtitle profiles
         // External vtt or burn in
         profile.SubtitleProfiles = [];
diff --git a/src/scripts/datetime.js b/src/scripts/datetime.js
index 34ff23fe63..cab59299ad 100644
--- a/src/scripts/datetime.js
+++ b/src/scripts/datetime.js
@@ -1,15 +1,16 @@
-define(['globalize'], function (globalize) {
-    'use strict';
+import globalize from 'globalize';
 
-    function parseISO8601Date(s, toLocal) {
+/* eslint-disable indent */
+
+    export function parseISO8601Date(s, toLocal) {
 
         // parenthese matches:
         // year month day    hours minutes seconds
         // dotmilliseconds
         // tzstring plusminus hours minutes
-        var re = /(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})(\.\d+)?(Z|([+-])(\d{2}):(\d{2}))?/;
+        const re = /(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})(\.\d+)?(Z|([+-])(\d{2}):(\d{2}))?/;
 
-        var d = s.match(re);
+        const d = s.match(re);
 
         // "2010-12-07T11:00:00.000-09:00" parses to:
         //  ["2010-12-07T11:00:00.000-09:00", "2010", "12", "07", "11",
@@ -24,8 +25,8 @@ define(['globalize'], function (globalize) {
         }
 
         // parse strings, leading zeros into proper ints
-        var a = [1, 2, 3, 4, 5, 6, 10, 11];
-        for (var i in a) {
+        const a = [1, 2, 3, 4, 5, 6, 10, 11];
+        for (let i in a) {
             d[a[i]] = parseInt(d[a[i]], 10);
         }
         d[7] = parseFloat(d[7]);
@@ -33,7 +34,7 @@ define(['globalize'], function (globalize) {
         // Date.UTC(year, month[, date[, hrs[, min[, sec[, ms]]]]])
         // note that month is 0-11, not 1-12
         // see https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Date/UTC
-        var ms = Date.UTC(d[1], d[2] - 1, d[3], d[4], d[5], d[6]);
+        let ms = Date.UTC(d[1], d[2] - 1, d[3], d[4], d[5], d[6]);
 
         // if there are milliseconds, add them
         if (d[7] > 0) {
@@ -42,7 +43,7 @@ define(['globalize'], function (globalize) {
 
         // if there's a timezone, calculate it
         if (d[8] !== 'Z' && d[10]) {
-            var offset = d[10] * 60 * 60 * 1000;
+            let offset = d[10] * 60 * 60 * 1000;
             if (d[11]) {
                 offset += d[11] * 60 * 1000;
             }
@@ -58,14 +59,14 @@ define(['globalize'], function (globalize) {
         return new Date(ms);
     }
 
-    function getDisplayRunningTime(ticks) {
-        var ticksPerHour = 36000000000;
-        var ticksPerMinute = 600000000;
-        var ticksPerSecond = 10000000;
+    export function getDisplayRunningTime(ticks) {
+        const ticksPerHour = 36000000000;
+        const ticksPerMinute = 600000000;
+        const ticksPerSecond = 10000000;
 
-        var parts = [];
+        const parts = [];
 
-        var hours = ticks / ticksPerHour;
+        let hours = ticks / ticksPerHour;
         hours = Math.floor(hours);
 
         if (hours) {
@@ -74,7 +75,7 @@ define(['globalize'], function (globalize) {
 
         ticks -= (hours * ticksPerHour);
 
-        var minutes = ticks / ticksPerMinute;
+        let minutes = ticks / ticksPerMinute;
         minutes = Math.floor(minutes);
 
         ticks -= (minutes * ticksPerMinute);
@@ -84,7 +85,7 @@ define(['globalize'], function (globalize) {
         }
         parts.push(minutes);
 
-        var seconds = ticks / ticksPerSecond;
+        let seconds = ticks / ticksPerSecond;
         seconds = Math.floor(seconds);
 
         if (seconds < 10) {
@@ -95,7 +96,7 @@ define(['globalize'], function (globalize) {
         return parts.join(':');
     }
 
-    var toLocaleTimeStringSupportsLocales = function () {
+    const toLocaleTimeStringSupportsLocales = function () {
         try {
             new Date().toLocaleTimeString('i');
         } catch (e) {
@@ -106,9 +107,9 @@ define(['globalize'], function (globalize) {
 
     function getOptionList(options) {
 
-        var list = [];
+        const list = [];
 
-        for (var i in options) {
+        for (const i in options) {
             list.push({
                 name: i,
                 value: options[i]
@@ -118,7 +119,7 @@ define(['globalize'], function (globalize) {
         return list;
     }
 
-    function toLocaleString(date, options) {
+    export function toLocaleString(date, options) {
 
         if (!date) {
             throw new Error('date cannot be null');
@@ -128,7 +129,7 @@ define(['globalize'], function (globalize) {
 
         if (toLocaleTimeStringSupportsLocales) {
 
-            var currentLocale = globalize.getCurrentDateTimeLocale();
+            const currentLocale = globalize.getCurrentDateTimeLocale();
 
             if (currentLocale) {
                 return date.toLocaleString(currentLocale, options);
@@ -138,7 +139,7 @@ define(['globalize'], function (globalize) {
         return date.toLocaleString();
     }
 
-    function toLocaleDateString(date, options) {
+    export function toLocaleDateString(date, options) {
 
         if (!date) {
             throw new Error('date cannot be null');
@@ -148,7 +149,7 @@ define(['globalize'], function (globalize) {
 
         if (toLocaleTimeStringSupportsLocales) {
 
-            var currentLocale = globalize.getCurrentDateTimeLocale();
+            const currentLocale = globalize.getCurrentDateTimeLocale();
 
             if (currentLocale) {
                 return date.toLocaleDateString(currentLocale, options);
@@ -156,9 +157,9 @@ define(['globalize'], function (globalize) {
         }
 
         // This is essentially a hard-coded polyfill
-        var optionList = getOptionList(options);
+        const optionList = getOptionList(options);
         if (optionList.length === 1 && optionList[0].name === 'weekday') {
-            var weekday = [];
+            const weekday = [];
             weekday[0] = 'Sun';
             weekday[1] = 'Mon';
             weekday[2] = 'Tue';
@@ -172,7 +173,7 @@ define(['globalize'], function (globalize) {
         return date.toLocaleDateString();
     }
 
-    function toLocaleTimeString(date, options) {
+    export function toLocaleTimeString(date, options) {
 
         if (!date) {
             throw new Error('date cannot be null');
@@ -182,7 +183,7 @@ define(['globalize'], function (globalize) {
 
         if (toLocaleTimeStringSupportsLocales) {
 
-            var currentLocale = globalize.getCurrentDateTimeLocale();
+            const currentLocale = globalize.getCurrentDateTimeLocale();
 
             if (currentLocale) {
                 return date.toLocaleTimeString(currentLocale, options);
@@ -192,7 +193,7 @@ define(['globalize'], function (globalize) {
         return date.toLocaleTimeString();
     }
 
-    function getDisplayTime(date) {
+    export function getDisplayTime(date) {
 
         if (!date) {
             throw new Error('date cannot be null');
@@ -217,19 +218,19 @@ define(['globalize'], function (globalize) {
             });
         }
 
-        var time = toLocaleTimeString(date);
+        let time = toLocaleTimeString(date);
 
-        var timeLower = time.toLowerCase();
+        const timeLower = time.toLowerCase();
 
         if (timeLower.indexOf('am') !== -1 || timeLower.indexOf('pm') !== -1) {
 
             time = timeLower;
-            var hour = date.getHours() % 12;
-            var suffix = date.getHours() > 11 ? 'pm' : 'am';
+            let hour = date.getHours() % 12;
+            const suffix = date.getHours() > 11 ? 'pm' : 'am';
             if (!hour) {
                 hour = 12;
             }
-            var minutes = date.getMinutes();
+            let minutes = date.getMinutes();
 
             if (minutes < 10) {
                 minutes = '0' + minutes;
@@ -239,7 +240,7 @@ define(['globalize'], function (globalize) {
             time = hour + minutes + suffix;
         } else {
 
-            var timeParts = time.split(':');
+            const timeParts = time.split(':');
 
             // Trim off seconds
             if (timeParts.length > 2) {
@@ -253,21 +254,21 @@ define(['globalize'], function (globalize) {
         return time;
     }
 
-    function isRelativeDay(date, offsetInDays) {
+    export function isRelativeDay(date, offsetInDays) {
 
         if (!date) {
             throw new Error('date cannot be null');
         }
 
-        var yesterday = new Date();
-        var day = yesterday.getDate() + offsetInDays;
+        const yesterday = new Date();
+        const day = yesterday.getDate() + offsetInDays;
 
         yesterday.setDate(day); // automatically adjusts month/year appropriately
 
         return date.getFullYear() === yesterday.getFullYear() && date.getMonth() === yesterday.getMonth() && date.getDate() === day;
     }
 
-    return {
+    export default {
         parseISO8601Date: parseISO8601Date,
         getDisplayRunningTime: getDisplayRunningTime,
         toLocaleDateString: toLocaleDateString,
@@ -279,4 +280,5 @@ define(['globalize'], function (globalize) {
             return toLocaleTimeStringSupportsLocales;
         }
     };
-});
+
+/* eslint-enable indent */
diff --git a/src/scripts/deleteHelper.js b/src/scripts/deleteHelper.js
index e13eb9c4ae..fc5ffe059f 100644
--- a/src/scripts/deleteHelper.js
+++ b/src/scripts/deleteHelper.js
@@ -7,7 +7,7 @@ function alertText(options) {
 
     return new Promise(function (resolve, reject) {
 
-        require(['alert'], function (alert) {
+        import('alert').then(({default: alert}) => {
             alert(options).then(resolve, resolve);
         });
     });
diff --git a/src/scripts/dom.js b/src/scripts/dom.js
index a3d157f337..080bff66ae 100644
--- a/src/scripts/dom.js
+++ b/src/scripts/dom.js
@@ -211,7 +211,7 @@
             'MozAnimation': 'animationend',
             'WebkitAnimation': 'webkitAnimationEnd'
         };
-        for (let t in animations) {
+        for (const t in animations) {
             if (el.style[t] !== undefined) {
                 _animationEvent = animations[t];
                 return animations[t];
@@ -251,7 +251,7 @@
             'MozTransition': 'transitionend',
             'WebkitTransition': 'webkitTransitionEnd'
         };
-        for (let t in transitions) {
+        for (const t in transitions) {
             if (el.style[t] !== undefined) {
                 _transitionEvent = transitions[t];
                 return transitions[t];
diff --git a/src/scripts/editorsidebar.js b/src/scripts/editorsidebar.js
index ee7788407c..5d0e237a0d 100644
--- a/src/scripts/editorsidebar.js
+++ b/src/scripts/editorsidebar.js
@@ -1,5 +1,9 @@
-define(['datetime', 'jQuery', 'globalize', 'material-icons'], function (datetime, $, globalize) {
-    'use strict';
+import datetime from 'datetime';
+import $ from 'jQuery';
+import globalize from 'globalize';
+import 'material-icons';
+
+/* eslint-disable indent */
 
     function getNode(item, folderState, selected) {
         var htmlName = getNodeInnerHtml(item);
@@ -179,7 +183,7 @@ define(['datetime', 'jQuery', 'globalize', 'material-icons'], function (datetime
     }
 
     function initializeTree(page, currentUser, openItems, selectedId) {
-        require(['jstree'], function () {
+        import('jstree').then(() => {
             initializeTreeInternal(page, currentUser, openItems, selectedId);
         });
     }
@@ -209,7 +213,7 @@ define(['datetime', 'jQuery', 'globalize', 'material-icons'], function (datetime
     function onNodeOpen(event, data) {
         var page = $(this).parents('.page')[0];
         var node = data.node;
-        if (node.children && node.children) {
+        if (node.children) {
             loadNodesToLoad(page, node);
         }
         if (node.li_attr && node.id != '#' && !node.li_attr.loadedFromServer) {
@@ -221,7 +225,7 @@ define(['datetime', 'jQuery', 'globalize', 'material-icons'], function (datetime
     function onNodeLoad(event, data) {
         var page = $(this).parents('.page')[0];
         var node = data.node;
-        if (node.children && node.children) {
+        if (node.children) {
             loadNodesToLoad(page, node);
         }
         if (node.li_attr && node.id != '#' && !node.li_attr.loadedFromServer) {
@@ -299,7 +303,7 @@ define(['datetime', 'jQuery', 'globalize', 'material-icons'], function (datetime
     $(document).on('itemsaved', '.metadataEditorPage', function (e, item) {
         updateEditorNode(this, item);
     }).on('pagebeforeshow', '.metadataEditorPage', function () {
-        require(['css!assets/css/metadataeditor.css']);
+        import('css!assets/css/metadataeditor.css');
     }).on('pagebeforeshow', '.metadataEditorPage', function () {
         var page = this;
         Dashboard.getCurrentUser().then(function (user) {
@@ -331,4 +335,5 @@ define(['datetime', 'jQuery', 'globalize', 'material-icons'], function (datetime
         getCurrentItemId: getCurrentItemId,
         setCurrentItemId: setCurrentItemId
     };
-});
+
+/* eslint-enable indent */
diff --git a/src/scripts/globalize.js b/src/scripts/globalize.js
index 2d7d725b5d..4af1ea6cbf 100644
--- a/src/scripts/globalize.js
+++ b/src/scripts/globalize.js
@@ -1,21 +1,24 @@
-define(['userSettings', 'events'], function (userSettings, events) {
-    'use strict';
-    var fallbackCulture = 'en-us';
+import * as userSettings from 'userSettings';
+import events from 'events';
 
-    var allTranslations = {};
-    var currentCulture;
-    var currentDateTimeCulture;
+/* eslint-disable indent */
 
-    function getCurrentLocale() {
+    const fallbackCulture = 'en-us';
+
+    const allTranslations = {};
+    let currentCulture;
+    let currentDateTimeCulture;
+
+    export function getCurrentLocale() {
         return currentCulture;
     }
 
-    function getCurrentDateTimeLocale() {
+    export function getCurrentDateTimeLocale() {
         return currentDateTimeCulture;
     }
 
     function getDefaultLanguage() {
-        var culture = document.documentElement.getAttribute('data-culture');
+        const culture = document.documentElement.getAttribute('data-culture');
         if (culture) {
             return culture;
         }
@@ -33,8 +36,8 @@ define(['userSettings', 'events'], function (userSettings, events) {
         return fallbackCulture;
     }
 
-    function updateCurrentCulture() {
-        var culture;
+    export function updateCurrentCulture() {
+        let culture;
         try {
             culture = userSettings.language();
         } catch (err) {
@@ -44,7 +47,7 @@ define(['userSettings', 'events'], function (userSettings, events) {
 
         currentCulture = normalizeLocaleName(culture);
 
-        var dateTimeCulture;
+        let dateTimeCulture;
         try {
             dateTimeCulture = userSettings.dateTimeLocale();
         } catch (err) {
@@ -60,11 +63,11 @@ define(['userSettings', 'events'], function (userSettings, events) {
     }
 
     function ensureTranslations(culture) {
-        for (var i in allTranslations) {
+        for (let i in allTranslations) {
             ensureTranslation(allTranslations[i], culture);
         }
         if (culture !== fallbackCulture) {
-            for (var i in allTranslations) {
+            for (let i in allTranslations) {
                 ensureTranslation(allTranslations[i], fallbackCulture);
             }
         }
@@ -85,14 +88,14 @@ define(['userSettings', 'events'], function (userSettings, events) {
         culture = culture.replace('_', '-');
 
         // convert de-DE to de
-        var parts = culture.split('-');
+        const parts = culture.split('-');
         if (parts.length === 2) {
             if (parts[0].toLowerCase() === parts[1].toLowerCase()) {
                 culture = parts[0].toLowerCase();
             }
         }
 
-        var lower = culture.toLowerCase();
+        const lower = culture.toLowerCase();
         if (lower === 'ca-es') {
             return 'ca';
         }
@@ -110,7 +113,7 @@ define(['userSettings', 'events'], function (userSettings, events) {
             module = defaultModule();
         }
 
-        var translations = allTranslations[module];
+        const translations = allTranslations[module];
         if (!translations) {
             return {};
         }
@@ -118,17 +121,17 @@ define(['userSettings', 'events'], function (userSettings, events) {
         return translations.dictionaries[locale];
     }
 
-    function register(options) {
+    export function register(options) {
         allTranslations[options.name] = {
             translations: options.strings || options.translations,
             dictionaries: {}
         };
     }
 
-    function loadStrings(options) {
-        var locale = getCurrentLocale();
-        var promises = [];
-        var optionsName;
+    export function loadStrings(options) {
+        const locale = getCurrentLocale();
+        const promises = [];
+        let optionsName;
         if (typeof options === 'string') {
             optionsName = options;
         } else {
@@ -140,10 +143,10 @@ define(['userSettings', 'events'], function (userSettings, events) {
         return Promise.all(promises);
     }
 
-    var cacheParam = new Date().getTime();
+    const cacheParam = new Date().getTime();
     function loadTranslation(translations, lang) {
         lang = normalizeLocaleName(lang);
-        var filtered = translations.filter(function (t) {
+        let filtered = translations.filter(function (t) {
             return normalizeLocaleName(t.lang) === lang;
         });
 
@@ -159,12 +162,12 @@ define(['userSettings', 'events'], function (userSettings, events) {
                 return;
             }
 
-            var url = filtered[0].path;
+            let url = filtered[0].path;
 
             url += url.indexOf('?') === -1 ? '?' : '&';
             url += 'v=' + cacheParam;
 
-            var xhr = new XMLHttpRequest();
+            const xhr = new XMLHttpRequest();
             xhr.open('GET', url, true);
 
             xhr.onload = function (e) {
@@ -183,8 +186,8 @@ define(['userSettings', 'events'], function (userSettings, events) {
     }
 
     function translateKey(key) {
-        var parts = key.split('#');
-        var module;
+        const parts = key.split('#');
+        let module;
 
         if (parts.length > 1) {
             module = parts[0];
@@ -195,7 +198,7 @@ define(['userSettings', 'events'], function (userSettings, events) {
     }
 
     function translateKeyFromModule(key, module) {
-        var dictionary = getDictionary(module, getCurrentLocale());
+        let dictionary = getDictionary(module, getCurrentLocale());
         if (!dictionary || !dictionary[key]) {
             dictionary = getDictionary(module, fallbackCulture);
         }
@@ -209,15 +212,15 @@ define(['userSettings', 'events'], function (userSettings, events) {
         return str.split(find).join(replace);
     }
 
-    function translate(key) {
-        var val = translateKey(key);
-        for (var i = 1; i < arguments.length; i++) {
+    export function translate(key) {
+        let val = translateKey(key);
+        for (let i = 1; i < arguments.length; i++) {
             val = replaceAll(val, '{' + (i - 1) + '}', arguments[i]);
         }
         return val;
     }
 
-    function translateHtml(html, module) {
+    export function translateHtml(html, module) {
         if (!module) {
             module = defaultModule();
         }
@@ -225,26 +228,26 @@ define(['userSettings', 'events'], function (userSettings, events) {
             throw new Error('module cannot be null or empty');
         }
 
-        var startIndex = html.indexOf('${');
+        let startIndex = html.indexOf('${');
         if (startIndex === -1) {
             return html;
         }
 
         startIndex += 2;
-        var endIndex = html.indexOf('}', startIndex);
+        const endIndex = html.indexOf('}', startIndex);
         if (endIndex === -1) {
             return html;
         }
 
-        var key = html.substring(startIndex, endIndex);
-        var val = translateKeyFromModule(key, module);
+        const key = html.substring(startIndex, endIndex);
+        const val = translateKeyFromModule(key, module);
 
         html = html.replace('${' + key + '}', val);
         return translateHtml(html, module);
     }
 
-    var _defaultModule;
-    function defaultModule(val) {
+    let _defaultModule;
+    export function defaultModule(val) {
         if (val) {
             _defaultModule = val;
         }
@@ -259,16 +262,15 @@ define(['userSettings', 'events'], function (userSettings, events) {
         }
     });
 
-    return {
-        getString: translate,
-        translate: translate,
-        translateDocument: translateHtml,
-        translateHtml: translateHtml,
-        loadStrings: loadStrings,
-        defaultModule: defaultModule,
-        getCurrentLocale: getCurrentLocale,
-        getCurrentDateTimeLocale: getCurrentDateTimeLocale,
-        register: register,
-        updateCurrentCulture: updateCurrentCulture
-    };
-});
+export default {
+    translate,
+    translateHtml,
+    loadStrings,
+    defaultModule,
+    getCurrentLocale,
+    getCurrentDateTimeLocale,
+    register,
+    updateCurrentCulture
+};
+
+/* eslint-enable indent */
diff --git a/src/scripts/inputManager.js b/src/scripts/inputManager.js
index 8af52c77e8..43fa150750 100644
--- a/src/scripts/inputManager.js
+++ b/src/scripts/inputManager.js
@@ -66,9 +66,12 @@ import appHost from 'apphost';
         if (!sourceElement) {
             sourceElement = document.activeElement || window;
 
-            const dlg = document.querySelector('.dialogContainer .dialog.opened');
+            const dialogs = document.querySelectorAll('.dialogContainer .dialog.opened');
 
-            if (dlg && (!sourceElement || !dlg.contains(sourceElement))) {
+            // Suppose the top open dialog is active
+            const dlg = dialogs.length ? dialogs[dialogs.length - 1] : null;
+
+            if (dlg && !dlg.contains(sourceElement)) {
                 sourceElement = dlg;
             }
         }
@@ -201,6 +204,9 @@ import appHost from 'apphost';
             'rewind': () => {
                 playbackManager.rewind();
             },
+            'seek': () => {
+                playbackManager.seekMs(options);
+            },
             'togglefullscreen': () => {
                 playbackManager.toggleFullscreen();
             },
@@ -235,9 +241,6 @@ import appHost from 'apphost';
         }
     }
 
-    // Alias for backward compatibility
-    export const trigger = handleCommand;
-
     dom.addEventListener(document, 'click', notify, {
         passive: true
     });
@@ -245,8 +248,7 @@ import appHost from 'apphost';
 /* eslint-enable indent */
 
 export default {
-    trigger: handleCommand,
-    handle: handleCommand,
+    handleCommand: handleCommand,
     notify: notify,
     notifyMouseMove: notifyMouseMove,
     idleTime: idleTime,
diff --git a/src/scripts/itembynamedetailpage.js b/src/scripts/itembynamedetailpage.js
index 44eca55589..fd29724225 100644
--- a/src/scripts/itembynamedetailpage.js
+++ b/src/scripts/itembynamedetailpage.js
@@ -71,12 +71,12 @@ define(['connectionManager', 'listView', 'cardBuilder', 'imageLoader', 'libraryB
 
             html += '<div class="' + sectionClass + '" data-type="' + section.type + '">';
             html += '<div class="sectionTitleContainer sectionTitleContainer-cards">';
-            html += '<h2 class="sectionTitle sectionTitle-cards padded-left">';
+            html += '<h2 class="sectionTitle sectionTitle-cards">';
             html += section.name;
             html += '</h2>';
             html += '<a is="emby-linkbutton" href="#" class="clearLink hide" style="margin-left:1em;vertical-align:middle;"><button is="emby-button" type="button" class="raised more raised-mini noIcon">' + globalize.translate('ButtonMore') + '</button></a>';
             html += '</div>';
-            html += '<div is="emby-itemscontainer" class="itemsContainer padded-left padded-right">';
+            html += '<div is="emby-itemscontainer" class="itemsContainer padded-right">';
             html += '</div>';
             return html += '</div>';
         }).join('');
diff --git a/src/scripts/keyboardNavigation.js b/src/scripts/keyboardNavigation.js
index 6664afed53..7cc4df9553 100644
--- a/src/scripts/keyboardNavigation.js
+++ b/src/scripts/keyboardNavigation.js
@@ -78,7 +78,7 @@ export function isNavigationKey(key) {
 }
 
 export function enable() {
-    document.addEventListener('keydown', function (e) {
+    window.addEventListener('keydown', function (e) {
         const key = getKeyName(e);
 
         // Ignore navigation keys for non-TV
@@ -90,53 +90,53 @@ export function enable() {
 
         switch (key) {
             case 'ArrowLeft':
-                inputManager.handle('left');
+                inputManager.handleCommand('left');
                 break;
             case 'ArrowUp':
-                inputManager.handle('up');
+                inputManager.handleCommand('up');
                 break;
             case 'ArrowRight':
-                inputManager.handle('right');
+                inputManager.handleCommand('right');
                 break;
             case 'ArrowDown':
-                inputManager.handle('down');
+                inputManager.handleCommand('down');
                 break;
 
             case 'Back':
-                inputManager.handle('back');
+                inputManager.handleCommand('back');
                 break;
 
             case 'Escape':
                 if (layoutManager.tv) {
-                    inputManager.handle('back');
+                    inputManager.handleCommand('back');
                 } else {
                     capture = false;
                 }
                 break;
 
             case 'MediaPlay':
-                inputManager.handle('play');
+                inputManager.handleCommand('play');
                 break;
             case 'Pause':
-                inputManager.handle('pause');
+                inputManager.handleCommand('pause');
                 break;
             case 'MediaPlayPause':
-                inputManager.handle('playpause');
+                inputManager.handleCommand('playpause');
                 break;
             case 'MediaRewind':
-                inputManager.handle('rewind');
+                inputManager.handleCommand('rewind');
                 break;
             case 'MediaFastForward':
-                inputManager.handle('fastforward');
+                inputManager.handleCommand('fastforward');
                 break;
             case 'MediaStop':
-                inputManager.handle('stop');
+                inputManager.handleCommand('stop');
                 break;
             case 'MediaTrackPrevious':
-                inputManager.handle('previoustrack');
+                inputManager.handleCommand('previoustrack');
                 break;
             case 'MediaTrackNext':
-                inputManager.handle('nexttrack');
+                inputManager.handleCommand('nexttrack');
                 break;
 
             default:
@@ -155,7 +155,7 @@ export function enable() {
 function attachGamepadScript(e) {
     console.log('Gamepad connected! Attaching gamepadtokey.js script');
     window.removeEventListener('gamepadconnected', attachGamepadScript);
-    require(['scripts/gamepadtokey']);
+    import('scripts/gamepadtokey');
 }
 
 // No need to check for gamepads manually at load time, the eventhandler will be fired for that
diff --git a/src/scripts/libraryMenu.js b/src/scripts/libraryMenu.js
index 53162fc414..a4acfc4429 100644
--- a/src/scripts/libraryMenu.js
+++ b/src/scripts/libraryMenu.js
@@ -12,10 +12,10 @@ define(['dom', 'layoutManager', 'inputManager', 'connectionManager', 'events', '
         html += '</div>';
         html += '<div class="headerRight">';
         html += '<span class="headerSelectedPlayer"></span>';
-        html += '<button is="paper-icon-button-light" class="headerSyncButton syncButton headerButton headerButtonRight hide"><span class="material-icons sync_disabled"></span></button>';
-        html += '<button is="paper-icon-button-light" class="headerAudioPlayerButton audioPlayerButton headerButton headerButtonRight hide"><span class="material-icons music_note"></span></button>';
-        html += '<button is="paper-icon-button-light" class="headerCastButton castButton headerButton headerButtonRight hide"><span class="material-icons cast"></span></button>';
-        html += '<button type="button" is="paper-icon-button-light" class="headerButton headerButtonRight headerSearchButton hide"><span class="material-icons search"></span></button>';
+        html += `<button is="paper-icon-button-light" class="headerSyncButton syncButton headerButton headerButtonRight hide" title="${globalize.translate('ButtonSyncPlay')}"><span class="material-icons sync_disabled"></span></button>`;
+        html += `<button is="paper-icon-button-light" class="headerAudioPlayerButton audioPlayerButton headerButton headerButtonRight hide" title="${globalize.translate('ButtonPlayer')}"><span class="material-icons music_note"></span></button>`;
+        html += `<button is="paper-icon-button-light" class="headerCastButton castButton headerButton headerButtonRight hide" title="${globalize.translate('ButtonCast')}"><span class="material-icons cast"></span></button>`;
+        html += `<button type="button" is="paper-icon-button-light" class="headerButton headerButtonRight headerSearchButton hide" title="${globalize.translate('ButtonSearch')}"><span class="material-icons search"></span></button>`;
         html += '<button is="paper-icon-button-light" class="headerButton headerButtonRight headerUserButton hide"><span class="material-icons person"></span></button>';
         html += '</div>';
         html += '</div>';
@@ -64,7 +64,7 @@ define(['dom', 'layoutManager', 'inputManager', 'connectionManager', 'events', '
                 updateHeaderUserButton(url);
                 hasImage = true;
             }
-
+            headerUserButton.title = user.name;
             headerUserButton.classList.remove('hide');
         } else {
             headerUserButton.classList.add('hide');
@@ -89,7 +89,8 @@ define(['dom', 'layoutManager', 'inputManager', 'connectionManager', 'events', '
 
             var policy = user.Policy ? user.Policy : user.localUser.Policy;
 
-            if (headerSyncButton && policy && policy.SyncPlayAccess !== 'None') {
+            var apiClient = getCurrentApiClient();
+            if (headerSyncButton && policy && policy.SyncPlayAccess !== 'None' && apiClient.isMinServerVersion('10.6.0')) {
                 headerSyncButton.classList.remove('hide');
             }
         } else {
@@ -116,7 +117,7 @@ define(['dom', 'layoutManager', 'inputManager', 'connectionManager', 'events', '
     }
 
     function showSearch() {
-        inputManager.trigger('search');
+        inputManager.handleCommand('search');
     }
 
     function onHeaderUserButtonClick(e) {
@@ -608,27 +609,25 @@ define(['dom', 'layoutManager', 'inputManager', 'connectionManager', 'events', '
         if (libraryMenuOptions) {
             getUserViews(apiClient, userId).then(function (result) {
                 var items = result;
-                var html = '';
-                html += '<h3 class="sidebarHeader">';
-                html += globalize.translate('HeaderMedia');
-                html += '</h3>';
+                var html = `<h3 class="sidebarHeader">${globalize.translate('HeaderMedia')}</h3>`;
                 html += items.map(function (i) {
                     var icon = i.icon || imageHelper.getLibraryIcon(i.CollectionType);
                     var itemId = i.Id;
 
-                    if (i.onclick) {
-                        i.onclick;
-                    }
+                    const linkHtml = `<a is="emby-linkbutton" data-itemid="${itemId}" class="lnkMediaFolder navMenuOption" href="${getItemHref(i, i.CollectionType)}">
+                                    <span class="material-icons navMenuOptionIcon ${icon}"></span>
+                                    <span class="sectionName navMenuOptionText">${i.Name}</span>
+                                  </a>`;
 
-                    return '<a is="emby-linkbutton" data-itemid="' + itemId + '" class="lnkMediaFolder navMenuOption" href="' + getItemHref(i, i.CollectionType) + '"><span class="material-icons navMenuOptionIcon ' + icon + '"></span><span class="sectionName navMenuOptionText">' + i.Name + '</span></a>';
+                    return linkHtml;
                 }).join('');
                 libraryMenuOptions.innerHTML = html;
                 var elem = libraryMenuOptions;
                 var sidebarLinks = elem.querySelectorAll('.navMenuOption');
 
-                for (var i = 0, length = sidebarLinks.length; i < length; i++) {
-                    sidebarLinks[i].removeEventListener('click', onSidebarLinkClick);
-                    sidebarLinks[i].addEventListener('click', onSidebarLinkClick);
+                for (const sidebarLink of sidebarLinks) {
+                    sidebarLink.removeEventListener('click', onSidebarLinkClick);
+                    sidebarLink.addEventListener('click', onSidebarLinkClick);
                 }
             });
         }
@@ -842,6 +841,7 @@ define(['dom', 'layoutManager', 'inputManager', 'connectionManager', 'events', '
     var headerAudioPlayerButton;
     var headerSyncButton;
     var enableLibraryNavDrawer = layoutManager.desktop;
+    var enableLibraryNavDrawerHome = !layoutManager.tv;
     var skinHeader = document.querySelector('.skinHeader');
     var requiresUserRefresh = true;
     var lastOpenTime = new Date().getTime();
@@ -928,7 +928,7 @@ define(['dom', 'layoutManager', 'inputManager', 'connectionManager', 'events', '
             refreshDashboardInfoInDrawer(apiClient);
         } else {
             if (mainDrawerButton) {
-                if (enableLibraryNavDrawer || isHomePage) {
+                if (enableLibraryNavDrawer || (isHomePage && enableLibraryNavDrawerHome)) {
                     mainDrawerButton.classList.remove('hide');
                 } else {
                     mainDrawerButton.classList.add('hide');
@@ -942,6 +942,7 @@ define(['dom', 'layoutManager', 'inputManager', 'connectionManager', 'events', '
 
         updateMenuForPageType(isDashboardPage, isLibraryPage);
 
+        // TODO: Seems to do nothing? Check if needed (also in other views).
         if (!e.detail.isRestored) {
             window.scrollTo(0, 0);
         }
@@ -973,8 +974,10 @@ define(['dom', 'layoutManager', 'inputManager', 'connectionManager', 'events', '
         updateUserInHeader();
     });
     events.on(playbackManager, 'playerchange', updateCastIcon);
+
     events.on(syncPlayManager, 'enabled', onSyncPlayEnabled);
     events.on(syncPlayManager, 'syncing', onSyncPlaySyncing);
+
     loadNavDrawer();
     return LibraryMenu;
 });
diff --git a/src/scripts/mouseManager.js b/src/scripts/mouseManager.js
index e6117fa851..84fe58e7e5 100644
--- a/src/scripts/mouseManager.js
+++ b/src/scripts/mouseManager.js
@@ -136,6 +136,7 @@ define(['inputManager', 'focusManager', 'browser', 'layoutManager', 'events', 'd
 
         stopMouseInterval();
 
+        /* eslint-disable-next-line compat/compat */
         dom.removeEventListener(document, (window.PointerEvent ? 'pointermove' : 'mousemove'), onPointerMove, {
             passive: true
         });
@@ -148,6 +149,7 @@ define(['inputManager', 'focusManager', 'browser', 'layoutManager', 'events', 'd
             });
         }
 
+        /* eslint-disable-next-line compat/compat */
         dom.removeEventListener(document, (window.PointerEvent ? 'pointerenter' : 'mouseenter'), onPointerEnter, {
             capture: true,
             passive: true
diff --git a/src/scripts/playlists.js b/src/scripts/playlists.js
index 52e7ccb3bd..6944660f0c 100644
--- a/src/scripts/playlists.js
+++ b/src/scripts/playlists.js
@@ -1,194 +1,202 @@
-define(['loading', 'listView', 'cardBuilder', 'libraryMenu', 'libraryBrowser', 'apphost', 'imageLoader', 'userSettings', 'emby-itemscontainer'], function (loading, listView, cardBuilder, libraryMenu, libraryBrowser, appHost, imageLoader, userSettings) {
-    'use strict';
+import loading from 'loading';
+import listView from 'listView';
+import cardBuilder from 'cardBuilder';
+import libraryMenu from 'libraryMenu';
+import libraryBrowser from 'libraryBrowser';
+import appHost from 'apphost';
+import imageLoader from 'imageLoader';
+import userSettings from 'userSettings';
+import 'emby-itemscontainer';
 
-    return function (view, params) {
-        function getPageData(context) {
-            var key = getSavedQueryKey(context);
-            var pageData = data[key];
+export default function (view, params) {
+    function getPageData(context) {
+        const key = getSavedQueryKey(context);
+        let pageData = data[key];
 
-            if (!pageData) {
-                pageData = data[key] = {
-                    query: {
-                        SortBy: 'SortName',
-                        SortOrder: 'Ascending',
-                        IncludeItemTypes: 'Playlist',
-                        Recursive: true,
-                        Fields: 'PrimaryImageAspectRatio,SortName,CumulativeRunTimeTicks,CanDelete',
-                        StartIndex: 0
-                    },
-                    view: libraryBrowser.getSavedView(key) || 'Poster'
-                };
+        if (!pageData) {
+            pageData = data[key] = {
+                query: {
+                    SortBy: 'SortName',
+                    SortOrder: 'Ascending',
+                    IncludeItemTypes: 'Playlist',
+                    Recursive: true,
+                    Fields: 'PrimaryImageAspectRatio,SortName,CumulativeRunTimeTicks,CanDelete',
+                    StartIndex: 0
+                },
+                view: libraryBrowser.getSavedView(key) || 'Poster'
+            };
 
-                if (userSettings.libraryPageSize() > 0) {
-                    pageData.query['Limit'] = userSettings.libraryPageSize();
-                }
-
-                pageData.query.ParentId = libraryMenu.getTopParentId();
-                libraryBrowser.loadSavedQueryValues(key, pageData.query);
+            if (userSettings.libraryPageSize() > 0) {
+                pageData.query['Limit'] = userSettings.libraryPageSize();
             }
 
-            return pageData;
+            pageData.query.ParentId = libraryMenu.getTopParentId();
+            libraryBrowser.loadSavedQueryValues(key, pageData.query);
         }
 
-        function getQuery(context) {
-            return getPageData(context).query;
+        return pageData;
+    }
+
+    function getQuery(context) {
+        return getPageData(context).query;
+    }
+
+    function getSavedQueryKey(context) {
+        if (!context.savedQueryKey) {
+            context.savedQueryKey = libraryBrowser.getSavedQueryKey();
         }
 
-        function getSavedQueryKey(context) {
-            if (!context.savedQueryKey) {
-                context.savedQueryKey = libraryBrowser.getSavedQueryKey();
-            }
+        return context.savedQueryKey;
+    }
 
-            return context.savedQueryKey;
+    function showLoadingMessage() {
+        loading.show();
+    }
+
+    function hideLoadingMessage() {
+        loading.hide();
+    }
+
+    function onViewStyleChange() {
+        const viewStyle = getPageData(view).view;
+        const itemsContainer = view.querySelector('.itemsContainer');
+
+        if ('List' == viewStyle) {
+            itemsContainer.classList.add('vertical-list');
+            itemsContainer.classList.remove('vertical-wrap');
+        } else {
+            itemsContainer.classList.remove('vertical-list');
+            itemsContainer.classList.add('vertical-wrap');
         }
 
-        function showLoadingMessage() {
-            loading.show();
-        }
+        itemsContainer.innerHTML = '';
+    }
 
-        function hideLoadingMessage() {
-            loading.hide();
-        }
+    function reloadItems() {
+        showLoadingMessage();
+        const query = getQuery(view);
+        const promise1 = ApiClient.getItems(Dashboard.getCurrentUserId(), query);
+        // TODO: promise2 is unused, check if necessary.
+        const promise2 = Dashboard.getCurrentUser();
+        Promise.all([promise1, promise2]).then(function (responses) {
+            const result = responses[0];
+            // TODO: Is the scroll necessary?
+            window.scrollTo(0, 0);
+            let html = '';
+            const viewStyle = getPageData(view).view;
+            view.querySelector('.listTopPaging').innerHTML = libraryBrowser.getQueryPagingHtml({
+                startIndex: query.StartIndex,
+                limit: query.Limit,
+                totalRecordCount: result.TotalRecordCount,
+                viewButton: false,
+                showLimit: false,
+                updatePageSizeSetting: false,
+                addLayoutButton: true,
+                layouts: 'List,Poster,PosterCard,Thumb,ThumbCard',
+                currentLayout: viewStyle
+            });
 
-        function onViewStyleChange() {
-            var viewStyle = getPageData(view).view;
-            var itemsContainer = view.querySelector('.itemsContainer');
-
-            if ('List' == viewStyle) {
-                itemsContainer.classList.add('vertical-list');
-                itemsContainer.classList.remove('vertical-wrap');
-            } else {
-                itemsContainer.classList.remove('vertical-list');
-                itemsContainer.classList.add('vertical-wrap');
-            }
-
-            itemsContainer.innerHTML = '';
-        }
-
-        function reloadItems() {
-            showLoadingMessage();
-            var query = getQuery(view);
-            var promise1 = ApiClient.getItems(Dashboard.getCurrentUserId(), query);
-            var promise2 = Dashboard.getCurrentUser();
-            Promise.all([promise1, promise2]).then(function (responses) {
-                var result = responses[0];
-                responses[1];
-                window.scrollTo(0, 0);
-                var html = '';
-                var viewStyle = getPageData(view).view;
-                view.querySelector('.listTopPaging').innerHTML = libraryBrowser.getQueryPagingHtml({
-                    startIndex: query.StartIndex,
-                    limit: query.Limit,
-                    totalRecordCount: result.TotalRecordCount,
-                    viewButton: false,
-                    showLimit: false,
-                    updatePageSizeSetting: false,
-                    addLayoutButton: true,
-                    layouts: 'List,Poster,PosterCard,Thumb,ThumbCard',
-                    currentLayout: viewStyle
-                });
-
-                if (result.TotalRecordCount) {
-                    if (viewStyle == 'List') {
-                        html = listView.getListViewHtml({
-                            items: result.Items,
-                            sortBy: query.SortBy
-                        });
-                    } else if (viewStyle == 'PosterCard') {
-                        html = cardBuilder.getCardsHtml({
-                            items: result.Items,
-                            shape: 'square',
-                            coverImage: true,
-                            showTitle: true,
-                            cardLayout: true
-                        });
-                    } else if (viewStyle == 'Thumb') {
-                        html = cardBuilder.getCardsHtml({
-                            items: result.Items,
-                            shape: 'backdrop',
-                            showTitle: true,
-                            centerText: true,
-                            preferThumb: true,
-                            overlayPlayButton: true
-                        });
-                    } else if (viewStyle == 'ThumbCard') {
-                        html = cardBuilder.getCardsHtml({
-                            items: result.Items,
-                            shape: 'backdrop',
-                            showTitle: true,
-                            preferThumb: true,
-                            cardLayout: true
-                        });
-                    } else {
-                        html = cardBuilder.getCardsHtml({
-                            items: result.Items,
-                            shape: 'square',
-                            showTitle: true,
-                            coverImage: true,
-                            centerText: true,
-                            overlayPlayButton: true
-                        });
-                    }
-                    view.querySelector('.noItemsMessage').classList.add('hide');
+            if (result.TotalRecordCount) {
+                if (viewStyle == 'List') {
+                    html = listView.getListViewHtml({
+                        items: result.Items,
+                        sortBy: query.SortBy
+                    });
+                } else if (viewStyle == 'PosterCard') {
+                    html = cardBuilder.getCardsHtml({
+                        items: result.Items,
+                        shape: 'square',
+                        coverImage: true,
+                        showTitle: true,
+                        cardLayout: true
+                    });
+                } else if (viewStyle == 'Thumb') {
+                    html = cardBuilder.getCardsHtml({
+                        items: result.Items,
+                        shape: 'backdrop',
+                        showTitle: true,
+                        centerText: true,
+                        preferThumb: true,
+                        overlayPlayButton: true
+                    });
+                } else if (viewStyle == 'ThumbCard') {
+                    html = cardBuilder.getCardsHtml({
+                        items: result.Items,
+                        shape: 'backdrop',
+                        showTitle: true,
+                        preferThumb: true,
+                        cardLayout: true
+                    });
                 } else {
-                    view.querySelector('.noItemsMessage').classList.remove('hide');
-                }
-
-                var elem = view.querySelector('.itemsContainer');
-                elem.innerHTML = html;
-                imageLoader.lazyChildren(elem);
-                var btnNextPage = view.querySelector('.btnNextPage');
-
-                if (btnNextPage) {
-                    btnNextPage.addEventListener('click', function () {
-                        if (userSettings.libraryPageSize() > 0) {
-                            query.StartIndex += query.Limit;
-                        }
-                        reloadItems();
+                    html = cardBuilder.getCardsHtml({
+                        items: result.Items,
+                        shape: 'square',
+                        showTitle: true,
+                        coverImage: true,
+                        centerText: true,
+                        overlayPlayButton: true
                     });
                 }
+                view.querySelector('.noItemsMessage').classList.add('hide');
+            } else {
+                view.querySelector('.noItemsMessage').classList.remove('hide');
+            }
 
-                var btnPreviousPage = view.querySelector('.btnPreviousPage');
+            const elem = view.querySelector('.itemsContainer');
+            elem.innerHTML = html;
+            imageLoader.lazyChildren(elem);
+            const btnNextPage = view.querySelector('.btnNextPage');
 
-                if (btnPreviousPage) {
-                    btnPreviousPage.addEventListener('click', function () {
-                        if (userSettings.libraryPageSize() > 0) {
-                            query.StartIndex = Math.max(0, query.StartIndex - query.Limit);
-                        }
-                        reloadItems();
-                    });
-                }
-
-                var btnChangeLayout = view.querySelector('.btnChangeLayout');
-
-                if (btnChangeLayout) {
-                    btnChangeLayout.addEventListener('layoutchange', function (e) {
-                        var layout = e.detail.viewStyle;
-                        getPageData(view).view = layout;
-                        libraryBrowser.saveViewSetting(getSavedQueryKey(view), layout);
-                        onViewStyleChange();
-                        reloadItems();
-                    });
-                }
-
-                libraryBrowser.saveQueryValues(getSavedQueryKey(view), query);
-                hideLoadingMessage();
-            });
-        }
-
-        var data = {};
-        view.addEventListener('viewbeforeshow', function () {
-            reloadItems();
-        });
-        view.querySelector('.btnNewPlaylist').addEventListener('click', function () {
-            require(['playlistEditor'], function (playlistEditor) {
-                var serverId = ApiClient.serverInfo().Id;
-                new playlistEditor().show({
-                    items: [],
-                    serverId: serverId
+            if (btnNextPage) {
+                btnNextPage.addEventListener('click', function () {
+                    if (userSettings.libraryPageSize() > 0) {
+                        query.StartIndex += query.Limit;
+                    }
+                    reloadItems();
                 });
+            }
+
+            const btnPreviousPage = view.querySelector('.btnPreviousPage');
+
+            if (btnPreviousPage) {
+                btnPreviousPage.addEventListener('click', function () {
+                    if (userSettings.libraryPageSize() > 0) {
+                        query.StartIndex = Math.max(0, query.StartIndex - query.Limit);
+                    }
+                    reloadItems();
+                });
+            }
+
+            const btnChangeLayout = view.querySelector('.btnChangeLayout');
+
+            if (btnChangeLayout) {
+                btnChangeLayout.addEventListener('layoutchange', function (e) {
+                    const layout = e.detail.viewStyle;
+                    getPageData(view).view = layout;
+                    libraryBrowser.saveViewSetting(getSavedQueryKey(view), layout);
+                    onViewStyleChange();
+                    reloadItems();
+                });
+            }
+
+            libraryBrowser.saveQueryValues(getSavedQueryKey(view), query);
+            hideLoadingMessage();
+        });
+    }
+
+    const data = {};
+    view.addEventListener('viewbeforeshow', function () {
+        reloadItems();
+    });
+    view.querySelector('.btnNewPlaylist').addEventListener('click', function () {
+        import('playlistEditor').then(({default: playlistEditor}) => {
+            const serverId = ApiClient.serverInfo().Id;
+            new playlistEditor({
+                items: [],
+                serverId: serverId
             });
         });
-        onViewStyleChange();
-    };
-});
+    });
+    onViewStyleChange();
+}
+
diff --git a/src/scripts/routes.js b/src/scripts/routes.js
index edf8e0c943..3472d66496 100644
--- a/src/scripts/routes.js
+++ b/src/scripts/routes.js
@@ -15,7 +15,7 @@ define([
     'detailtablecss'], function () {
 
     function defineRoute(newRoute) {
-        var path = newRoute.path;
+        var path = newRoute.alias ? newRoute.alias : newRoute.path;
         console.debug('defining route: ' + path);
         newRoute.dictionary = 'core';
         Emby.Page.addRoute(path, newRoute);
@@ -24,59 +24,74 @@ define([
     console.debug('defining core routes');
 
     defineRoute({
-        path: '/addserver.html',
+        alias: '/addserver.html',
+        path: '/controllers/session/addServer/index.html',
         autoFocus: false,
         anonymous: true,
         startup: true,
-        controller: 'auth/addserver'
+        controller: 'session/addServer/index'
     });
     defineRoute({
-        path: '/selectserver.html',
+        alias: '/selectserver.html',
+        path: '/controllers/session/selectServer/index.html',
         autoFocus: false,
         anonymous: true,
         startup: true,
-        controller: 'auth/selectserver',
+        controller: 'session/selectServer/index',
         type: 'selectserver'
     });
     defineRoute({
-        path: '/login.html',
+        alias: '/login.html',
+        path: '/controllers/session/login/index.html',
         autoFocus: false,
         anonymous: true,
         startup: true,
-        controller: 'auth/login',
+        controller: 'session/login/index',
         type: 'login'
     });
     defineRoute({
-        path: '/forgotpassword.html',
+        alias: '/forgotpassword.html',
+        path: '/controllers/session/forgotPassword/index.html',
         anonymous: true,
         startup: true,
-        controller: 'auth/forgotpassword'
+        controller: 'session/forgotPassword/index'
     });
     defineRoute({
-        path: '/forgotpasswordpin.html',
+        alias: '/forgotpasswordpin.html',
+        path: '/controllers/session/redeemPassword/index.html',
         autoFocus: false,
         anonymous: true,
         startup: true,
-        controller: 'auth/forgotpasswordpin'
+        controller: 'session/redeemPassword/index'
     });
 
     defineRoute({
-        path: '/mypreferencesmenu.html',
+        alias: '/mypreferencesmenu.html',
+        path: '/controllers/user/menu/index.html',
         autoFocus: false,
         transition: 'fade',
-        controller: 'user/menu'
+        controller: 'user/menu/index'
     });
     defineRoute({
-        path: '/myprofile.html',
+        alias: '/myprofile.html',
+        path: '/controllers/user/profile/index.html',
         autoFocus: false,
         transition: 'fade',
-        controller: 'user/profile'
+        controller: 'user/profile/index'
     });
     defineRoute({
-        path: '/mypreferencesdisplay.html',
+        alias: '/mypreferencesdisplay.html',
+        path: '/controllers/user/display/index.html',
         autoFocus: false,
         transition: 'fade',
-        controller: 'user/display'
+        controller: 'user/display/index'
+    });
+    defineRoute({
+        alias: '/mypreferenceshome.html',
+        path: '/controllers/user/home/index.html',
+        autoFocus: false,
+        transition: 'fade',
+        controller: 'user/home/index'
     });
     defineRoute({
         path: '/myPreferencesQuickConnect.html',
@@ -84,24 +99,19 @@ define([
         transition: 'fade',
         controller: 'user/quickConnect'
     });
-
     defineRoute({
-        path: '/mypreferenceshome.html',
+        alias: '/mypreferencesplayback.html',
+        path: '/controllers/user/playback/index.html',
         autoFocus: false,
         transition: 'fade',
-        controller: 'user/home'
+        controller: 'user/playback/index'
     });
     defineRoute({
-        path: '/mypreferencesplayback.html',
+        alias: '/mypreferencessubtitles.html',
+        path: '/controllers/user/subtitles/index.html',
         autoFocus: false,
         transition: 'fade',
-        controller: 'user/playback'
-    });
-    defineRoute({
-        path: '/mypreferencessubtitles.html',
-        autoFocus: false,
-        transition: 'fade',
-        controller: 'user/subtitles'
+        controller: 'user/subtitles/index'
     });
 
     defineRoute({
@@ -153,10 +163,11 @@ define([
         controller: 'dashboard/dlna/profiles'
     });
     defineRoute({
-        path: '/addplugin.html',
+        alias: '/addplugin.html',
+        path: '/controllers/dashboard/plugins/add/index.html',
         autoFocus: false,
         roles: 'admin',
-        controller: 'dashboard/plugins/add'
+        controller: 'dashboard/plugins/add/index'
     });
     defineRoute({
         path: '/library.html',
@@ -205,14 +216,16 @@ define([
         controller: 'dashboard/metadatanfo'
     });
     defineRoute({
-        path: '/notificationsetting.html',
+        alias: '/notificationsetting.html',
+        path: '/controllers/dashboard/notifications/notification/index.html',
         autoFocus: false,
         roles: 'admin',
-        controller: 'dashboard/notifications/notification'
+        controller: 'dashboard/notifications/notification/index'
     });
     defineRoute({
-        path: '/notificationsettings.html',
-        controller: 'dashboard/notifications/notifications',
+        alias: '/notificationsettings.html',
+        path: '/controllers/dashboard/notifications/notifications/index.html',
+        controller: 'dashboard/notifications/notifications/index',
         autoFocus: false,
         roles: 'admin'
     });
@@ -223,10 +236,18 @@ define([
         controller: 'dashboard/playback'
     });
     defineRoute({
-        path: '/availableplugins.html',
+        alias: '/availableplugins.html',
+        path: '/controllers/dashboard/plugins/available/index.html',
         autoFocus: false,
         roles: 'admin',
-        controller: 'dashboard/plugins/available'
+        controller: 'dashboard/plugins/available/index'
+    });
+    defineRoute({
+        alias: '/repositories.html',
+        path: '/controllers/dashboard/plugins/repositories/index.html',
+        autoFocus: false,
+        roles: 'admin',
+        controller: 'dashboard/plugins/repositories/index'
     });
 
     defineRoute({
@@ -247,8 +268,9 @@ define([
         transition: 'fade'
     });
     defineRoute({
-        path: '/itemdetails.html',
-        controller: 'itemDetails',
+        alias: '/details',
+        path: '/controllers/itemDetails/index.html',
+        controller: 'itemDetails/index',
         autoFocus: false,
         transition: 'fade'
     });
@@ -294,10 +316,11 @@ define([
         transition: 'fade'
     });
     defineRoute({
-        path: '/installedplugins.html',
+        alias: '/installedplugins.html',
+        path: '/controllers/dashboard/plugins/installed/index.html',
         autoFocus: false,
         roles: 'admin',
-        controller: 'dashboard/plugins/installed'
+        controller: 'dashboard/plugins/installed/index'
     });
     defineRoute({
         path: '/scheduledtask.html',
@@ -373,16 +396,18 @@ define([
     });
 
     defineRoute({
-        path: '/wizardremoteaccess.html',
+        alias: '/wizardremoteaccess.html',
+        path: '/controllers/wizard/remote/index.html',
         autoFocus: false,
         anonymous: true,
-        controller: 'wizard/remoteaccess'
+        controller: 'wizard/remote/index'
     });
     defineRoute({
-        path: '/wizardfinish.html',
+        alias: '/wizardfinish.html',
+        path: '/controllers/wizard/finish/index.html',
         autoFocus: false,
         anonymous: true,
-        controller: 'wizard/finish'
+        controller: 'wizard/finish/index'
     });
     defineRoute({
         path: '/wizardlibrary.html',
@@ -391,28 +416,32 @@ define([
         controller: 'dashboard/mediaLibrary'
     });
     defineRoute({
-        path: '/wizardsettings.html',
+        alias: '/wizardsettings.html',
+        path: '/controllers/wizard/settings/index.html',
         autoFocus: false,
         anonymous: true,
-        controller: 'wizard/settings'
+        controller: 'wizard/settings/index'
     });
     defineRoute({
-        path: '/wizardstart.html',
+        alias: '/wizardstart.html',
+        path: '/controllers/wizard/start/index.html',
         autoFocus: false,
         anonymous: true,
-        controller: 'wizard/start'
+        controller: 'wizard/start/index'
     });
     defineRoute({
-        path: '/wizarduser.html',
-        controller: 'wizard/user',
+        alias: '/wizarduser.html',
+        path: '/controllers/wizard/user/index.html',
+        controller: 'wizard/user/index',
         autoFocus: false,
         anonymous: true
     });
 
     defineRoute({
-        path: '/videoosd.html',
+        alias: '/video',
+        path: '/controllers/playback/video/index.html',
         transition: 'fade',
-        controller: 'playback/videoosd',
+        controller: 'playback/video/index',
         autoFocus: false,
         type: 'video-osd',
         supportsThemeMedia: true,
@@ -420,8 +449,9 @@ define([
         enableMediaControl: false
     });
     defineRoute({
-        path: '/nowplaying.html',
-        controller: 'playback/nowplaying',
+        alias: '/queue',
+        path: '/controllers/playback/queue/index.html',
+        controller: 'playback/queue/index',
         autoFocus: false,
         transition: 'fade',
         fullscreen: true,
diff --git a/src/scripts/searchtab.js b/src/scripts/searchtab.js
index 95b1e5a7c3..e012b8a4b2 100644
--- a/src/scripts/searchtab.js
+++ b/src/scripts/searchtab.js
@@ -1,6 +1,9 @@
 define(['searchFields', 'searchResults', 'events'], function (SearchFields, SearchResults, events) {
     'use strict';
 
+    SearchFields = SearchFields.default || SearchFields;
+    SearchResults = SearchResults.default || SearchResults;
+
     function init(instance, tabContent, options) {
         tabContent.innerHTML = '<div class="padded-left padded-right searchFields"></div><div class="searchResults padded-top" style="padding-top:1.5em;"></div>';
         instance.searchFields = new SearchFields({
diff --git a/src/scripts/serverNotifications.js b/src/scripts/serverNotifications.js
index 2553c284f0..331a75329c 100644
--- a/src/scripts/serverNotifications.js
+++ b/src/scripts/serverNotifications.js
@@ -15,7 +15,7 @@ define(['connectionManager', 'playbackManager', 'syncPlayManager', 'events', 'in
             });
         } else {
             require(['alert'], function (alert) {
-                alert({ title: args.Header, text: args.Text });
+                alert.default({ title: args.Header, text: args.Text });
             });
         }
     }
@@ -36,28 +36,28 @@ define(['connectionManager', 'playbackManager', 'syncPlayManager', 'events', 'in
         console.debug('Received command: ' + cmd.Name);
         switch (cmd.Name) {
             case 'Select':
-                inputManager.trigger('select');
+                inputManager.handleCommand('select');
                 return;
             case 'Back':
-                inputManager.trigger('back');
+                inputManager.handleCommand('back');
                 return;
             case 'MoveUp':
-                inputManager.trigger('up');
+                inputManager.handleCommand('up');
                 return;
             case 'MoveDown':
-                inputManager.trigger('down');
+                inputManager.handleCommand('down');
                 return;
             case 'MoveLeft':
-                inputManager.trigger('left');
+                inputManager.handleCommand('left');
                 return;
             case 'MoveRight':
-                inputManager.trigger('right');
+                inputManager.handleCommand('right');
                 return;
             case 'PageUp':
-                inputManager.trigger('pageup');
+                inputManager.handleCommand('pageup');
                 return;
             case 'PageDown':
-                inputManager.trigger('pagedown');
+                inputManager.handleCommand('pagedown');
                 return;
             case 'PlayTrailers':
                 playTrailers(apiClient, cmd.Arguments.ItemId);
@@ -65,26 +65,29 @@ define(['connectionManager', 'playbackManager', 'syncPlayManager', 'events', 'in
             case 'SetRepeatMode':
                 playbackManager.setRepeatMode(cmd.Arguments.RepeatMode);
                 break;
+            case 'SetShuffleQueue':
+                playbackManager.setQueueShuffleMode(cmd.Arguments.ShuffleMode);
+                break;
             case 'VolumeUp':
-                inputManager.trigger('volumeup');
+                inputManager.handleCommand('volumeup');
                 return;
             case 'VolumeDown':
-                inputManager.trigger('volumedown');
+                inputManager.handleCommand('volumedown');
                 return;
             case 'ChannelUp':
-                inputManager.trigger('channelup');
+                inputManager.handleCommand('channelup');
                 return;
             case 'ChannelDown':
-                inputManager.trigger('channeldown');
+                inputManager.handleCommand('channeldown');
                 return;
             case 'Mute':
-                inputManager.trigger('mute');
+                inputManager.handleCommand('mute');
                 return;
             case 'Unmute':
-                inputManager.trigger('unmute');
+                inputManager.handleCommand('unmute');
                 return;
             case 'ToggleMute':
-                inputManager.trigger('togglemute');
+                inputManager.handleCommand('togglemute');
                 return;
             case 'SetVolume':
                 notifyApp();
@@ -99,19 +102,19 @@ define(['connectionManager', 'playbackManager', 'syncPlayManager', 'events', 'in
                 playbackManager.setSubtitleStreamIndex(parseInt(cmd.Arguments.Index));
                 break;
             case 'ToggleFullscreen':
-                inputManager.trigger('togglefullscreen');
+                inputManager.handleCommand('togglefullscreen');
                 return;
             case 'GoHome':
-                inputManager.trigger('home');
+                inputManager.handleCommand('home');
                 return;
             case 'GoToSettings':
-                inputManager.trigger('settings');
+                inputManager.handleCommand('settings');
                 return;
             case 'DisplayContent':
                 displayContent(cmd, apiClient);
                 break;
             case 'GoToSearch':
-                inputManager.trigger('search');
+                inputManager.handleCommand('search');
                 return;
             case 'DisplayMessage':
                 displayMessage(cmd);
@@ -162,19 +165,19 @@ define(['connectionManager', 'playbackManager', 'syncPlayManager', 'events', 'in
             }
         } else if (msg.MessageType === 'Playstate') {
             if (msg.Data.Command === 'Stop') {
-                inputManager.trigger('stop');
+                inputManager.handleCommand('stop');
             } else if (msg.Data.Command === 'Pause') {
-                inputManager.trigger('pause');
+                inputManager.handleCommand('pause');
             } else if (msg.Data.Command === 'Unpause') {
-                inputManager.trigger('play');
+                inputManager.handleCommand('play');
             } else if (msg.Data.Command === 'PlayPause') {
-                inputManager.trigger('playpause');
+                inputManager.handleCommand('playpause');
             } else if (msg.Data.Command === 'Seek') {
                 playbackManager.seek(msg.Data.SeekPositionTicks);
             } else if (msg.Data.Command === 'NextTrack') {
-                inputManager.trigger('next');
+                inputManager.handleCommand('next');
             } else if (msg.Data.Command === 'PreviousTrack') {
-                inputManager.trigger('previous');
+                inputManager.handleCommand('previous');
             } else {
                 notifyApp();
             }
diff --git a/src/scripts/settings/appSettings.js b/src/scripts/settings/appSettings.js
index 6f0975e98c..ffd63b9561 100644
--- a/src/scripts/settings/appSettings.js
+++ b/src/scripts/settings/appSettings.js
@@ -28,7 +28,7 @@ import events from 'events';
     }
 
     export function enableAutomaticBitrateDetection(isInNetwork, mediaType, val) {
-        var key = 'enableautobitratebitrate-' + mediaType + '-' + isInNetwork;
+        const key = 'enableautobitratebitrate-' + mediaType + '-' + isInNetwork;
         if (val !== undefined) {
             if (isInNetwork && mediaType === 'Audio') {
                 val = true;
@@ -45,7 +45,7 @@ import events from 'events';
     }
 
     export function maxStreamingBitrate(isInNetwork, mediaType, val) {
-        var key = 'maxbitrate-' + mediaType + '-' + isInNetwork;
+        const key = 'maxbitrate-' + mediaType + '-' + isInNetwork;
         if (val !== undefined) {
             if (isInNetwork && mediaType === 'Audio') {
                 //  nothing to do, this is always a max value
@@ -67,7 +67,7 @@ import events from 'events';
             this.set('maxStaticMusicBitrate', val);
         }
 
-        var defaultValue = 320000;
+        const defaultValue = 320000;
         return parseInt(this.get('maxStaticMusicBitrate') || defaultValue.toString()) || defaultValue;
     }
 
@@ -118,7 +118,7 @@ import events from 'events';
     }
 
     export function set(name, value, userId) {
-        var currentValue = this.get(name, userId);
+        const currentValue = this.get(name, userId);
         appStorage.setItem(getKey(name, userId), value);
 
         if (currentValue !== value) {
diff --git a/src/scripts/settings/userSettings.js b/src/scripts/settings/userSettings.js
index 06c5fa40a6..bd6050b5fe 100644
--- a/src/scripts/settings/userSettings.js
+++ b/src/scripts/settings/userSettings.js
@@ -1,23 +1,30 @@
-/* eslint-disable indent */
-
 import appSettings from 'appSettings';
 import events from 'events';
 
-    function onSaveTimeout() {
-        var self = this;
-        self.saveTimeout = null;
-        self.currentApiClient.updateDisplayPreferences('usersettings', self.displayPrefs, self.currentUserId, 'emby');
+function onSaveTimeout() {
+    const self = this;
+    self.saveTimeout = null;
+    self.currentApiClient.updateDisplayPreferences('usersettings', self.displayPrefs, self.currentUserId, 'emby');
+}
+
+function saveServerPreferences(instance) {
+    if (instance.saveTimeout) {
+        clearTimeout(instance.saveTimeout);
     }
 
-    function saveServerPreferences(instance) {
-        if (instance.saveTimeout) {
-            clearTimeout(instance.saveTimeout);
-        }
+    instance.saveTimeout = setTimeout(onSaveTimeout.bind(instance), 50);
+}
 
-        instance.saveTimeout = setTimeout(onSaveTimeout.bind(instance), 50);
+export class UserSettings {
+    constructor() {
     }
 
-    export function setUserInfo(userId, apiClient) {
+    /**
+     * Bind UserSettings instance to user.
+     * @param {string} - User identifier.
+     * @param {Object} - ApiClient instance.
+     */
+    setUserInfo(userId, apiClient) {
         if (this.saveTimeout) {
             clearTimeout(this.saveTimeout);
         }
@@ -30,7 +37,7 @@ import events from 'events';
             return Promise.resolve();
         }
 
-        var self = this;
+        const self = this;
 
         return apiClient.getDisplayPreferences('usersettings', userId, 'emby').then(function (result) {
             result.CustomPrefs = result.CustomPrefs || {};
@@ -38,18 +45,27 @@ import events from 'events';
         });
     }
 
-    export function getData() {
+    // FIXME: Seems unused
+    getData() {
         return this.displayPrefs;
     }
 
-    export function importFrom(instance) {
+    // FIXME: Seems unused
+    importFrom(instance) {
         this.displayPrefs = instance.getData();
     }
 
-    export function set(name, value, enableOnServer) {
-        var userId = this.currentUserId;
-        var currentValue = this.get(name, enableOnServer);
-        var result = appSettings.set(name, value, userId);
+    // FIXME: 'appSettings.set' doesn't return any value
+    /**
+     * Set value of setting.
+     * @param {string} name - Name of setting.
+     * @param {mixed} value - Value of setting.
+     * @param {boolean} enableOnServer - Flag to save preferences on server.
+     */
+    set(name, value, enableOnServer) {
+        const userId = this.currentUserId;
+        const currentValue = this.get(name, enableOnServer);
+        const result = appSettings.set(name, value, userId);
 
         if (enableOnServer !== false && this.displayPrefs) {
             this.displayPrefs.CustomPrefs[name] = value == null ? value : value.toString();
@@ -63,8 +79,14 @@ import events from 'events';
         return result;
     }
 
-    export function get(name, enableOnServer) {
-        var userId = this.currentUserId;
+    /**
+     * Get value of setting.
+     * @param {string} name - Name of setting.
+     * @param {boolean} enableOnServer - Flag to return preferences from server (cached).
+     * @return {string} Value of setting.
+     */
+    get(name, enableOnServer) {
+        const userId = this.currentUserId;
         if (enableOnServer !== false && this.displayPrefs) {
             return this.displayPrefs.CustomPrefs[name];
         }
@@ -72,8 +94,13 @@ import events from 'events';
         return appSettings.get(name, userId);
     }
 
-    export function serverConfig(config) {
-        var apiClient = this.currentApiClient;
+    /**
+     * Get or set user config.
+     * @param {Object|undefined} config - Configuration or undefined.
+     * @return {Object|Promise} Configuration or Promise.
+     */
+    serverConfig(config) {
+        const apiClient = this.currentApiClient;
         if (config) {
             return apiClient.updateUserConfiguration(this.currentUserId, config);
         }
@@ -83,7 +110,12 @@ import events from 'events';
         });
     }
 
-    export function enableCinemaMode(val) {
+    /**
+     * Get or set 'Cinema Mode' state.
+     * @param {boolean|undefined} val - Flag to enable 'Cinema Mode' or undefined.
+     * @return {boolean} 'Cinema Mode' state.
+     */
+    enableCinemaMode(val) {
         if (val !== undefined) {
             return this.set('enableCinemaMode', val.toString(), false);
         }
@@ -92,7 +124,12 @@ import events from 'events';
         return val !== 'false';
     }
 
-    export function enableNextVideoInfoOverlay(val) {
+    /**
+     * Get or set 'Next Video Info Overlay' state.
+     * @param {boolean|undefined} val - Flag to enable 'Next Video Info Overlay' or undefined.
+     * @return {boolean} 'Next Video Info Overlay' state.
+     */
+    enableNextVideoInfoOverlay(val) {
         if (val !== undefined) {
             return this.set('enableNextVideoInfoOverlay', val.toString());
         }
@@ -101,7 +138,12 @@ import events from 'events';
         return val !== 'false';
     }
 
-    export function enableThemeSongs(val) {
+    /**
+     * Get or set 'Theme Songs' state.
+     * @param {boolean|undefined} val - Flag to enable 'Theme Songs' or undefined.
+     * @return {boolean} 'Theme Songs' state.
+     */
+    enableThemeSongs(val) {
         if (val !== undefined) {
             return this.set('enableThemeSongs', val.toString(), false);
         }
@@ -110,7 +152,12 @@ import events from 'events';
         return val === 'true';
     }
 
-    export function enableThemeVideos(val) {
+    /**
+     * Get or set 'Theme Videos' state.
+     * @param {boolean|undefined} val - Flag to enable 'Theme Videos' or undefined.
+     * @return {boolean} 'Theme Videos' state.
+     */
+    enableThemeVideos(val) {
         if (val !== undefined) {
             return this.set('enableThemeVideos', val.toString(), false);
         }
@@ -119,7 +166,12 @@ import events from 'events';
         return val === 'true';
     }
 
-    export function enableFastFadein(val) {
+    /**
+     * Get or set 'Fast Fade-in' state.
+     * @param {boolean|undefined} val - Flag to enable 'Fast Fade-in' or undefined.
+     * @return {boolean} 'Fast Fade-in' state.
+     */
+    enableFastFadein(val) {
         if (val !== undefined) {
             return this.set('fastFadein', val.toString(), false);
         }
@@ -128,7 +180,26 @@ import events from 'events';
         return val !== 'false';
     }
 
-    export function enableBackdrops(val) {
+    /**
+     * Get or set 'Blurhash' state.
+     * @param {boolean|undefined} val - Flag to enable 'Blurhash' or undefined.
+     * @return {boolean} 'Blurhash' state.
+     */
+    enableBlurhash(val) {
+        if (val !== undefined) {
+            return this.set('blurhash', val.toString(), false);
+        }
+
+        val = this.get('blurhash', false);
+        return val !== 'false';
+    }
+
+    /**
+     * Get or set 'Backdrops' state.
+     * @param {boolean|undefined} val - Flag to enable 'Backdrops' or undefined.
+     * @return {boolean} 'Backdrops' state.
+     */
+    enableBackdrops(val) {
         if (val !== undefined) {
             return this.set('enableBackdrops', val.toString(), false);
         }
@@ -137,7 +208,12 @@ import events from 'events';
         return val !== 'false';
     }
 
-    export function detailsBanner(val) {
+    /**
+     * Get or set 'Details Banner' state.
+     * @param {boolean|undefined} val - Flag to enable 'Details Banner' or undefined.
+     * @return {boolean} 'Details Banner' state.
+     */
+    detailsBanner(val) {
         if (val !== undefined) {
             return this.set('detailsBanner', val.toString(), false);
         }
@@ -146,7 +222,12 @@ import events from 'events';
         return val !== 'false';
     }
 
-    export function language(val) {
+    /**
+     * Get or set language.
+     * @param {string|undefined} val - Language.
+     * @return {string} Language.
+     */
+    language(val) {
         if (val !== undefined) {
             return this.set('language', val.toString(), false);
         }
@@ -154,7 +235,12 @@ import events from 'events';
         return this.get('language', false);
     }
 
-    export function dateTimeLocale(val) {
+    /**
+     * Get or set datetime locale.
+     * @param {string|undefined} val - Datetime locale.
+     * @return {string} Datetime locale.
+     */
+    dateTimeLocale(val) {
         if (val !== undefined) {
             return this.set('datetimelocale', val.toString(), false);
         }
@@ -162,7 +248,12 @@ import events from 'events';
         return this.get('datetimelocale', false);
     }
 
-    export function chromecastVersion(val) {
+    /**
+     * Get or set Chromecast version.
+     * @param {string|undefined} val - Chromecast version.
+     * @return {string} Chromecast version.
+     */
+    chromecastVersion(val) {
         if (val !== undefined) {
             return this.set('chromecastVersion', val.toString());
         }
@@ -170,7 +261,12 @@ import events from 'events';
         return this.get('chromecastVersion') || 'stable';
     }
 
-    export function skipBackLength(val) {
+    /**
+     * Get or set amount of rewind.
+     * @param {number|undefined} val - Amount of rewind.
+     * @return {number} Amount of rewind.
+     */
+    skipBackLength(val) {
         if (val !== undefined) {
             return this.set('skipBackLength', val.toString());
         }
@@ -178,7 +274,12 @@ import events from 'events';
         return parseInt(this.get('skipBackLength') || '10000');
     }
 
-    export function skipForwardLength(val) {
+    /**
+     * Get or set amount of fast forward.
+     * @param {number|undefined} val - Amount of fast forward.
+     * @return {number} Amount of fast forward.
+     */
+    skipForwardLength(val) {
         if (val !== undefined) {
             return this.set('skipForwardLength', val.toString());
         }
@@ -186,7 +287,12 @@ import events from 'events';
         return parseInt(this.get('skipForwardLength') || '30000');
     }
 
-    export function dashboardTheme(val) {
+    /**
+     * Get or set theme for Dashboard.
+     * @param {string|undefined} val - Theme for Dashboard.
+     * @return {string} Theme for Dashboard.
+     */
+    dashboardTheme(val) {
         if (val !== undefined) {
             return this.set('dashboardTheme', val);
         }
@@ -194,7 +300,12 @@ import events from 'events';
         return this.get('dashboardTheme');
     }
 
-    export function skin(val) {
+    /**
+     * Get or set skin.
+     * @param {string|undefined} val - Skin.
+     * @return {string} Skin.
+     */
+    skin(val) {
         if (val !== undefined) {
             return this.set('skin', val, false);
         }
@@ -202,7 +313,12 @@ import events from 'events';
         return this.get('skin', false);
     }
 
-    export function theme(val) {
+    /**
+     * Get or set main theme.
+     * @param {string|undefined} val - Main theme.
+     * @return {string} Main theme.
+     */
+    theme(val) {
         if (val !== undefined) {
             return this.set('appTheme', val, false);
         }
@@ -210,7 +326,12 @@ import events from 'events';
         return this.get('appTheme', false);
     }
 
-    export function screensaver(val) {
+    /**
+     * Get or set screensaver.
+     * @param {string|undefined} val - Screensaver.
+     * @return {string} Screensaver.
+     */
+    screensaver(val) {
         if (val !== undefined) {
             return this.set('screensaver', val, false);
         }
@@ -218,12 +339,17 @@ import events from 'events';
         return this.get('screensaver', false);
     }
 
-    export function libraryPageSize(val) {
+    /**
+     * Get or set library page size.
+     * @param {number|undefined} val - Library page size.
+     * @return {number} Library page size.
+     */
+    libraryPageSize(val) {
         if (val !== undefined) {
             return this.set('libraryPageSize', parseInt(val, 10), false);
         }
 
-        var libraryPageSize = parseInt(this.get('libraryPageSize', false), 10);
+        const libraryPageSize = parseInt(this.get('libraryPageSize', false), 10);
         if (libraryPageSize === 0) {
             // Explicitly return 0 to avoid returning 100 because 0 is falsy.
             return 0;
@@ -232,7 +358,12 @@ import events from 'events';
         }
     }
 
-    export function soundEffects(val) {
+    /**
+     * Get or set sound effects.
+     * @param {string|undefined} val - Sound effects.
+     * @return {string} Sound effects.
+     */
+    soundEffects(val) {
         if (val !== undefined) {
             return this.set('soundeffects', val, false);
         }
@@ -240,8 +371,14 @@ import events from 'events';
         return this.get('soundeffects', false);
     }
 
-    export function loadQuerySettings(key, query) {
-        var values = this.get(key);
+    /**
+     * Load query settings.
+     * @param {string} key - Query key.
+     * @param {Object} query - Query base.
+     * @return {Object} Query.
+     */
+    loadQuerySettings(key, query) {
+        let values = this.get(key);
         if (values) {
             values = JSON.parse(values);
             return Object.assign(query, values);
@@ -250,8 +387,13 @@ import events from 'events';
         return query;
     }
 
-    export function saveQuerySettings(key, query) {
-        var values = {};
+    /**
+     * Save query settings.
+     * @param {string} key - Query key.
+     * @param {Object} query - Query.
+     */
+    saveQuerySettings(key, query) {
+        const values = {};
         if (query.SortBy) {
             values.SortBy = query.SortBy;
         }
@@ -263,52 +405,76 @@ import events from 'events';
         return this.set(key, JSON.stringify(values));
     }
 
-    export function getSubtitleAppearanceSettings(key) {
+    /**
+     * Get subtitle appearance settings.
+     * @param {string|undefined} key - Settings key.
+     * @return {Object} Subtitle appearance settings.
+     */
+    getSubtitleAppearanceSettings(key) {
         key = key || 'localplayersubtitleappearance3';
         return JSON.parse(this.get(key, false) || '{}');
     }
 
-    export function setSubtitleAppearanceSettings(value, key) {
+    /**
+     * Set subtitle appearance settings.
+     * @param {Object} value - Subtitle appearance settings.
+     * @param {string|undefined} key - Settings key.
+     */
+    setSubtitleAppearanceSettings(value, key) {
         key = key || 'localplayersubtitleappearance3';
         return this.set(key, JSON.stringify(value), false);
     }
 
-    export function setFilter(key, value) {
+    /**
+     * Set filter.
+     * @param {string} key - Filter key.
+     * @param {string} value - Filter value.
+     */
+    setFilter(key, value) {
         return this.set(key, value, true);
     }
 
-    export function getFilter(key) {
+    /**
+     * Get filter.
+     * @param {string} key - Filter key.
+     * @return {string} Filter value.
+     */
+    getFilter(key) {
         return this.get(key, true);
     }
+}
 
-/* eslint-enable indent */
-export default {
-    setUserInfo: setUserInfo,
-    getData: getData,
-    importFrom: importFrom,
-    set: set,
-    get: get,
-    serverConfig: serverConfig,
-    enableCinemaMode: enableCinemaMode,
-    enableNextVideoInfoOverlay: enableNextVideoInfoOverlay,
-    enableThemeSongs: enableThemeSongs,
-    enableThemeVideos: enableThemeVideos,
-    enableFastFadein: enableFastFadein,
-    enableBackdrops: enableBackdrops,
-    language: language,
-    dateTimeLocale: dateTimeLocale,
-    skipBackLength: skipBackLength,
-    skipForwardLength: skipForwardLength,
-    dashboardTheme: dashboardTheme,
-    skin: skin,
-    theme: theme,
-    screensaver: screensaver,
-    libraryPageSize: libraryPageSize,
-    soundEffects: soundEffects,
-    loadQuerySettings: loadQuerySettings,
-    saveQuerySettings: saveQuerySettings,
-    getSubtitleAppearanceSettings: getSubtitleAppearanceSettings,
-    setSubtitleAppearanceSettings: setSubtitleAppearanceSettings,
-    setFilter: setFilter,
-    getFilter: getFilter
-};
+export const currentSettings = new UserSettings;
+
+// Wrappers for non-ES6 modules and backward compatibility
+export const setUserInfo = currentSettings.setUserInfo.bind(currentSettings);
+export const getData = currentSettings.getData.bind(currentSettings);
+export const importFrom = currentSettings.importFrom.bind(currentSettings);
+export const set = currentSettings.set.bind(currentSettings);
+export const get = currentSettings.get.bind(currentSettings);
+export const serverConfig = currentSettings.serverConfig.bind(currentSettings);
+export const enableCinemaMode = currentSettings.enableCinemaMode.bind(currentSettings);
+export const enableNextVideoInfoOverlay = currentSettings.enableNextVideoInfoOverlay.bind(currentSettings);
+export const enableThemeSongs = currentSettings.enableThemeSongs.bind(currentSettings);
+export const enableThemeVideos = currentSettings.enableThemeVideos.bind(currentSettings);
+export const enableFastFadein = currentSettings.enableFastFadein.bind(currentSettings);
+export const enableBlurhash = currentSettings.enableBlurhash.bind(currentSettings);
+export const enableBackdrops = currentSettings.enableBackdrops.bind(currentSettings);
+export const detailsBanner = currentSettings.detailsBanner.bind(currentSettings);
+export const language = currentSettings.language.bind(currentSettings);
+export const dateTimeLocale = currentSettings.dateTimeLocale.bind(currentSettings);
+export const chromecastVersion = currentSettings.chromecastVersion.bind(currentSettings);
+export const skipBackLength = currentSettings.skipBackLength.bind(currentSettings);
+export const skipForwardLength = currentSettings.skipForwardLength.bind(currentSettings);
+export const dashboardTheme = currentSettings.dashboardTheme.bind(currentSettings);
+export const skin = currentSettings.skin.bind(currentSettings);
+export const theme = currentSettings.theme.bind(currentSettings);
+export const screensaver = currentSettings.screensaver.bind(currentSettings);
+export const libraryPageSize = currentSettings.libraryPageSize.bind(currentSettings);
+export const soundEffects = currentSettings.soundEffects.bind(currentSettings);
+export const loadQuerySettings = currentSettings.loadQuerySettings.bind(currentSettings);
+export const saveQuerySettings = currentSettings.saveQuerySettings.bind(currentSettings);
+export const getSubtitleAppearanceSettings = currentSettings.getSubtitleAppearanceSettings.bind(currentSettings);
+export const setSubtitleAppearanceSettings = currentSettings.setSubtitleAppearanceSettings.bind(currentSettings);
+export const setFilter = currentSettings.setFilter.bind(currentSettings);
+export const getFilter = currentSettings.getFilter.bind(currentSettings);
diff --git a/src/scripts/settings/webSettings.js b/src/scripts/settings/webSettings.js
index d999724aff..64989b4fc2 100644
--- a/src/scripts/settings/webSettings.js
+++ b/src/scripts/settings/webSettings.js
@@ -2,7 +2,7 @@ let data;
 
 function getConfig() {
     if (data) return Promise.resolve(data);
-    return fetch('/config.json?nocache=' + new Date().getUTCMilliseconds()).then(response => {
+    return fetch('config.json?nocache=' + new Date().getUTCMilliseconds()).then(response => {
         data = response.json();
         return data;
     }).catch(error => {
@@ -12,7 +12,7 @@ function getConfig() {
 }
 
 function getDefaultConfig() {
-    return fetch('/config.template.json').then(function (response) {
+    return fetch('config.template.json').then(function (response) {
         data = response.json();
         return data;
     });
diff --git a/src/scripts/site.js b/src/scripts/site.js
index 99fe90331a..652e84f56b 100644
--- a/src/scripts/site.js
+++ b/src/scripts/site.js
@@ -187,35 +187,16 @@ var Dashboard = {
         }
 
         require(['alert'], function (alert) {
-            alert({
+            alert.default({
                 title: options.title || Globalize.translate('HeaderAlert'),
                 text: options.message
             }).then(options.callback || function () {});
         });
     },
-    restartServer: function () {
-        var apiClient = window.ApiClient;
-
-        if (apiClient) {
-            require(['serverRestartDialog', 'events'], function (ServerRestartDialog, events) {
-                var dialog = new ServerRestartDialog({
-                    apiClient: apiClient
-                });
-                events.on(dialog, 'restarted', function () {
-                    if (AppInfo.isNativeApp) {
-                        apiClient.ensureWebSocket();
-                    } else {
-                        window.location.reload(true);
-                    }
-                });
-                dialog.show();
-            });
-        }
-    },
     capabilities: function (appHost) {
         var capabilities = {
             PlayableMediaTypes: ['Audio', 'Video'],
-            SupportedCommands: ['MoveUp', 'MoveDown', 'MoveLeft', 'MoveRight', 'PageUp', 'PageDown', 'PreviousLetter', 'NextLetter', 'ToggleOsd', 'ToggleContextMenu', 'Select', 'Back', 'SendKey', 'SendString', 'GoHome', 'GoToSettings', 'VolumeUp', 'VolumeDown', 'Mute', 'Unmute', 'ToggleMute', 'SetVolume', 'SetAudioStreamIndex', 'SetSubtitleStreamIndex', 'DisplayContent', 'GoToSearch', 'DisplayMessage', 'SetRepeatMode', 'ChannelUp', 'ChannelDown', 'PlayMediaSource', 'PlayTrailers'],
+            SupportedCommands: ['MoveUp', 'MoveDown', 'MoveLeft', 'MoveRight', 'PageUp', 'PageDown', 'PreviousLetter', 'NextLetter', 'ToggleOsd', 'ToggleContextMenu', 'Select', 'Back', 'SendKey', 'SendString', 'GoHome', 'GoToSettings', 'VolumeUp', 'VolumeDown', 'Mute', 'Unmute', 'ToggleMute', 'SetVolume', 'SetAudioStreamIndex', 'SetSubtitleStreamIndex', 'DisplayContent', 'GoToSearch', 'DisplayMessage', 'SetRepeatMode', 'SetShuffleQueue', 'ChannelUp', 'ChannelDown', 'PlayMediaSource', 'PlayTrailers'],
             SupportsPersistentIdentifier: 'cordova' === self.appMode || 'android' === self.appMode,
             SupportsMediaControl: true
         };
@@ -228,6 +209,28 @@ var Dashboard = {
         } else {
             Dashboard.navigate('selectserver.html');
         }
+    },
+    hideLoadingMsg: function() {
+        'use strict';
+        require(['loading'], function(loading) {
+            loading.hide();
+        });
+    },
+    showLoadingMsg: function() {
+        'use strict';
+        require(['loading'], function(loading) {
+            loading.show();
+        });
+    },
+    confirm: function(message, title, callback) {
+        'use strict';
+        require(['confirm'], function(confirm) {
+            confirm(message, title).then(function() {
+                callback(!0);
+            }).catch(function() {
+                callback(!1);
+            });
+        });
     }
 };
 
@@ -357,7 +360,7 @@ var AppInfo = {};
         return layoutManager;
     }
 
-    function createSharedAppFooter(appFooter) {
+    function createSharedAppFooter({default: appFooter}) {
         return new appFooter({});
     }
 
@@ -375,8 +378,7 @@ var AppInfo = {};
         }
     }
 
-    function initRequireWithBrowser(browser) {
-        var bowerPath = getBowerPath();
+    function initRequireWithBrowser() {
         var componentsPath = getComponentsPath();
         var scriptsPath = getScriptsPath();
 
@@ -385,14 +387,6 @@ var AppInfo = {};
         define('lazyLoader', [componentsPath + '/lazyLoader/lazyLoaderIntersectionObserver'], returnFirstDependency);
         define('shell', [scriptsPath + '/shell'], returnFirstDependency);
 
-        if ('registerElement' in document) {
-            define('registerElement', []);
-        } else if (browser.msie) {
-            define('registerElement', ['webcomponents'], returnFirstDependency);
-        } else {
-            define('registerElement', ['document-register-element'], returnFirstDependency);
-        }
-
         define('alert', [componentsPath + '/alert'], returnFirstDependency);
 
         defineResizeObserver();
@@ -426,7 +420,7 @@ var AppInfo = {};
                 require(['globalize', 'browser'], function (globalize, browser) {
                     window.Globalize = globalize;
                     loadCoreDictionary(globalize).then(function () {
-                        onGlobalizeInit(browser);
+                        onGlobalizeInit(browser, globalize);
                     });
                 });
                 require(['keyboardnavigation'], function(keyboardnavigation) {
@@ -459,14 +453,14 @@ var AppInfo = {};
         });
     }
 
-    function onGlobalizeInit(browser) {
+    function onGlobalizeInit(browser, globalize) {
         if ('android' === self.appMode) {
             if (-1 !== self.location.href.toString().toLowerCase().indexOf('start=backgroundsync')) {
                 return onAppReady(browser);
             }
         }
 
-        document.title = Globalize.translateDocument(document.title, 'core');
+        document.title = globalize.translateHtml(document.title, 'core');
 
         if (browser.tv && !browser.android) {
             console.debug('using system fonts with explicit sizes');
@@ -486,21 +480,22 @@ var AppInfo = {};
     function loadPlugins(appHost, browser, shell) {
         console.debug('loading installed plugins');
         var list = [
-            'components/playback/playaccessvalidation',
-            'components/playback/experimentalwarnings',
-            'components/htmlAudioPlayer/plugin',
-            'components/htmlVideoPlayer/plugin',
-            'components/photoPlayer/plugin',
-            'components/youtubeplayer/plugin',
-            'components/backdropScreensaver/plugin',
-            'components/logoScreensaver/plugin'
+            'plugins/playAccessValidation/plugin',
+            'plugins/experimentalWarnings/plugin',
+            'plugins/htmlAudioPlayer/plugin',
+            'plugins/htmlVideoPlayer/plugin',
+            'plugins/photoPlayer/plugin',
+            'plugins/bookPlayer/plugin',
+            'plugins/youtubePlayer/plugin',
+            'plugins/backdropScreensaver/plugin',
+            'plugins/logoScreensaver/plugin'
         ];
 
         if (appHost.supports('remotecontrol')) {
-            list.push('components/sessionPlayer');
+            list.push('plugins/sessionPlayer/plugin');
 
             if (browser.chrome || browser.opera) {
-                list.push('components/chromecast/chromecastplayer');
+                list.push('plugins/chromecastPlayer/plugin');
             }
         }
 
@@ -561,6 +556,7 @@ var AppInfo = {};
                     require(['components/playback/volumeosd']);
                 }
 
+                /* eslint-disable-next-line compat/compat */
                 if (navigator.mediaSession || window.NativeShell) {
                     require(['mediaSession']);
                 }
@@ -616,8 +612,8 @@ var AppInfo = {};
         /* eslint-enable compat/compat */
     }
 
-    function onWebComponentsReady(browser) {
-        initRequireWithBrowser(browser);
+    function onWebComponentsReady() {
+        initRequireWithBrowser();
 
         if (self.appMode === 'cordova' || self.appMode === 'android' || self.appMode === 'standalone') {
             AppInfo.isNativeApp = true;
@@ -658,8 +654,9 @@ var AppInfo = {};
             playQueueManager: componentsPath + '/playback/playqueuemanager',
             nowPlayingHelper: componentsPath + '/playback/nowplayinghelper',
             pluginManager: componentsPath + '/pluginManager',
-            packageManager: componentsPath + '/packagemanager',
-            screensaverManager: componentsPath + '/screensavermanager'
+            packageManager: componentsPath + '/packageManager',
+            screensaverManager: componentsPath + '/screensavermanager',
+            chromecastHelper: 'plugins/chromecastPlayer/chromecastHelpers'
         };
 
         requirejs.onError = onRequireJsError;
@@ -673,10 +670,10 @@ var AppInfo = {};
             },
             bundles: {
                 bundle: [
-                    'document-register-element',
                     'fetch',
                     'flvjs',
                     'jstree',
+                    'epubjs',
                     'jQuery',
                     'hlsjs',
                     'howler',
@@ -737,12 +734,6 @@ var AppInfo = {};
         define('cardStyle', ['css!' + componentsPath + '/cardbuilder/card'], returnFirstDependency);
         define('flexStyles', ['css!assets/css/flexstyles'], returnFirstDependency);
 
-        // define legacy features
-        // TODO delete the rest of these
-        define('fnchecked', ['legacy/fnchecked'], returnFirstDependency);
-        define('legacyDashboard', ['legacy/dashboard'], returnFirstDependency);
-        define('legacySelectMenu', ['legacy/selectmenu'], returnFirstDependency);
-
         // there are several objects that need to be instantiated
         // TODO find a better way to do this
         define('appFooter', [componentsPath + '/appFooter/appFooter'], returnFirstDependency);
@@ -778,7 +769,6 @@ var AppInfo = {};
         define('appSettings', [scriptsPath + '/settings/appSettings'], returnFirstDependency);
         define('userSettings', [scriptsPath + '/settings/userSettings'], returnFirstDependency);
 
-        define('chromecastHelper', [componentsPath + '/chromecast/chromecasthelpers'], returnFirstDependency);
         define('mediaSession', [componentsPath + '/playback/mediasession'], returnFirstDependency);
         define('actionsheet', [componentsPath + '/actionSheet/actionSheet'], returnFirstDependency);
         define('tunerPicker', [componentsPath + '/tunerPicker'], returnFirstDependency);
@@ -797,7 +787,6 @@ var AppInfo = {};
         define('tabbedView', [componentsPath + '/tabbedview/tabbedview'], returnFirstDependency);
         define('itemsTab', [componentsPath + '/tabbedview/itemstab'], returnFirstDependency);
         define('collectionEditor', [componentsPath + '/collectionEditor/collectionEditor'], returnFirstDependency);
-        define('serverRestartDialog', [componentsPath + '/serverRestartDialog'], returnFirstDependency);
         define('playlistEditor', [componentsPath + '/playlisteditor/playlisteditor'], returnFirstDependency);
         define('recordingCreator', [componentsPath + '/recordingcreator/recordingcreator'], returnFirstDependency);
         define('recordingEditor', [componentsPath + '/recordingcreator/recordingeditor'], returnFirstDependency);
@@ -820,15 +809,16 @@ var AppInfo = {};
         define('upNextDialog', [componentsPath + '/upnextdialog/upnextdialog'], returnFirstDependency);
         define('subtitleAppearanceHelper', [componentsPath + '/subtitlesettings/subtitleappearancehelper'], returnFirstDependency);
         define('subtitleSettings', [componentsPath + '/subtitlesettings/subtitlesettings'], returnFirstDependency);
+        define('settingsHelper', [componentsPath + '/settingshelper'], returnFirstDependency);
         define('displaySettings', [componentsPath + '/displaySettings/displaySettings'], returnFirstDependency);
         define('playbackSettings', [componentsPath + '/playbackSettings/playbackSettings'], returnFirstDependency);
         define('homescreenSettings', [componentsPath + '/homeScreenSettings/homeScreenSettings'], returnFirstDependency);
         define('quickConnectSettings', [componentsPath + '/quickConnectSettings/quickConnectSettings'], returnFirstDependency);
         define('playbackManager', [componentsPath + '/playback/playbackmanager'], getPlaybackManager);
-        define('timeSyncManager', [componentsPath + '/syncplay/timeSyncManager'], returnDefault);
-        define('groupSelectionMenu', [componentsPath + '/syncplay/groupSelectionMenu'], returnFirstDependency);
-        define('syncPlayManager', [componentsPath + '/syncplay/syncPlayManager'], returnDefault);
-        define('playbackPermissionManager', [componentsPath + '/syncplay/playbackPermissionManager'], returnDefault);
+        define('timeSyncManager', [componentsPath + '/syncPlay/timeSyncManager'], returnDefault);
+        define('groupSelectionMenu', [componentsPath + '/syncPlay/groupSelectionMenu'], returnFirstDependency);
+        define('syncPlayManager', [componentsPath + '/syncPlay/syncPlayManager'], returnDefault);
+        define('playbackPermissionManager', [componentsPath + '/syncPlay/playbackPermissionManager'], returnDefault);
         define('layoutManager', [componentsPath + '/layoutManager', 'apphost'], getLayoutManager);
         define('homeSections', [componentsPath + '/homesections/homesections'], returnFirstDependency);
         define('playMenu', [componentsPath + '/playmenu'], returnFirstDependency);
@@ -841,7 +831,6 @@ var AppInfo = {};
         define('deleteHelper', [scriptsPath + '/deleteHelper'], returnFirstDependency);
         define('tvguide', [componentsPath + '/guide/guide'], returnFirstDependency);
         define('guide-settings-dialog', [componentsPath + '/guide/guide-settings'], returnFirstDependency);
-        define('loadingDialog', [componentsPath + '/loadingDialog/loadingDialog'], returnFirstDependency);
         define('viewManager', [componentsPath + '/viewManager/viewManager'], function (viewManager) {
             window.ViewManager = viewManager;
             viewManager.dispatchPageEvents(true);
@@ -852,7 +841,7 @@ var AppInfo = {};
         define('userdataButtons', [componentsPath + '/userdatabuttons/userdatabuttons'], returnFirstDependency);
         define('listView', [componentsPath + '/listview/listview'], returnFirstDependency);
         define('indicators', [componentsPath + '/indicators/indicators'], returnFirstDependency);
-        define('viewSettings', [componentsPath + '/viewsettings/viewsettings'], returnFirstDependency);
+        define('viewSettings', [componentsPath + '/viewSettings/viewSettings'], returnFirstDependency);
         define('filterMenu', [componentsPath + '/filtermenu/filtermenu'], returnFirstDependency);
         define('sortMenu', [componentsPath + '/sortmenu/sortmenu'], returnFirstDependency);
         define('sanitizefilename', [componentsPath + '/sanitizeFilename'], returnFirstDependency);
@@ -902,7 +891,7 @@ var AppInfo = {};
             };
 
             appRouter.showVideoOsd = function () {
-                return Dashboard.navigate('videoosd.html');
+                return Dashboard.navigate('video');
             };
 
             appRouter.showSelectServer = function () {
@@ -1043,7 +1032,7 @@ var AppInfo = {};
                 }
 
                 if ('SeriesTimer' == itemType) {
-                    return 'itemdetails.html?seriesTimerId=' + id + '&serverId=' + serverId;
+                    return 'details?seriesTimerId=' + id + '&serverId=' + serverId;
                 }
 
                 if ('livetv' == item.CollectionType) {
@@ -1113,13 +1102,13 @@ var AppInfo = {};
                 var itemTypes = ['Playlist', 'TvChannel', 'Program', 'BoxSet', 'MusicAlbum', 'MusicGenre', 'Person', 'Recording', 'MusicArtist'];
 
                 if (itemTypes.indexOf(itemType) >= 0) {
-                    return 'itemdetails.html?id=' + id + '&serverId=' + serverId;
+                    return 'details?id=' + id + '&serverId=' + serverId;
                 }
 
                 var contextSuffix = context ? '&context=' + context : '';
 
                 if ('Series' == itemType || 'Season' == itemType || 'Episode' == itemType) {
-                    return 'itemdetails.html?id=' + id + contextSuffix + '&serverId=' + serverId;
+                    return 'details?id=' + id + contextSuffix + '&serverId=' + serverId;
                 }
 
                 if (item.IsFolder) {
@@ -1130,7 +1119,7 @@ var AppInfo = {};
                     return '#';
                 }
 
-                return 'itemdetails.html?id=' + id + '&serverId=' + serverId;
+                return 'details?id=' + id + '&serverId=' + serverId;
             };
 
             appRouter.showItem = showItem;
@@ -1138,7 +1127,7 @@ var AppInfo = {};
         });
     })();
 
-    return require(['browser'], onWebComponentsReady);
+    return onWebComponentsReady();
 }();
 
 pageClassOn('viewshow', 'standalonePage', function () {
diff --git a/src/scripts/taskbutton.js b/src/scripts/taskbutton.js
index 8facaf8900..85062fdaa5 100644
--- a/src/scripts/taskbutton.js
+++ b/src/scripts/taskbutton.js
@@ -1,119 +1,122 @@
-define(['events', 'userSettings', 'serverNotifications', 'connectionManager', 'globalize', 'emby-button'], function (events, userSettings, serverNotifications, connectionManager, globalize) {
-    'use strict';
+import events from 'events';
+import * as userSettings from 'userSettings';
+import serverNotifications from 'serverNotifications';
+import connectionManager from 'connectionManager';
+import globalize from 'globalize';
+import 'emby-button';
 
-    return function (options) {
-        function pollTasks() {
-            connectionManager.getApiClient(serverId).getScheduledTasks({
-                IsEnabled: true
-            }).then(updateTasks);
-        }
+export default function (options) {
+    function pollTasks() {
+        connectionManager.getApiClient(serverId).getScheduledTasks({
+            IsEnabled: true
+        }).then(updateTasks);
+    }
 
-        function updateTasks(tasks) {
-            var task = tasks.filter(function (t) {
-                return t.Key == options.taskKey;
-            })[0];
-
-            if (options.panel) {
-                if (task) {
-                    options.panel.classList.remove('hide');
-                } else {
-                    options.panel.classList.add('hide');
-                }
-            }
-
-            if (!task) {
-                return;
-            }
-
-            if (task.State == 'Idle') {
-                button.removeAttribute('disabled');
-            } else {
-                button.setAttribute('disabled', 'disabled');
-            }
-
-            button.setAttribute('data-taskid', task.Id);
-            var progress = (task.CurrentProgressPercentage || 0).toFixed(1);
-
-            if (options.progressElem) {
-                options.progressElem.value = progress;
-
-                if (task.State == 'Running') {
-                    options.progressElem.classList.remove('hide');
-                } else {
-                    options.progressElem.classList.add('hide');
-                }
-            }
-
-            if (options.lastResultElem) {
-                var lastResult = task.LastExecutionResult ? task.LastExecutionResult.Status : '';
-
-                if (lastResult == 'Failed') {
-                    options.lastResultElem.html('<span style="color:#FF0000;">(' + globalize.translate('LabelFailed') + ')</span>');
-                } else if (lastResult == 'Cancelled') {
-                    options.lastResultElem.html('<span style="color:#0026FF;">(' + globalize.translate('LabelCancelled') + ')</span>');
-                } else if (lastResult == 'Aborted') {
-                    options.lastResultElem.html('<span style="color:#FF0000;">' + globalize.translate('LabelAbortedByServerShutdown') + '</span>');
-                } else {
-                    options.lastResultElem.html(lastResult);
-                }
-            }
-        }
-
-        function onScheduledTaskMessageConfirmed(id) {
-            connectionManager.getApiClient(serverId).startScheduledTask(id).then(pollTasks);
-        }
-
-        function onButtonClick() {
-            onScheduledTaskMessageConfirmed(this.getAttribute('data-taskid'));
-        }
-
-        function onScheduledTasksUpdate(e, apiClient, info) {
-            if (apiClient.serverId() === serverId) {
-                updateTasks(info);
-            }
-        }
-
-        var pollInterval;
-        var button = options.button;
-        var serverId = ApiClient.serverId();
-
-        function onPollIntervalFired() {
-            if (!connectionManager.getApiClient(serverId).isMessageChannelOpen()) {
-                pollTasks();
-            }
-        }
-
-        function startInterval() {
-            var apiClient = connectionManager.getApiClient(serverId);
-
-            if (pollInterval) {
-                clearInterval(pollInterval);
-            }
-            apiClient.sendMessage('ScheduledTasksInfoStart', '1000,1000');
-            pollInterval = setInterval(onPollIntervalFired, 5000);
-        }
-
-        function stopInterval() {
-            connectionManager.getApiClient(serverId).sendMessage('ScheduledTasksInfoStop');
-
-            if (pollInterval) {
-                clearInterval(pollInterval);
-            }
-        }
+    function updateTasks(tasks) {
+        const task = tasks.filter(function (t) {
+            return t.Key == options.taskKey;
+        })[0];
 
         if (options.panel) {
-            options.panel.classList.add('hide');
+            if (task) {
+                options.panel.classList.remove('hide');
+            } else {
+                options.panel.classList.add('hide');
+            }
         }
 
-        if (options.mode == 'off') {
-            button.removeEventListener('click', onButtonClick);
-            events.off(serverNotifications, 'ScheduledTasksInfo', onScheduledTasksUpdate);
-            stopInterval();
-        } else {
-            button.addEventListener('click', onButtonClick);
-            pollTasks();
-            startInterval();
-            events.on(serverNotifications, 'ScheduledTasksInfo', onScheduledTasksUpdate);
+        if (!task) {
+            return;
         }
-    };
-});
+
+        if (task.State == 'Idle') {
+            button.removeAttribute('disabled');
+        } else {
+            button.setAttribute('disabled', 'disabled');
+        }
+
+        button.setAttribute('data-taskid', task.Id);
+        const progress = (task.CurrentProgressPercentage || 0).toFixed(1);
+
+        if (options.progressElem) {
+            options.progressElem.value = progress;
+
+            if (task.State == 'Running') {
+                options.progressElem.classList.remove('hide');
+            } else {
+                options.progressElem.classList.add('hide');
+            }
+        }
+
+        if (options.lastResultElem) {
+            const lastResult = task.LastExecutionResult ? task.LastExecutionResult.Status : '';
+
+            if (lastResult == 'Failed') {
+                options.lastResultElem.html('<span style="color:#FF0000;">(' + globalize.translate('LabelFailed') + ')</span>');
+            } else if (lastResult == 'Cancelled') {
+                options.lastResultElem.html('<span style="color:#0026FF;">(' + globalize.translate('LabelCancelled') + ')</span>');
+            } else if (lastResult == 'Aborted') {
+                options.lastResultElem.html('<span style="color:#FF0000;">' + globalize.translate('LabelAbortedByServerShutdown') + '</span>');
+            } else {
+                options.lastResultElem.html(lastResult);
+            }
+        }
+    }
+
+    function onScheduledTaskMessageConfirmed(id) {
+        connectionManager.getApiClient(serverId).startScheduledTask(id).then(pollTasks);
+    }
+
+    function onButtonClick() {
+        onScheduledTaskMessageConfirmed(this.getAttribute('data-taskid'));
+    }
+
+    function onScheduledTasksUpdate(e, apiClient, info) {
+        if (apiClient.serverId() === serverId) {
+            updateTasks(info);
+        }
+    }
+
+    let pollInterval;
+    const button = options.button;
+    const serverId = ApiClient.serverId();
+
+    function onPollIntervalFired() {
+        if (!connectionManager.getApiClient(serverId).isMessageChannelOpen()) {
+            pollTasks();
+        }
+    }
+
+    function startInterval() {
+        const apiClient = connectionManager.getApiClient(serverId);
+
+        if (pollInterval) {
+            clearInterval(pollInterval);
+        }
+        apiClient.sendMessage('ScheduledTasksInfoStart', '1000,1000');
+        pollInterval = setInterval(onPollIntervalFired, 5000);
+    }
+
+    function stopInterval() {
+        connectionManager.getApiClient(serverId).sendMessage('ScheduledTasksInfoStop');
+
+        if (pollInterval) {
+            clearInterval(pollInterval);
+        }
+    }
+
+    if (options.panel) {
+        options.panel.classList.add('hide');
+    }
+
+    if (options.mode == 'off') {
+        button.removeEventListener('click', onButtonClick);
+        events.off(serverNotifications, 'ScheduledTasksInfo', onScheduledTasksUpdate);
+        stopInterval();
+    } else {
+        button.addEventListener('click', onButtonClick);
+        pollTasks();
+        startInterval();
+        events.on(serverNotifications, 'ScheduledTasksInfo', onScheduledTasksUpdate);
+    }
+}
diff --git a/src/scripts/themeLoader.js b/src/scripts/themeLoader.js
index f75d6d0e29..3a3a60e565 100644
--- a/src/scripts/themeLoader.js
+++ b/src/scripts/themeLoader.js
@@ -1,27 +1,29 @@
-define(['userSettings', 'skinManager', 'connectionManager', 'events'], function (userSettings, skinManager, connectionManager, events) {
-    'use strict';
+import * as userSettings from 'userSettings';
+import skinManager from 'skinManager';
+import connectionManager from 'connectionManager';
+import events from 'events';
 
-    var currentViewType;
-    pageClassOn('viewbeforeshow', 'page', function () {
-        var classList = this.classList;
-        var viewType = classList.contains('type-interior') || classList.contains('wizardPage') ? 'a' : 'b';
+var currentViewType;
+pageClassOn('viewbeforeshow', 'page', function () {
+    var classList = this.classList;
+    var viewType = classList.contains('type-interior') || classList.contains('wizardPage') ? 'a' : 'b';
 
-        if (viewType !== currentViewType) {
-            currentViewType = viewType;
-            var theme;
-            var context;
+    if (viewType !== currentViewType) {
+        currentViewType = viewType;
+        var theme;
+        var context;
 
-            if ('a' === viewType) {
-                theme = userSettings.dashboardTheme();
-                context = 'serverdashboard';
-            } else {
-                theme = userSettings.theme();
-            }
-
-            skinManager.setTheme(theme, context);
+        if ('a' === viewType) {
+            theme = userSettings.dashboardTheme();
+            context = 'serverdashboard';
+        } else {
+            theme = userSettings.theme();
         }
-    });
-    events.on(connectionManager, 'localusersignedin', function (e, user) {
-        currentViewType = null;
-    });
+
+        skinManager.setTheme(theme, context);
+    }
+});
+
+events.on(connectionManager, 'localusersignedin', function (e, user) {
+    currentViewType = null;
 });
diff --git a/src/scripts/touchHelper.js b/src/scripts/touchHelper.js
index 97455fc969..c12cf79513 100644
--- a/src/scripts/touchHelper.js
+++ b/src/scripts/touchHelper.js
@@ -1,31 +1,31 @@
-define(['dom', 'events'], function (dom, events) {
-    'use strict';
+import dom from 'dom';
+import events from 'events';
 
-    function getTouches(e) {
+function getTouches(e) {
+    return e.changedTouches || e.targetTouches || e.touches;
+}
 
-        return e.changedTouches || e.targetTouches || e.touches;
-    }
-
-    function TouchHelper(elem, options) {
+class TouchHelper {
+    constructor(elem, options) {
 
         options = options || {};
-        var touchTarget;
-        var touchStartX;
-        var touchStartY;
-        var lastDeltaX;
-        var lastDeltaY;
-        var thresholdYMet;
-        var self = this;
+        let touchTarget;
+        let touchStartX;
+        let touchStartY;
+        let lastDeltaX;
+        let lastDeltaY;
+        let thresholdYMet;
+        const self = this;
 
-        var swipeXThreshold = options.swipeXThreshold || 50;
-        var swipeYThreshold = options.swipeYThreshold || 50;
-        var swipeXMaxY = 30;
+        const swipeXThreshold = options.swipeXThreshold || 50;
+        const swipeYThreshold = options.swipeYThreshold || 50;
+        const swipeXMaxY = 30;
 
-        var excludeTagNames = options.ignoreTagNames || [];
+        const excludeTagNames = options.ignoreTagNames || [];
 
-        var touchStart = function (e) {
+        const touchStart = function (e) {
 
-            var touch = getTouches(e)[0];
+            const touch = getTouches(e)[0];
             touchTarget = null;
             touchStartX = 0;
             touchStartY = 0;
@@ -35,7 +35,7 @@ define(['dom', 'events'], function (dom, events) {
 
             if (touch) {
 
-                var currentTouchTarget = touch.target;
+                const currentTouchTarget = touch.target;
 
                 if (dom.parentWithTag(currentTouchTarget, excludeTagNames)) {
                     return;
@@ -47,18 +47,18 @@ define(['dom', 'events'], function (dom, events) {
             }
         };
 
-        var touchEnd = function (e) {
+        const touchEnd = function (e) {
 
-            var isTouchMove = e.type === 'touchmove';
+            const isTouchMove = e.type === 'touchmove';
 
             if (touchTarget) {
-                var touch = getTouches(e)[0];
+                const touch = getTouches(e)[0];
 
-                var deltaX;
-                var deltaY;
+                let deltaX;
+                let deltaY;
 
-                var clientX;
-                var clientY;
+                let clientX;
+                let clientY;
 
                 if (touch) {
                     clientX = touch.clientX || 0;
@@ -70,8 +70,8 @@ define(['dom', 'events'], function (dom, events) {
                     deltaY = 0;
                 }
 
-                var currentDeltaX = lastDeltaX == null ? deltaX : (deltaX - lastDeltaX);
-                var currentDeltaY = lastDeltaY == null ? deltaY : (deltaY - lastDeltaY);
+                const currentDeltaX = lastDeltaX == null ? deltaX : (deltaX - lastDeltaX);
+                const currentDeltaY = lastDeltaY == null ? deltaY : (deltaY - lastDeltaY);
 
                 lastDeltaX = deltaX;
                 lastDeltaY = deltaY;
@@ -138,14 +138,13 @@ define(['dom', 'events'], function (dom, events) {
             passive: true
         });
     }
+    destroy() {
 
-    TouchHelper.prototype.destroy = function () {
-
-        var elem = this.elem;
+        const elem = this.elem;
 
         if (elem) {
-            var touchStart = this.touchStart;
-            var touchEnd = this.touchEnd;
+            const touchStart = this.touchStart;
+            const touchEnd = this.touchEnd;
 
             dom.removeEventListener(elem, 'touchstart', touchStart, {
                 passive: true
@@ -165,7 +164,7 @@ define(['dom', 'events'], function (dom, events) {
         this.touchEnd = null;
 
         this.elem = null;
-    };
+    }
+}
 
-    return TouchHelper;
-});
+export default TouchHelper;
diff --git a/src/selectserver.html b/src/selectserver.html
deleted file mode 100644
index 2c84525174..0000000000
--- a/src/selectserver.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<div id="selectServerPage" data-role="page" class="page noSecondaryNavPage standalonePage pageContainer fullWidth vertical flex flex-direction-column">
-    <div class="verticalSection flex-shrink-zero flex flex-direction-column" style="margin: 2em 0 1em;">
-        <div class="padded-left padded-right flex align-items-center justify-content-center" style="margin-bottom:2em;">
-            <h1 class="sectionTitle sectionTitle-cards">${HeaderSelectServer}</h1>
-        </div>
-        <div class="padded-top padded-bottom-focusscale flex-grow flex" data-horizontal="true" data-centerfocus="card">
-            <div is="emby-itemscontainer" class="scrollSlider focuscontainer-x padded-left padded-right servers flex-grow" style="display: block; text-align: center;" data-hovermenu="false" data-multiselect="false"></div>
-        </div>
-    </div>
-    <div class="padded-top padded-left padded-right flex flex-shrink-zero justify-content-center verticalSection flex-wrap-wrap" style="margin-left:auto;margin-right:auto;">
-        <a is="emby-linkbutton" href="addserver.html" class="raised block cancel btnAddServer flex-shrink-zero" style="margin: .25em;">
-            <span>${ButtonAddServer}</span>
-        </a>
-    </div>
-</div>
diff --git a/src/strings/ar.json b/src/strings/ar.json
index f93146dc01..e7217b425b 100644
--- a/src/strings/ar.json
+++ b/src/strings/ar.json
@@ -146,8 +146,8 @@
     "HeaderAlbums": "الألبومات",
     "HeaderAlert": "تنبيه",
     "HeaderAllowMediaDeletionFrom": "السماح بحذف الوسائط من قبل",
-    "HeaderApiKey": "مفتاح api",
-    "HeaderApiKeys": "مفاتيح api",
+    "HeaderApiKey": "مفتاح API",
+    "HeaderApiKeys": "مفاتيح API",
     "HeaderApiKeysHelp": "التطبيقات الخارجية تحتاج أن تمتلك مفتاح api لكي تتصل بخادم أمبي. هذه المفاتيح تُصدر عن طريق تسجيل الدخول بحساب أمبي، أو عن طريق منح التطبيق مفتاحاً أصدر يدوياً.",
     "HeaderApp": "التطبيق",
     "HeaderAudioSettings": "إعدادات الصوت",
@@ -162,7 +162,7 @@
     "HeaderCodecProfileHelp": "عرائض الكودك تشير إلى محدودية جهاز ما عند تشغيل وسيطة مشفر بكودك معيّن. إن كان هناك أي محدودية مذكورة فستحال الوسيطة إلى التشغير البيني، حتى لو كانت الصيغة مضبوطة للعمل بتلقائية.",
     "HeaderConfirmPluginInstallation": "أكد عملية تثبيت الملحق",
     "HeaderConfirmProfileDeletion": "أكّد حذف العريضة",
-    "HeaderConfirmRevokeApiKey": "أرفض مفتاح api",
+    "HeaderConfirmRevokeApiKey": "أرفض مفتاح API",
     "HeaderConnectToServer": "اتصل إلى الخادم",
     "HeaderConnectionFailure": "فشل في الاتصال",
     "HeaderContainerProfile": "عريضة الحاوية",
@@ -193,7 +193,7 @@
     "HeaderFrequentlyPlayed": "تم تشغيله مراراً",
     "HeaderGenres": "أنواع الأفلام",
     "HeaderGuideProviders": "مزودو الأدلة",
-    "HeaderHttpHeaders": "رؤوس http",
+    "HeaderHttpHeaders": "رؤوس HTTP",
     "HeaderIdentification": "التعريفة",
     "HeaderIdentificationCriteriaHelp": "أدخل على الأقل معيار واحد للتعريف.",
     "HeaderIdentificationHeader": "رأس التعريفة",
@@ -922,7 +922,7 @@
     "ValueSpecialEpisodeName": "خاص - {0}",
     "HeaderFavoriteAlbums": "الألبومات المفضلة",
     "HeaderAlbumArtists": "فناني الألبومات",
-    "Genres": "الأنواع",
+    "Genres": "التضنيفات",
     "Folders": "المجلدات",
     "Favorites": "المفضلة",
     "Collections": "مجموعات",
@@ -964,7 +964,7 @@
     "AllEpisodes": "كل الحلقات",
     "AllComplexFormats": "جميع التنسيقات المعقدة (ASS ، SSA ، VOBSUB ، PGS ، SUB / IDX ، ...)",
     "AllChannels": "كل القنوات",
-    "Albums": "ألبومات",
+    "Albums": "البومات",
     "Aired": "عرضت",
     "AirDate": "تاريخ العرض",
     "AddedOnValue": "أضيفت",
@@ -1018,7 +1018,6 @@
     "HeaderSeriesStatus": "حالة المسلسل",
     "HeaderSeriesOptions": "اعدادات المسلسل",
     "HeaderSecondsValue": "{0} ثوانى",
-    "HeaderRestartingServer": "اعادة تشغيل الخادم",
     "HeaderRecordingOptions": "اعدادات التسجيل",
     "HeaderPlaybackError": "خطأ فى التشغيل",
     "HeaderPlayOn": "شغل على",
@@ -1152,5 +1151,8 @@
     "DisplayInOtherHomeScreenSections": "عرض في أقسام الشاشة الرئيسية مثل أحدث الوسائط واستمر في المشاهدة",
     "DisplayInMyMedia": "عرض على الشاشة الرئيسية",
     "Display": "عرض",
-    "Dislike": "لم يعجبنى"
+    "Dislike": "لم يعجبنى",
+    "ButtonSyncPlay": "SyncPlay",
+    "ExtraLarge": "كبير جدا",
+    "EnableNextVideoInfoOverlayHelp": "في نهاية الفيديو, عرض معلومات عن الفيديو القادم في قائمة التشغيل."
 }
diff --git a/src/strings/be-by.json b/src/strings/be-by.json
index c3675b310e..28cf51bcde 100644
--- a/src/strings/be-by.json
+++ b/src/strings/be-by.json
@@ -19,5 +19,6 @@
     "ThisWizardWillGuideYou": "Гэты памочнік правядзе вас праз усе фазы ўстаноўкі і налады. Спачатку абярыце упадабаную мову.",
     "UserProfilesIntro": "У Jellyfin існуе ўбудаваная падтрымка для карыстальніцкіх профіляў, дазваляючы кожнаму карыстальніку валодаць сваімі ўласнымі параметрамі адлюстравання, станам прайгравання і кіраваннем ўтрымання.",
     "WelcomeToProject": "Пачатак працы ў Jellyfin!",
-    "WizardCompleted": "Гэта ўсё, што нам трэба зараз. Jellyfin пачынае збіраць звесткі аб вашай медыятэцы. Азнаёмцеся пакуль з некаторымі нашымі праграмамі, а затым націсніце  <b>Гатова</b>, каб праглядзець <b>Инфопанель сервера</b>."
+    "WizardCompleted": "Гэта ўсё, што нам трэба зараз. Jellyfin пачынае збіраць звесткі аб вашай медыятэцы. Азнаёмцеся пакуль з некаторымі нашымі праграмамі, а затым націсніце  <b>Гатова</b>, каб праглядзець <b>Инфопанель сервера</b>.",
+    "ButtonSyncPlay": "SyncPlay"
 }
diff --git a/src/strings/bg-bg.json b/src/strings/bg-bg.json
index 8357a9c8dd..71fdf80e32 100644
--- a/src/strings/bg-bg.json
+++ b/src/strings/bg-bg.json
@@ -277,7 +277,7 @@
     "Identify": "Разпознаване",
     "Images": "Изображения",
     "ImportMissingEpisodesHelp": "Ако е активирано, информация за липсващи епизоди ще бъде добавена в базата данни на Jellyfin и ще бъде показвана заедно със сезони и серии. Това може да доведе до значително по-дълго сканиране на библиотеката.",
-    "InstallingPackage": "Инсталиране на {0}",
+    "InstallingPackage": "Инсталиране на {0} на версия {1})",
     "InstantMix": "Пускане на подобни",
     "Label3DFormat": "Триизмерен формат:",
     "LabelAirDays": "Дни на излъчване:",
@@ -302,7 +302,7 @@
     "LabelCountry": "Държава:",
     "LabelCriticRating": "Оценка на критиците:",
     "LabelCurrentPassword": "Текуща парола:",
-    "LabelCustomCertificatePath": "Път към потребителския сертификат:",
+    "LabelCustomCertificatePath": "Ръчно задаване на пътя към SSL сертификата:",
     "LabelCustomCertificatePathHelp": "Път до файл с шифровъчен стандарт №12 (PKCS #12), съдържащ сертификат и частен ключ за поддръжка на протокол TLS на собствен домейн.",
     "LabelCustomCss": "CSS по избор:",
     "LabelCustomCssHelp": "Добавете собствен стил към уеб-интерфейса.",
@@ -333,7 +333,7 @@
     "LabelEnableDlnaPlayTo": "Включване на функцията \"възпроизвеждане с ДЛНА\"",
     "LabelEnableDlnaPlayToHelp": "Засичане на устройства в мрежата ви и предлагане на възможност за дистанционно управление.",
     "LabelEnableDlnaServer": "Включване на ДЛНА-сървър",
-    "LabelEnableDlnaServerHelp": "Разрешава на UPnP устройства в мрежата да разглеждат и пускат Jellyfin съдържание.",
+    "LabelEnableDlnaServerHelp": "Разрешава на UPnP устройства в мрежата да разглеждат и пускат Джелифин съдържание.",
     "LabelEnableRealtimeMonitor": "Активиране на наблюдение в реално време",
     "LabelEnableRealtimeMonitorHelp": "Промените ще бъдат обработени веднага, на поддържани файлови системи.",
     "LabelEpisodeNumber": "Номер на епизода:",
@@ -348,20 +348,20 @@
     "LabelHomeNetworkQuality": "Качество на домашната мрежа:",
     "LabelHomeScreenSectionValue": "Раздел {0} на началния екран:",
     "LabelHttpsPort": "Локален HTTPS порт:",
-    "LabelHttpsPortHelp": "TCP портът на който HTTPS сървърът на Jellyfin трябва да се закачи.",
+    "LabelHttpsPortHelp": "TCP портът на който HTTPS сървърът на Джелифин трябва да се закачи.",
     "LabelImageType": "Вид изображение:",
     "LabelInternetQuality": "Качество на интернетната връзка:",
     "LabelKodiMetadataDateFormat": "Формат на датата на издаване:",
     "LabelKodiMetadataUserHelp": "Разрешете това, за да запазите данните за гледанията във файлове Nfo за употреба от други програми.",
     "LabelLanguage": "Език:",
     "LabelLocalHttpServerPortNumber": "Локален HTTP порт:",
-    "LabelLocalHttpServerPortNumberHelp": "TCP портът на който HTTP сървърът на Jellyfin трябва да се закачи.",
+    "LabelLocalHttpServerPortNumberHelp": "TCP портът на който HTTP сървърът на Джелифин трябва да се закачи.",
     "LabelLogs": "Журнали:",
-    "LabelManufacturer": "Производител",
+    "LabelManufacturer": "Производител:",
     "LabelManufacturerUrl": "Адрес на производителя",
     "LabelMaxBackdropsPerItem": "Максимален брой фонове на медия:",
     "LabelMaxParentalRating": "Максимално допустима родителска оценка:",
-    "LabelMaxResumePercentage": "Макс процент за продължение:",
+    "LabelMaxResumePercentage": "Максимален процент за продължение:",
     "LabelMaxScreenshotsPerItem": "Максимален брой снимки на екрана на медия:",
     "LabelMaxStreamingBitrate": "Максимално качество на излъчване:",
     "LabelMetadata": "Метаданни:",
@@ -369,9 +369,9 @@
     "LabelMetadataPath": "Път към метаданните:",
     "LabelMetadataPathHelp": "Задайте място по избор за свалени картини и метаданни.",
     "LabelMinBackdropDownloadWidth": "Минимална широчина на сваления фон:",
-    "LabelMinResumeDuration": "Мин време за продължение (секунди):",
-    "LabelMinResumePercentage": "Мин процент за продължение:",
-    "LabelMinResumePercentageHelp": "Заглавията се считат за непускани ако бъдат спрени преди това време.",
+    "LabelMinResumeDuration": "Минимално време за продължение:",
+    "LabelMinResumePercentage": "Минимален процент за продължение:",
+    "LabelMinResumePercentageHelp": "Заглавията се считат ,че не са възпроизведени ако бъдат спрени преди този момент.",
     "LabelMinScreenshotDownloadWidth": "Минимална широчина на свалената снимка на екрана:",
     "LabelModelDescription": "Описание на модела",
     "LabelModelName": "Модел",
@@ -443,7 +443,7 @@
     "LabelTimeLimitHours": "Времево ограничение (часове):",
     "LabelTitle": "Заглавие:",
     "LabelTranscodingAudioCodec": "Звуков кодек:",
-    "LabelTranscodingTempPathHelp": "Тази папка съдържа работни файлове използвани от транскодера. Задайте място по избор или оставете празно за мястото по подразбиране.",
+    "LabelTranscodingTempPathHelp": "Посочете персонализиран път за файлове,които е необходимо да бъдат транскодирани и доставени на клиентите. Оставете празно ,за да се използва мястото по подразбиране.",
     "LabelTranscodingVideoCodec": "Видеокодек:",
     "LabelTriggerType": "Тип на спусъка:",
     "LabelType": "Вид:",
@@ -512,7 +512,7 @@
     "News": "Новини",
     "NoNextUpItemsMessage": "Нищо не е намерено. Започнете да гледате вашите предавания!",
     "NoSubtitleSearchResultsFound": "Няма намерени резултати.",
-    "NoSubtitles": "Без субтитри",
+    "NoSubtitles": "Без",
     "None": "Нищо",
     "Normal": "Нормален",
     "NumLocationsValue": "{0} папки",
@@ -583,7 +583,7 @@
     "OptionMissingEpisode": "Липсващи епизоди",
     "OptionMonday": "Понеделник",
     "OptionNameSort": "Име",
-    "OptionNew": "Нов...",
+    "OptionNew": "Нов…",
     "OptionNone": "Нищо",
     "OptionOnAppStartup": "Като се стартира приложението",
     "OptionOnInterval": "През интервал",
@@ -640,7 +640,7 @@
     "Refresh": "Опресняване",
     "RefreshMetadata": "Опресняване на метаданните",
     "ReleaseDate": "Дата на издаване",
-    "RememberMe": "Запомняне на данните",
+    "RememberMe": "Запомни ме",
     "RemoveFromCollection": "Премахване от колекцията",
     "RemoveFromPlaylist": "Премахване от списъка",
     "Repeat": "Повтаряне",
@@ -711,7 +711,7 @@
     "TabMusicVideos": "Музикални клипове",
     "TabMyPlugins": "Моите приставки",
     "TabNetworks": "Мрежи",
-    "TabNfoSettings": "Формат за метаданни .nfo",
+    "TabNfoSettings": "Формат за метаданни NFO",
     "TabNotifications": "Известия",
     "TabOther": "Други",
     "TabParentalControl": "Родителски контрол",
@@ -724,7 +724,7 @@
     "TabProfiles": "Профили",
     "TabRecordings": "Записи",
     "TabResponses": "Отговори",
-    "TabResumeSettings": "Настройки за продължаване",
+    "TabResumeSettings": "Възобнови",
     "TabScheduledTasks": "Планирани задачи",
     "TabSeries": "Сериали",
     "TabServer": "Сървър",
@@ -847,7 +847,7 @@
     "BrowsePluginCatalogMessage": "За да видите наличните добавки, прегледайте каталога с добавките.",
     "Box": "Кутия",
     "AlwaysPlaySubtitlesHelp": "Поднадписите, съвпадащи с езика от настройките, ще се зареждат, независимо от езика на аудио то.",
-    "BookLibraryHelp": "Поддържат се звукови и текстови книги. Преглед на инструкция за наименоване {1} на книга {0}.",
+    "BookLibraryHelp": "Поддържат се аудио книги такива съдържащи текст. Проверете ръководството за наименуване {1} на книги {0}.",
     "Blacklist": "Списък с блокирани",
     "BirthLocation": "Месторождение",
     "Banner": "Банер",
@@ -856,7 +856,7 @@
     "Ascending": "Възходящо",
     "AsManyAsPossible": "Колкото е възможно повече",
     "Artist": "Артист",
-    "AroundTime": "Към {0}",
+    "AroundTime": "Около {0}",
     "Anytime": "По всяко време",
     "AnyLanguage": "Който и да е език",
     "AlwaysPlaySubtitles": "Постоянно изпълнение",
@@ -879,9 +879,9 @@
     "BoxSet": "Комплект",
     "AuthProviderHelp": "Избор на доставчик на услуга за Автентификация, която ще се използва за автентификация на потребителската парола.",
     "AllowedRemoteAddressesHelp": "Списък с IP адреси или IP/маска записи, разделени със запетая, които ще имат отдалечен достъп. Ако полето не е попълнено всички адреси ще имат отдалечен достъп.",
-    "BurnSubtitlesHelp": "Определя дали сървърът трябва да записва субтитри във видеоклиповете припрекодиране. Избягването на това значително ще подобри производителността. Изберете Auto, за да запишете формати, базирани на изображения (VOBSUB, PGS, SUB, IDX) и някои ASS или SSA субтитри.",
+    "BurnSubtitlesHelp": "Определя дали сървърът трябва да записва субтитри във видеофайлове при прекодиране. Избягването на това значително ще подобри производителността. Изберете Auto, за да запишете формати, базирани на изображения (VOBSUB, PGS, SUB, IDX) и някои ASS или SSA субтитри.",
     "AllowFfmpegThrottlingHelp": "Когато прекодирането или запазването на видео стигне достатъчно далеч напред от текущата позиция за възпроизвеждане, поставете на пауза процеса, така ще се изразходват по-малко ресурси. Това е най-полезно, когато се гледа, без да се търси често из видеото. Изключете това, ако имате проблеми с възпроизвеждането.",
-    "AllowOnTheFlySubtitleExtractionHelp": "Вградените субтитри могат да бъдат извлечени от видеоклиповете и прехвърлени към клиентите като обикновен текст, за да се предотврати транскодирането на видеото. В някои системи това може да отнеме много време и да спре възпроизвеждането на видео по време на процеса на извличане. Деактивирайте това, за да има вградени субтитри, записани с видео кодиране, когато те не се поддържат от клиентското устройство.",
+    "AllowOnTheFlySubtitleExtractionHelp": "Вградените субтитри могат да бъдат извлечени от видеофайловете и прехвърлени към клиентите като обикновен текст, за да се предотврати транскодирането на видеото. В някои системи това може да отнеме много време и да спре възпроизвеждането на видео по време на процеса на извличане. Деактивирайте това, за да има вградени субтитри, записани с видео кодиране, когато те не се поддържат от клиентското устройство.",
     "CinemaModeConfigurationHelp": "Режимът на кино носи театрално изживяване направо във вашата всекидневна с възможност за пускане на трейлъри и персонализирани интродукции преди основния филм.",
     "ChangingMetadataImageSettingsNewContent": "Промените в настройките за изтегляне на метаданни или изображения ще се прилагат само за ново съдържание, добавено към вашата библиотека. За да приложите промените към съществуващите заглавия, ще трябва да обновите метаданните им ръчно.",
     "DefaultMetadataLangaugeDescription": "Това са настройки по подразбиране и могат да се променят на база библиотека.",
@@ -903,5 +903,668 @@
     "DeleteImageConfirmation": "Сигурнили сте че искате да премахнете това Изображение?",
     "DeleteImage": "Премахване на Исображение",
     "ButtonTogglePlaylist": "Списък с изпълнения",
-    "ButtonToggleContextMenu": "Повече"
+    "ButtonToggleContextMenu": "Повече",
+    "ErrorSavingTvProvider": "Има проблем със запазването на ТВ доставчика.Убедете се ,че е достъпен и опитайте отново.",
+    "ErrorPleaseSelectLineup": "Моля изберете списък и опитайте отново.Ако няма налични списъци се убедете ,че името,паролата и пощенския код са точни.",
+    "ErrorMessageStartHourGreaterThanEnd": "Времето за край трябва да бъде по-голямо от началното време.",
+    "ErrorGettingTvLineups": "Има проблем при опита да бъдат свалени списъци с ТВ.Убедете се ,че информацията е правилна и опитайте отново.",
+    "ErrorDeletingItem": "Има проблем при опита да бъде изтрит файла от сървъра.Убедете се ,че сървъра има право да трие папки и опитайте отново.",
+    "ErrorAddingXmlTvFile": "Има проблем при достъпа на XMLTV файла.Уверете се ,че е наличен и пробвайте отново.",
+    "ErrorAddingTunerDevice": "Възникна проблем при добавянето на тунера. Уверете се ,че устройството е достъпно и пробвайте отново.",
+    "ErrorAddingMediaPathToVirtualFolder": "Има проблем при добавянето на пътя.Моля уверете се ,че е валиден и сървъра има достъп до папката.",
+    "Episode": "Епизод",
+    "EnableDetailsBannerHelp": "Покажи картинка с банер в горната част на страницата с детайли.",
+    "EnableDetailsBanner": "Банер с подробности",
+    "EnableThemeVideosHelp": "Пускай тематични видеа на заден план ,докато се разглежда библиотеката.",
+    "EnableThemeVideos": "Тематични видеа",
+    "EnableThemeSongsHelp": "Пускай тематична музика ,докато се разглежда библиотеката.",
+    "EnableStreamLoopingHelp": "Включи това ,ако поточното видео се предава на кратки интервали и е необходимо да се изпращат заявки постоянно.Включването на тази опция без нужда може да породи проблеми.",
+    "EnableStreamLooping": "Автоматично повторение на поточни видеа",
+    "EnablePhotosHelp": "Снимките ще бъдат разпознати и показани заедно с другите медийни файлове.",
+    "EnablePhotos": "Покажи снимки",
+    "EnableNextVideoInfoOverlayHelp": "В края на видеото покажи информация за следващия файл от текущия списък.",
+    "EnableNextVideoInfoOverlay": "Покажи информация за следващото видео по време на възпроизвеждане",
+    "EnableHardwareEncoding": "Включи хардуерно енкодиране",
+    "EnableExternalVideoPlayersHelp": "Меню от външен плеър ще бъде показано при стартиране на възпроизвеждането.",
+    "EnableDisplayMirroring": "Дублиране на дисплей",
+    "EnableColorCodedBackgrounds": "Цветни \"декори\"",
+    "EnableBackdropsHelp": "Показвай \"декори\" на заден план за някои страници ,докато се разглежда библиотеката.",
+    "DrmChannelsNotImported": "Канали със DRM няма да бъдат импортирани.",
+    "Down": "Долу",
+    "DoNotRecord": "Не записвай",
+    "DisplayModeHelp": "Изберете какво оформление желаете за интерфейса.",
+    "DisplayMissingEpisodesWithinSeasonsHelp": "Това трябва да бъде включено и за ТВ библиотеки в настройките на сървъра.",
+    "DisplayMissingEpisodesWithinSeasons": "Показвай липсващите епизоди от сезона",
+    "DisplayInOtherHomeScreenSections": "Покажи на главната страница (като \"последно добавени\" и \"продължи да гледаш\")",
+    "DisplayInMyMedia": "Покажи на главната страница",
+    "Disconnect": "Прекъсване",
+    "Disabled": "Изключено",
+    "DirectStreaming": "Директно възпроизвеждане",
+    "DirectStreamHelp2": "Директното възпроизвеждане на файла използва минимална процесорна мощност без загуба на качество.",
+    "DirectStreamHelp1": "Файлът е съвместим с устройството по отношение на резолюция и тип (H.264, AC3 и т.н.), но контейнера е несъвместим (mkv, avi, wmv, т.н.).Файлът ще бъде \"препакетиран\" преди да се възпроизведе от устройството.",
+    "DirectPlaying": "Директен метод на възпроизвеждане",
+    "DetectingDevices": "Откриване на устройства",
+    "Descending": "Намаляващ",
+    "Depressed": "Понижен",
+    "DeleteDeviceConfirmation": "Сигурни ли сте ,че искате да изтриете устройството? Ще се появи отново ,когато потребителят се впише с него.",
+    "DeinterlaceMethodHelp": "Избери типа деинтерлейсинг ,когато е необходимо транскодиране на подобно съдържание.",
+    "DefaultSubtitlesHelp": "Субтитрите са заредени според настройките зададени в метадатата на видеофайла.Когато има повече от едни субтитри се зарежда първо зададените в настройките.",
+    "HeaderFavoriteVideos": "Любими видеа",
+    "HeaderFavoritePeople": "Любими хора",
+    "HeaderFavoriteMovies": "Любими филми",
+    "HeaderFavoriteBooks": "Любими книги",
+    "HeaderExternalIds": "Външни идентификатори:",
+    "HeaderEpisodes": "Епизоди",
+    "HeaderEnabledFieldsHelp": "Махни отметката ,за да го заключиш и да предотвратиш неговата промяна.",
+    "HeaderDVR": "DVR (Цифрово записващо устройство)",
+    "HeaderDirectPlayProfileHelp": "Добави профили за директно възпроизвеждане ,за да се укаже кои формати може да възпроизвежда устройството.",
+    "HeaderDeleteTaskTrigger": "Изтрий \"пусковият механизъм\" за задачи",
+    "HeaderDeleteProvider": "Изтрий доставчик",
+    "HeaderDeleteItems": "Изтрий елемент",
+    "HeaderDeleteItem": "Изтрий елемент",
+    "HeaderDeleteDevice": "Изтрий устройство",
+    "HeaderDefaultRecordingSettings": "Стандартни настройки за запис",
+    "HeaderDateIssued": "Дата на издаване",
+    "HeaderContainerProfileHelp": "Профилите на различните контейнери показват ограниченията на устройството ,когато се възпроизвеждат определени формати.Ако ограничението е валидно - медията ще бъде транскодирана дори дадения формат да е конфигуриран за директно възпроизвеждане.",
+    "HeaderConnectionFailure": "Проблем при свързване",
+    "HeaderConnectToServer": "Свържи се със сървър",
+    "HeaderConfirmRevokeApiKey": "Отмяна на API ключа",
+    "HeaderConfirmProfileDeletion": "Потвърди изтриването на профила",
+    "HeaderConfirmPluginInstallation": "Потвърди инсталирането на плъгина",
+    "HeaderConfigureRemoteAccess": "Настройка на отдалечения достъп",
+    "HeaderCodecProfileHelp": "Профилите на различните кодеци показват ограниченията на устройството при тяхното възпроизвеждане.Ако ограничението е валидно - медията ще бъде транскодирана дори дадения кодек да е конфигуриран за директно възпроизвеждане.",
+    "HeaderChapterImages": "Картинки към раздела",
+    "HeaderChannelAccess": "Достъп до канали",
+    "HeaderCancelSeries": "Отмени сериал",
+    "HeaderCancelRecording": "Отмени запис",
+    "HeaderBranding": "Оформление",
+    "HeaderBlockItemsWithNoRating": "Забрани достъпа на елементи без информация за рейтинг:",
+    "HeaderAudioBooks": "Аудио книги",
+    "HeaderAppearsOn": "Фигурира в",
+    "ApiKeysCaption": "Списък с работещите в момента API ключове",
+    "HeaderApiKeysHelp": "Външните програми се налага да имат API ключ ,за да комуникират правилно със сървъра.Такива се издават при вписването в сървъра или чрез ръчно предоставяне.",
+    "HeaderAllowMediaDeletionFrom": "Позволи изтриването на медия от",
+    "HeaderAlert": "Предупреждение",
+    "HeaderAccessScheduleHelp": "Създай разписание за достъп ,за да го ограничиш до определени часове.",
+    "HeaderAccessSchedule": "Разписание за достъп",
+    "HardwareAccelerationWarning": "Включването на хардуерното ускорение може да предизвика нестабилност в някои случаи.Уверете се ,че операционната ви система и видео драйверите са актуални.Ако имате проблеми с възпроизвеждането при включена настройка е необходимо да я изключите.",
+    "EncoderPresetHelp": "Избери по-бърза стойност ,за да се подобри производителността или по-бавна стойност ,за да се подобри качеството.",
+    "H264CrfHelp": "Факторът \"постоянна скорост на предаване\" (CRF) е настройката по подразбиране на x264 енкодера.Може да определите стойност между 0 и 51, където най-ниската стойност ще даде по-добро качество (като се вземе предвид,че крайния размер на файла ще се увеличи).Препоръчват се стойности между 18 и 28.Стойността по подразбиране за x264 е 23 ,така че може да я имате за някакъв ориентир.",
+    "GuideProviderSelectListings": "Избери списъци",
+    "GroupBySeries": "Групирай по сериали",
+    "General": "Общи",
+    "FileReadError": "Има проблем при четенето на файла.",
+    "FileReadCancelled": "Четенето на файла е преустановено.",
+    "FileNotFound": "Файлът не е намерен.",
+    "FetchingData": "Извличане на допълнителни данни",
+    "Features": "Характеристики",
+    "FFmpegSavePathNotFound": "Не е намерен FFmpeg в зададения път.FFprobe е също задължителен и трябва да се намира в същата папка.Двете програми обикновено вървят заедно ,когато ги теглите.Уверете се ,че пътя е правилен и опитайте отново.",
+    "ExtractChapterImagesHelp": "Извличането на снимки от раздел ще позволи на устройствата да възпроизвеждат графични кадри при избора на меню.Този процес може бавен,ресурсно натоварващ и може да е необходимо да се заемат няколко гигабайта дисково пространство.Процесът се извършва при откриването на нови файлове или може да бъде зададен , като планирана задача при слаба активност на сървъра.Това може да бъде конфигурирано в раздела с планирани задачи.Не е препоръчително да се задава изпълнението на такава задача в натоварените часове на сървъра.",
+    "HttpsRequiresCert": "За да разрешите \"сигурни връзки\" е необходимо да притежавате доверен издател на сертификати ,като Let's Encrypt.Моля въведете ,ако притежавате такъв или изключете \"сигурни връзки\".",
+    "HeaderXmlSettings": "Настройки на XML",
+    "HeaderXmlDocumentAttributes": "Атрибути на XML документа",
+    "HeaderXmlDocumentAttribute": "Атрибут на XML документа",
+    "HeaderUpcomingOnTV": "Скоро по ТВ",
+    "HeaderTypeText": "Въведи текст",
+    "HeaderTypeImageFetchers": "{0} Извличане на картини",
+    "HeaderTuners": "Тунери",
+    "HeaderTranscodingProfileHelp": "Добави профили за транскодиране ,за да се види кои формати ще се използват ,когато е необходимо транскодиране.",
+    "HeaderThisUserIsCurrentlyDisabled": "Този потребител в момента е блокиран",
+    "HeaderSyncPlayEnabled": "Включване на \"синхронизирано възпроизвеждане\"",
+    "HeaderSyncPlaySelectGroup": "Присъединяване към група",
+    "HeaderSubtitleProfilesHelp": "Профилите за субтитри показват форматите поддържани от устройството.",
+    "HeaderSubtitleProfiles": "Профили за субтитри",
+    "HeaderSubtitleProfile": "Профил за субтитри",
+    "HeaderSubtitleDownloads": "Сваляне на субтитри",
+    "HeaderStopRecording": "Спри запис",
+    "HeaderSpecialEpisodeInfo": "Информация за специалните епизоди",
+    "HeaderShutdown": "Изключване",
+    "HeaderServerAddressSettings": "Настройки за адреса на сървъра",
+    "HeaderSeriesStatus": "Състояние на сериала",
+    "HeaderSeriesOptions": "Настройки на сериала",
+    "HeaderSelectTranscodingPathHelp": "Търси или въведи ръчно пътя ,където искаш да се съхраняват временните файлове при транскодиране.Папката трябва да има права за запис.",
+    "HeaderSelectTranscodingPath": "Избери папка за временното транскодиране на файлове",
+    "HeaderSelectServerCachePathHelp": "Търси или въведи ръчно пътя до временните файлове на сървъра.Папката трябва да има права за запис.",
+    "HeaderSelectServerCachePath": "Избери папка за временните файлове на сървъра",
+    "HeaderSelectServer": "Избери сървър",
+    "HeaderSelectMetadataPathHelp": "Търси или въведи ръчно пътя ,където искаш да се съхраняват метаданните.Папката трябва да има права за запис.",
+    "HeaderSelectMetadataPath": "Избери папка със метаданни",
+    "HeaderSelectCertificatePath": "Избери папка със сертификат",
+    "HeaderRestartingServer": "Рестартиране на сървъра",
+    "HeaderResponseProfileHelp": "Профилите за комуникация дават възможност да се настрои типът информация ,която се изпраща към устройството при възпроизвеждането на определени типове медия.",
+    "HeaderRemoveMediaLocation": "Премахни папката с медия",
+    "HeaderRemoteAccessSettings": "Настройки за отдалечен достъп",
+    "HeaderRecordingPostProcessing": "Последваща обработка на записи",
+    "HeaderRecordingOptions": "Настройки за запис",
+    "HeaderPluginInstallation": "Инсталиране на добавка",
+    "HeaderPlaybackError": "Грешка при възпроизвеждане",
+    "HeaderPlayback": "Възпроизвеждане на медия",
+    "HeaderPinCodeReset": "Зануляване на пин код",
+    "HeaderPhotoAlbums": "Фото албум",
+    "HeaderPasswordReset": "Зануляване на парола",
+    "HeaderOtherItems": "Други елементи",
+    "HeaderNextVideoPlayingInValue": "Следващото видео ще се възпроизведе след {0}",
+    "HeaderNavigation": "Навигация",
+    "HeaderLiveTvTunerSetup": "Настройка на тв тунера",
+    "HeaderKodiMetadataHelp": "За да включиш или изключиш използването на NFO метаданните влез в настройките за библиотеки на сървъра и намери секцията за съхранение.",
+    "HeaderKeepSeries": "Запази сериалите",
+    "HeaderKeepRecording": "Запази записите",
+    "HeaderItems": "Елементи",
+    "HeaderImageOptions": "Настройки на картини",
+    "HeaderIdentifyItemHelp": "Въведете един или повече критерии за търсене.Премахнете ,ако искате да увеличите резултатите при търсенето.",
+    "HeaderIdentificationHeader": "Идентификационен хедър",
+    "HeaderIdentificationCriteriaHelp": "Въведете пони един критерии.",
+    "HeaderHttpsSettings": "HTTPS настройки",
+    "HeaderHttpHeaders": "HTTP Хедъри",
+    "HeaderHome": "Главна",
+    "HeaderFetcherSettings": "Настройки на програмата за изтегляне",
+    "HeaderFavoritePlaylists": "Любими списъци",
+    "LabelDeathDate": "Дата на смърт:",
+    "LabelDateAddedBehaviorHelp": "Ако е взета стойност от метаданните, тя винаги ще бъде използвана преди някоя от тези опции.",
+    "LabelDateAddedBehavior": "за ново съдържание се приема дата на добавяне:",
+    "LabelCustomDeviceDisplayNameHelp": "Добави ръчно име ,с което ще се показва устройството или остави това ,което е по подразбиране.",
+    "LabelCorruptedFrames": "Повредени кадри:",
+    "LabelCancelled": "Отменено",
+    "LabelCache": "Временни файлове:",
+    "LabelBurnSubtitles": "Вграждане на субтитри:",
+    "LabelBlockContentWithTags": "Блокирай елементи с етикети:",
+    "LabelBlastMessageIntervalHelp": "Определя продължителността в секунди при \"бомбардирането\" с активни съобщения.",
+    "LabelBlastMessageInterval": "Интервал на активните съобщения (в секунди)",
+    "LabelBitrate": "Битрейт:",
+    "LabelBirthYear": "Година на раждане:",
+    "LabelBirthDate": "Дата на раждане:",
+    "LabelBindToLocalNetworkAddressHelp": "Не задължително.Замени локалния IP адрес за \"закачане\" към http сървъра.Ако полето е празно сървъра ще \"закачи\" всички налични адреси.Промяната на тази стойност изисква рестарт на сървъра.",
+    "LabelBindToLocalNetworkAddress": "\"Закачи\" към локален мрежов адрес:",
+    "LabelAutomaticallyRefreshInternetMetadataEvery": "Автоматично обновявай метаданните от Интернет:",
+    "LabelAuthProvider": "Доставчик за идентификация:",
+    "LabelAudioSampleRate": "Честотна дискретизация на аудиото:",
+    "LabelAudioCodec": "Аудио кодек:",
+    "LabelAudioChannels": "Аудио канали:",
+    "LabelAudioBitrate": "Скорост на предаване на аудиото:",
+    "LabelAudioBitDepth": "Битова дълбочина на аудиото:",
+    "LabelAudio": "Аудио",
+    "LabelAppNameExample": "Примерно: Sickbeard, Sonarr",
+    "LabelAllowedRemoteAddressesMode": "Режим на филтъра за външни ИП адреси:",
+    "LabelAllowedRemoteAddresses": "Филтър за външни ИП адреси:",
+    "LabelAllowHWTranscoding": "Разреши хардуерно транскодиране",
+    "LabelAll": "Всички",
+    "LabelAlbumArtMaxWidthHelp": "Максимална резолюция на обложките за албуми показани чрез upnp:albumArtURI.",
+    "LabelAlbumArtMaxHeightHelp": "Максимална резолюция на обложките за албуми показани чрез upnp:albumArtURI.",
+    "LabelAlbumArtMaxHeight": "Максимална височина на обложките за албуми:",
+    "LabelAlbumArtHelp": "PN се използва за обложки на албуми dlna:profileID attribute on upnp:albumArtURI.Някои устройства се нуждаят от определена стойност ,независимо от размера на картината.",
+    "LabelAirsBeforeSeason": "Ще бъде излъчен преди сезон:",
+    "LabelAirsBeforeEpisode": "Ще бъде излъчен преди епизод:",
+    "LabelAirsAfterSeason": "Ще бъде излъчен след сезон:",
+    "LabelAccessStart": "Начално време:",
+    "LabelAccessEnd": "Време на приключване:",
+    "LabelAccessDay": "Ден от седмицата:",
+    "LabelAbortedByServerShutdown": "(Прекъснато поради изключването на сървъра)",
+    "Kids": "Деца",
+    "Items": "Елементи",
+    "ItemCount": "{0} Елементи",
+    "ImportFavoriteChannelsHelp": "Ако е включено само канали ,които са отбелязани ,като любими на устройството ще бъдат добавени.",
+    "LabelFriendlyName": "Лесно име:",
+    "LabelFormat": "Формат:",
+    "LabelFolder": "Папка:",
+    "LabelFileOrUrl": "Файл или URL:",
+    "LabelExtractChaptersDuringLibraryScanHelp": "Генерирай изображения от различните раздели при импортиране на видеофайлове (по време на сканиране на библиотеката).В противен случай те ще бъдат извлечени при планиране на такава задача,което ще позволи сканирането на библиотеката да се извърши по-бързо.",
+    "LabelExtractChaptersDuringLibraryScan": "Извлечи изображения от разделите при сканиране на библиотеката",
+    "LabelBaseUrlHelp": "Добавя потребителска папка към адреса на съръвра.Например: <code>http://example.com/<b>&lt;baseurl&gt;</b></code>",
+    "LabelBaseUrl": "Основен URL:",
+    "LabelEndDate": "Крайна дата:",
+    "LabelEnableSingleImageInDidlLimitHelp": "Някои устройства няма да го покажат правилно ,ако множество изображения са вградени в Didl.",
+    "LabelEnableSingleImageInDidlLimit": "Ограничи до едно вградено изображение",
+    "LabelEnableHttpsHelp": "Позволява на сървъра да \"слуша\" на предварително зададен HTTPS порт.Необходимо е да има настроен валиден сертификат ,за да работи правилно настройката.",
+    "LabelEnableHttps": "Включи HTTPS",
+    "LabelEnableHardwareDecodingFor": "Включи хардуерно декодиране за:",
+    "LabelEnableDlnaDebugLoggingHelp": "Създава големи журнали файлове и е редно да се използва само с цел отстраняване на проблеми.",
+    "LabelEnableBlastAliveMessagesHelp": "Включи ,ако сървъра не се открива правилно от други UPnP устройства в мрежата.",
+    "LabelEnableBlastAliveMessages": "\"Бомбардира\" активните съобщения",
+    "LabelEnableAutomaticPortMapHelp": "Автоматично пренасочва външните портове на рутера към локалните портове на сървъра чрез UPnP.Тази опция може да на работи при някои модели рутери или мрежови конфигурации.Промените влизат в сила само след рестарт на сървъра.",
+    "LabelEmbedAlbumArtDidlHelp": "Някои устройства предпочитат този метод за извличане на обложки за албуми.При други може да има проблем при възпроизвеждането ,ако опцията е включена.",
+    "LabelEasyPinCode": "Лесен пин код:",
+    "LabelDynamicExternalId": "{0} Ид:",
+    "LabelDroppedFrames": "Пропуснати кадри:",
+    "LabelDiscNumber": "Диск номер:",
+    "LabelDidlMode": "DIDL режим:",
+    "LabelDeinterlaceMethod": "Метод на деинтерлейсинг:",
+    "LabelDefaultUserHelp": "Определя коя потребителска библиотека ще се показва на свързаните устройства.Това може да бъде отменено за всяко отделно устройство чрез използване на профилите.",
+    "LabelDefaultUser": "Потребител по подразбиране:",
+    "LabelDefaultScreen": "Дисплей по подразбиране:",
+    "LabelPostProcessor": "Приложение за последваща обработка:",
+    "LabelPleaseRestart": "Промените ще влязат в сила след ръчно презареждане на уеб клиента.",
+    "LabelPlayMethod": "Метод на възпроизвеждане:",
+    "LabelPlayerDimensions": "Размери на плеъра:",
+    "LabelPlayer": "Плеър:",
+    "LabelPersonRoleHelp": "Пример: Шофьор на камион за сладолед",
+    "LabelPasswordRecoveryPinCode": "Пин код:",
+    "LabelPasswordResetProvider": "Услуга за нулиране на парола:",
+    "LabelParentNumber": "Родителски номер:",
+    "LabelOptionalNetworkPathHelp": "Ако папката е споделена във вашата мрежа,предоставянето на споделения път ще позволи приложения инсталирани на други устройства да имат достъп до медията директно.Например, {0} or {1}.",
+    "LabelNumber": "Номер:",
+    "LabelNotificationEnabled": "Включване на известие",
+    "LabelNewsCategories": "Категории новини:",
+    "LabelNightly": "Тестов",
+    "LabelStable": "Стабилна",
+    "LabelChromecastVersion": "Версия на Chromecast",
+    "LabelMusicStreamingTranscodingBitrateHelp": "Посочете максимален битрейт при поточно предаване на музика.",
+    "LabelMusicStreamingTranscodingBitrate": "Битрейт при транскодиране на музика:",
+    "LabelMoviePrefixHelp": "Ако има добавен префикс към филмовите заглавия го въведете тук ,за да може сървъра да го обработи правилно.",
+    "LabelMoviePrefix": "Префикс на филма:",
+    "LabelMovieCategories": "Филмови категории:",
+    "LabelMonitorUsers": "Следете активността от:",
+    "LabelMinResumeDurationHelp": "Най-краткото време в секунди позволяващо ви да запазите текущата позиция на възпроизвеждане и впоследствие да я възобновите.",
+    "LabelMethod": "Метод:",
+    "LabelMetadataSaversHelp": "Изберете форматите на файловете, в които да запишете метаданните си.",
+    "LabelMetadataSavers": "Хранилища на метаданни:",
+    "LabelMetadataReadersHelp": "Подреди по важност любимите си източници на локални метаданни.Първият намерен файл ще бъде прочетен.",
+    "LabelMetadataReaders": "Четци на метаданни:",
+    "LabelMetadataDownloadersHelp": "Включи и подреди по важност любимите си програми за изтегляне на метаданни.Тези с по-нисък ранг ще се използват само за попълване на липсваща информация.",
+    "LabelMessageTitle": "Заглавие на съобщението:",
+    "LabelMessageText": "Текст на съобщението:",
+    "LabelMaxStreamingBitrateHelp": "Определете максималния битрейт при излъчване.",
+    "LabelMaxResumePercentageHelp": "Приема се ,че файловете се възпроизведени до края ,ако се спре след този момент.",
+    "LabelMaxChromecastBitrate": "Качество на излъчване чрез Chromecast:",
+    "LabelMatchType": "Тип съвпадение:",
+    "LabelLoginDisclaimerHelp": "Съобщението ще се показва в долната част на страницата за вход.",
+    "LabelLoginDisclaimer": "Предупреждение при вход:",
+    "LabelLockItemToPreventChanges": "Заключи дадения елемент ,за да забраниш бъдещи промени",
+    "LabelLineup": "Редица:",
+    "LabelLibraryPageSizeHelp": "Настройва броя елементи ,които ще се показват в страницата на библиотеката.Въведете 0 ,за да забраните номерирането.",
+    "LabelLibraryPageSize": "Размер на страницата на библиотеката:",
+    "LabelKodiMetadataUser": "Запази данните за активността на потребителя в файл тип NFO за:",
+    "LabelKodiMetadataEnablePathSubstitutionHelp": "Активирай подмяната на пътя за изображения ,като се използват настройките зададени от сървъра.",
+    "LabelKodiMetadataEnablePathSubstitution": "Активирай подмяната на пътя",
+    "LabelKodiMetadataEnableExtraThumbsHelp": "Когато се свалят изображения те могат да бъдат запазени и в двете полета extrathumbs и extrafanart за по-добра съвместимост с облиците на Коди.",
+    "LabelKodiMetadataEnableExtraThumbs": "Копирай extrafanart в полето extrathumbs",
+    "LabelKodiMetadataDateFormatHelp": "Всички дати в NFO файловете ще бъдат анализирани в този формат.",
+    "LabelKidsCategories": "Детски категории:",
+    "LabelKeepUpTo": "Пази до:",
+    "LabelInNetworkSignInWithEasyPasswordHelp": "Използвай лесен пин код за вписване от потребителите в домашната мрежа.Основната ви парола ще се използва ,само когато сте вписвате отдалечено.Ако полето за пин код е празно няма да имате нужда да се вписвате с парола в домашната мрежа.",
+    "LabelInNetworkSignInWithEasyPassword": "Включи вписване в мрежата с лесен пин код",
+    "LabelImportOnlyFavoriteChannels": "Ограничи до канали обозначени ,като любими",
+    "LabelImageFetchersHelp": "Включете и подредете любимите ви услуги за извличане на изображения по важност.",
+    "LabelIconMaxWidthHelp": "Максимална резолюция на иконите показани чрез upnp:icon.",
+    "LabelIconMaxWidth": "Максимална ширина на икона:",
+    "LabelIconMaxHeightHelp": "Максимална резолюция на иконите показани чрез upnp:icon.",
+    "LabelIconMaxHeight": "Максимална височина на икона:",
+    "LabelHardwareAccelerationTypeHelp": "Хардуерното ускорение се нуждае от допълнителни настройки.",
+    "LabelEncoderPreset": "Шаблон за енкодиране чрез H264 и H265 :",
+    "LabelH264Crf": "Значение на CRF H264-кодиране:",
+    "LabelGroupMoviesIntoCollectionsHelp": "Когато се показват списъци с филми, филмите, принадлежащи към колекция, ще бъдат показани като един общ елемент.",
+    "LabelServerNameHelp": "Това е името ,което ще се ползва ,за да се разпознава сървъра и по подразбиране съвпада с името на компютъра.",
+    "LabelRefreshMode": "Режим на опресняване:",
+    "LabelRecordingPathHelp": "Посочете местоположението по подразбиране, за запазване на записи.Ако полето е празно ще се използва папката на сървъра.",
+    "LabelRecord": "Запис:",
+    "LabelReasonForTranscoding": "Причина за транскодиране:",
+    "LabelProtocolInfoHelp": "Стойността, която ще бъде използвана при отговор към GetProtocolInfo заявките от устройството.",
+    "LabelProtocolInfo": "Информация за протокола:",
+    "LabelPostProcessorArgumentsHelp": "Използвай {path},като път за записване на файла.",
+    "LabelPostProcessorArguments": "Аргументи на командния ред след обработка:",
+    "EnableBlurhashHelp": "Изображенията, които все още се зареждат, ще се показват чрез функцията\"размито запълване\"",
+    "EnableBlurhash": "Активиране на функцията \"размито запълване\" за изображения",
+    "UnsupportedPlayback": "Джелифин не може да дешифрира съдържание, защитено с DRM, но въпреки това цялото съдържание ще бъде обработено, включително защитените заглавия. Някои файлове могат да изглеждат напълно черни поради криптиране или други неподдържани функции, например интерактивни заглавия.",
+    "OnApplicationStartup": "При стартиране на приложението",
+    "EveryXHours": "На всеки {0} часа",
+    "EveryHour": "Всеки час",
+    "EveryXMinutes": "Всеки {0} минути",
+    "OnWakeFromSleep": "При \"събуждане от сън\"",
+    "WeeklyAt": "{0}сек в {1}",
+    "DailyAt": "Ежедневно в {0}",
+    "LastSeen": "Последно видян {0}",
+    "PersonRole": "като {0}",
+    "ListPaging": "{0}-{1} от {2}",
+    "WriteAccessRequired": "Джелифин сървъра изисква достъп с права за запис до тази папка. Моля, осигурете достъп с права за запис и опитайте отново.",
+    "PathNotFound": "Пътят не можа да бъде намерен. Моля, уверете се, че пътят е валиден и опитайте отново.",
+    "Yesterday": "Вчера",
+    "YadifBob": "YADIF х2",
+    "Yadif": "YADIF (Yet Another DeInterlacing Filter)",
+    "XmlTvSportsCategoriesHelp": "Програмите от тези категории ще се показват като спортни програми.За разделяне на множество използвайте '|'.",
+    "XmlTvPathHelp": "Път до XMLTV файла.Джелифин ще чете от този файл и периодично ще го проверява за актуализации.Ваша грижа е да го създадете и редовно да го обновявате.",
+    "XmlTvKidsCategoriesHelp": "Програмите с тези категории ще се показват като програми за деца.За разделяне на множество използвайте '|'.",
+    "XmlTvNewsCategoriesHelp": "Програмите от тези категории ще се показват като новинарски програми.За разделяне на множество използвайте '|'.",
+    "XmlTvMovieCategoriesHelp": "Програмите от тези категории ще се показват като филми.За разделяне на множество използвайте '|'.",
+    "XmlDocumentAttributeListHelp": "Тези атрибути се прилагат към коренния елемент на всеки XML отговор.",
+    "Whitelist": "Бял списък",
+    "ViewPlaybackInfo": "Вижте информация за възпроизвеждането",
+    "VideoRange": "Диапазон на видео",
+    "ValueTimeLimitSingleHour": "Времеви лимит: 1 час",
+    "ValueTimeLimitMultiHour": "Времеви лимит {0} часове",
+    "ValueContainer": "Контейнер: {0}",
+    "UserAgentHelp": "Предоставяне на персонализиран ползавтел-агент HTTP хедър.",
+    "Up": "Нагоре",
+    "Unrated": "Без категории",
+    "UninstallPluginConfirmation": "Сигурни ли сте ,че искате да премахнете {0}?",
+    "Uniform": "Еднороден",
+    "TvLibraryHelp": "Прегледайте {0}ръководството за именуване на ТВ{1}.",
+    "Transcoding": "Транскодиране",
+    "Track": "Пътека",
+    "TitleHostingSettings": "Настройки за хостинг",
+    "TitleHardwareAcceleration": "Хардуерно ускорение",
+    "TabNetworking": "Работа в мрежа",
+    "TabDVR": "ДВР",
+    "SystemDlnaProfilesHelp": "Системните профили са с достъп \"само за четене\".При промяна в системния профил ще бъде създаден нов персонализиран профил.",
+    "SyncPlayAccessHelp": "Избери нивото на достъп ,който този потребител ще има за услугата \"Синхронизирано възпроизвеждане\".С нейна помощ може да синхронизирате възпроизвеждането с други устройства.",
+    "SubtitleOffset": "Изместване на субтитрите",
+    "SubtitleDownloadersHelp": "Включи и подреди по собствени предпочитания услугите за сваляне на субтитри.",
+    "SubtitleAppearanceSettingsDisclaimer": "Настройките не могат да се приложат за графични субтитри (PGS, DVD, т.н.) или ASS/SSA ,защото те зареждат свои стилове.",
+    "SubtitleAppearanceSettingsAlsoPassedToCastDevices": "Настройките важат за всеки Chromecast поток стартиран от това устройство.",
+    "StopRecording": "Спри запис",
+    "SortName": "Подреди по име",
+    "SortChannelsBy": "Подреди канали по:",
+    "SmartSubtitlesHelp": "Когато аудиото е чуждоезично ще бъдат заредени субтитри според зададените настройки за език.",
+    "ErrorAddingListingsToSchedulesDirect": "Възникна грешка при добавянето на списъка към вашия \"Schedules Direct\" акаунт.Услугата позволява определен брой списъци към един акаунт.Ще е необходимо да влезете в акаунта си (през сайта на услугата) и да отстраните другите списъци преди да продължите с добавянето на нови.",
+    "LabelIdentificationFieldHelp": "Подниз или регулярен израз с различаване на главни букви.",
+    "EnableFastImageFadeInHelp": "Използвай бързи анимации преходи",
+    "EnableFastImageFadeIn": "Бързи анимации",
+    "LabelScreensaver": "Скрийнсейвър:",
+    "LabelScheduledTaskLastRan": "Последно пускан {0}, заел {1}.",
+    "LabelRuntimeMinutes": "Продължителност (в минути):",
+    "LabelRequireHttpsHelp": "Ако е отметнато сървъра ще пренасочва автоматично всички заявка от HTTP към HTTPS.Няма никакъв ефект ,ако сървъра не \"слуша\" по HTTPS.",
+    "LabelRequireHttps": "Изисква HTTPS",
+    "LabelRemoteClientBitrateLimitHelp": "Допълнително ограничаване битрейта на поточното предаване за всички мрежови устройства.Това е необходимо ,за да не допуснете устройствата да изискват по-висок битрейт, отколкото вашата интернет връзка позволява.Това може да доведе до повишено натоварване на процесора на вашия сървър, за щото видеата ще се прекодират \"в движение\" до по-нисък битрейт.",
+    "LabelTranscodingThreadCount": "Количество транскодирани потоци :",
+    "LabelTranscodingProgress": "Прогрес на транскодирането:",
+    "LabelTranscodingFramerate": "Честота на кадрите при транскодиране:",
+    "LabelTranscodes": "Транскодирания:",
+    "LabelTranscodePath": "Път за транскодиране:",
+    "LabelTranscodingContainer": "Контейнер:",
+    "LabelTrackNumber": "Номер на песен:",
+    "LabelTextBackgroundColor": "Цвят на фона на текста:",
+    "LabelTagline": "Ключова фраза:",
+    "LabelTVHomeScreen": "Главна страница в режим ТВ:",
+    "LabelSyncPlayAccess": "Достъп до \"синхронизирано възпроизвеждане\"",
+    "LabelSyncPlayAccessNone": "Изключено за този потребител",
+    "LabelSyncPlayAccessJoinGroups": "Разрешаване на потребителя да се присъединява към групи",
+    "LabelSyncPlayAccessCreateAndJoinGroups": "Разрешаване на потребителя да създава и да се присъединява към групи",
+    "LabelSyncPlayLeaveGroupDescription": "Деактивирай \"синхронизирано възпроизвеждане\"",
+    "LabelSyncPlayLeaveGroup": "Напусни групата",
+    "LabelSyncPlayNewGroupDescription": "Създай нова група",
+    "LabelSyncPlayNewGroup": "Нова група",
+    "LabelSyncPlaySyncMethod": "Метод за синхронизиране:",
+    "LabelSyncPlayPlaybackDiff": "Разлика във времето на възпроизвеждане:",
+    "MillisecondsUnit": "мс",
+    "LabelSyncPlayTimeOffset": "Компенсиране на разликата във времето със сървъра:",
+    "LabelSubtitleFormatHelp": "Пример: srt",
+    "LabelSubtitleDownloaders": "Услуги за сваляне на субтитри:",
+    "LabelStreamType": "Вид на потока:",
+    "LabelStopping": "Спиране",
+    "LabelSportsCategories": "Спортни категории:",
+    "LabelSoundEffects": "Звукови ефекти:",
+    "LabelSortTitle": "Подреди по заглавие:",
+    "LabelSonyAggregationFlags": "\"Флагове\" за статистическа обработка на Сони:",
+    "LabelSkipIfGraphicalSubsPresentHelp": "Наличието на текстови версии на субтитрите ще доведе до по-ефективна доставка и намаляване на вероятността от транскодиране на видеото.",
+    "LabelSkipIfAudioTrackPresentHelp": "Махнете отметката ,за да се гарантира ,че всички видеофайлове имат субтитри,независимо от езика на аудиото им.",
+    "LabelSkin": "Облик:",
+    "LabelSize": "Размер:",
+    "LabelSimultaneousConnectionLimit": "Ограничение на броя едновременни потоци:",
+    "LabelServerName": "Име на сървъра:",
+    "LabelServerHostHelp": "192.168.1.100:8096 или https://myserver.com",
+    "LabelServerHost": "Хост:",
+    "LabelSendNotificationToUsers": "Изпрати уведомление до:",
+    "LabelSelectFolderGroupsHelp": "Папките ,които не са отметнати ще се показват самостоятелно с техен изглед.",
+    "LabelSelectFolderGroups": "Автоматично групира съдържанието от следните папки в режим \"изглед\" като Филми, Музика и ТВ:",
+    "MessageConfirmRemoveMediaLocation": "Сигурни ли сте ,че искате да премахнете мястото?",
+    "MessageConfirmRecordingCancellation": "Отмяна на записа?",
+    "MessageConfirmProfileDeletion": "Сигурни ли сте ,че искате да изтриете този профил?",
+    "MessageConfirmDeleteTunerDevice": "Сигурни ли сте ,че искате да изтриете това устройство?",
+    "MessageConfirmDeleteGuideProvider": "Сигурни ли се ,че искате да изтриете доставчика на справочника?",
+    "MessageConfirmAppExit": "Искате ли да излезете?",
+    "MessageAreYouSureDeleteSubtitles": "Сигурни ли се ,че искате да изтриете файла със субтитри?",
+    "MediaIsBeingConverted": "Медията е конвертирана във формат ,който е съвместим с устройството ,което ще я възпроизведе.",
+    "MediaInfoSoftware": "Софтуер",
+    "MediaInfoTimestamp": "Времеви отпечатък",
+    "MediaInfoSampleRate": "Кадрова честота",
+    "MediaInfoRefFrames": "Ref кадри",
+    "MediaInfoPixelFormat": "Пикселен формат",
+    "MediaInfoCodecTag": "Етикет на кодека",
+    "MediaInfoBitDepth": "Дълбочина на цвета",
+    "MediaInfoAnamorphic": "Анаморфно",
+    "MapChannels": "Разпредели канали",
+    "ManageRecording": "Управление на записа",
+    "ManageLibrary": "Управление на библиотеката",
+    "LiveBroadcasts": "Предавания на живо",
+    "LeaveBlankToNotSetAPassword": "Можете да оставите това поле празно и да не задавате парола.",
+    "LearnHowYouCanContribute": "Научете как можете да допринесете.",
+    "LaunchWebAppOnStartupHelp": "Отвори уеб клиента във браузъра по подразбиране при първото стартиране на сървъра.Това няма да се случи при използване на функцията на сървъра за рестартиране.",
+    "LaunchWebAppOnStartup": "Стартирай уеб интерфейса ,когато се стартира сървъра",
+    "LanNetworksHelp": "Списък разделен със запетая съдържащ ИП адреси или записи за ИП/мрежова маски отнасящи се за мрежи ,които ще се считат за локални ,когато се налагат ограничения в честотната лента.Ако е зададено всички други ИП адреси ще се считат за принадлежащи към външни мрежи и за тях ще важат правилата за ограничения на външни ИП -та.Ако полето е празно ще се счита ,че само подмрежата на сървъра е част от локалната мрежа.",
+    "LabelffmpegPathHelp": "Пътят към файла на приложението ffmpeg или папката, съдържаща ffmpeg.",
+    "LabelffmpegPath": "Път към FFmpeg:",
+    "LabelZipCode": "Пощенски код:",
+    "LabelXDlnaDoc": "Схема X-DLNA:",
+    "LabelXDlnaCapHelp": "Определя съдържанието на елемента X_DLNACAP във urn:schemas-dlna-org:device-1-0 в пространството от имена.",
+    "LabelXDlnaCap": "Свойства на X-Dlna:",
+    "LabelWeb": "Уеб:",
+    "LabelVideoResolution": "Видео резолюция:",
+    "LabelVideoCodec": "Видео кодек:",
+    "LabelVideoBitrate": "Видео битрейт:",
+    "DashboardArchitecture": "Архитектура: {0}",
+    "DashboardOperatingSystem": "Операционна система: {0}",
+    "DashboardServerName": "Сървър: {0}",
+    "DashboardVersionNumber": "Версия: {0}",
+    "LabelVersionInstalled": "{0} Инсталирано",
+    "LabelValue": "Стойност:",
+    "LabelVaapiDeviceHelp": "Това е възелът на визуализация, който се използва при хардуерно ускорение.",
+    "LabelVaapiDevice": "Устройство VA-API:",
+    "LabelUserRemoteClientBitrateLimitHelp": "Замени глобалната стойност по подразбиране, зададена в настройките за възпроизвеждане на сървъра.",
+    "LabelUserLoginAttemptsBeforeLockout": "Неуспешни опити за влизане, преди потребителският акаунт да бъде заключен:",
+    "LabelUserLibraryHelp": "Изберете коя библиотека да се показва на устройството.Оставете полето празно ,за да работят настройките по подразбиране.",
+    "LabelUserAgent": "Потребителски агент:",
+    "LabelUseNotificationServices": "Използвайте следните услуги:",
+    "LabelTypeMetadataDownloaders": "{0} услуги за сваляне на метаданни:",
+    "LabelTunerType": "Тип на тунера:",
+    "LabelTunerIpAddress": "ИП адрес на тунера:",
+    "LabelTranscodingThreadCountHelp": "Изберете максималния брой процесорни нишки ,които ще се използват при транскодиране.Намаляването на броя на нишките ще намали използването на процесора, но може да не преобразува достатъчно бързо за да осигури гладко възпроизвеждане.",
+    "MessageForgotPasswordFileCreated": "Следния файл беше създаден на вашия сървър и съдържа инструкции как да постъпите:",
+    "MessageFileReadError": "Възникна грешка при четенето на файла.Моля опитайте отново.",
+    "MessageEnablingOptionLongerScans": "Включването на тази опция значително ще удължи сканирането на библиотеките.",
+    "MessageDownloadQueued": "Свалянето е на опашката.",
+    "MessageDirectoryPickerLinuxInstruction": "За потребителите на следните Линукс дистрибуции: Arch Linux, CentOS, Debian, Fedora, openSUSE, или Ubuntu е необходимо да се предостави на сервизния потребител поне достъп с права за четене на вашите хранилища.",
+    "MessageDirectoryPickerBSDInstruction": "За BSD ще е нужно да настроите хранилище във вашия FreeNAS Jail ,за да може сървъра да има достъп до него.",
+    "MessageDeleteTaskTrigger": "Сигурни ли сте ,че искате да изтриете \"пусковият механизъм\" за задачи?",
+    "MessageCreateAccountAt": "Създай акаунт в {0}",
+    "MessageContactAdminToResetPassword": "Моля, свържете се със системния си администратор, за да нулирате паролата си.",
+    "MessageConfirmRevokeApiKey": "Сигурни ли сте ,че искате да оттеглите api ключа?Връзката на приложението със сървъра ще бъде прекратена незабавно.",
+    "MessageSyncPlayGroupDoesNotExist": "Неуспешно присъединяване към групата, защото не съществува.",
+    "MessageSyncPlayPlaybackPermissionRequired": "Необходимо е разрешение за възпроизвеждане.",
+    "MessageSyncPlayNoGroupsAvailable": "Няма налични групи.Пуснете нещо да се възпроизвежда.",
+    "MessageSyncPlayGroupWait": "<b>{0}</b> буферира се...",
+    "MessageSyncPlayUserLeft": "<b>{0}</b> е напуснал групата.",
+    "MessageSyncPlayUserJoined": "<b>{0}</b> се присъедини към групата.",
+    "MessageSyncPlayDisabled": "Услугата \"синхронизирано възпроизвеждане\" е изключена.",
+    "MessageSyncPlayEnabled": "Услугата \"синхронизирано възпроизвеждане\" е включена.",
+    "MessageUnsetContentHelp": "Съдържанието ще се показва като обикновени папки. За най-добри резултати използвайте мениджъра на метаданни, за да зададете типовете съдържание на подпапките.",
+    "MessageUnableToConnectToServer": "В момента не можем да се свържем с избрания сървър. Моля, уверете се, че работи и опитайте отново.",
+    "MessageReenableUser": "Вижте по-долу, за да активирате отново",
+    "MessagePluginInstallDisclaimer": "Приставките, създадени от членове на общността, са чудесен начин да подобрите изживяването с Джелифин чрез допълнителните функции и предимства.Преди да инсталирате, имайте предвид ефектите, които те могат да имат върху вашия Джелифин сървър, като по-дълго време за сканиране на библиотеки, допълнителна обработка на заден фон и намалена стабилност на системата.",
+    "MessagePluginConfigurationRequiresLocalAccess": "За да конфигурирате тази приставка, моля, впишете се директно в локалния си сървър.",
+    "MessagePleaseWait": "Моля,изчакайте. Това може да отнеме минута.",
+    "MessagePlayAccessRestricted": "Възпроизвеждането на това съдържание в момента е ограничено.Моля, свържете се с администратора на вашия сървър за повече информация.",
+    "MessagePasswordResetForUsers": "Следните потребители са занулили паролите си.Те вече могат да влязат с пин кодовете, използвани за извършване на нулирането.",
+    "MessageNoTrailersFound": "За да подобрите филмовото изживяване инсталирайте канал за трейлъри,може да подредите няколко канала в библиотека.",
+    "MessageNoServersAvailable": "Не са намерени сървъри, използващи функцията за автоматично откриване на сървър.",
+    "MessageNoMovieSuggestionsAvailable": "Понастоящем няма предложени филми. Започнете да гледате и оценявате филмите си, а след това се върнете, за да видите препоръките си.",
+    "MessageNoCollectionsAvailable": "Колекциите ви позволяват да се наслаждавате на персонализирани групи от филми, сериали и албуми. Кликнете върху бутона +, за да започнете да създавате колекции.",
+    "MessageLeaveEmptyToInherit": "Оставете празни, за да наследите настройки от родителски елемент или глобалната стойност по подразбиране.",
+    "MessageItemsAdded": "Добавени са елементи.",
+    "MessageItemSaved": "Елементът е запазен.",
+    "MessageUnauthorizedUser": "Понастоящем нямате право да получите достъп до сървъра. Моля, свържете се с администратора на вашия сървър за повече информация.",
+    "MessageInvalidUser": "Невалидно потребителско име или парола. Моля, опитайте отново.",
+    "MessageInvalidForgotPasswordPin": "Въведен е невалиден или изтекъл пин код. Моля, опитайте отново.",
+    "MessageInstallPluginFromApp": "Този плъгин трябва да бъде инсталиран от приложението, в което възнамерявате да го използвате.",
+    "MessageImageTypeNotSelected": "Изберете типът изображение от падащото меню.",
+    "MessageImageFileTypeAllowed": "Поддържат се само файлове с разширение JPEG и PNG.",
+    "MessageForgotPasswordInNetworkRequired": "Опитайте пак в домашната мрежа да повторите процеса по нулиране на паролата.",
+    "Smaller": "По-малък",
+    "SmallCaps": "Малки букви",
+    "SkipEpisodesAlreadyInMyLibraryHelp": "Епизодите ще се сравняват, като се използват номера на сезона и епизода, когато са налични.",
+    "SkipEpisodesAlreadyInMyLibrary": "Не записвай епизоди, които вече са в моята библиотека",
+    "SimultaneousConnectionLimitHelp": "Максималният брой разрешени едновременни потоци. Въвеждането на 0 означава ,че няма ограничение.",
+    "Filter": "Филтър",
+    "New": "Нов",
+    "ShowMore": "Покажи повече",
+    "ShowLess": "Покажи по-малко",
+    "ShowIndicatorsFor": "Показване на индикатори за:",
+    "SettingsWarning": "Промяната на тези стойности може да доведе до нестабилност или проблеми в свързаността. Ако срещнете някакви проблеми, препоръчваме ви да ги върнете по подразбиране.",
+    "SeriesSettings": "Настройки на сериала",
+    "SeriesRecordingScheduled": "Назначено е запис на сериал.",
+    "SeriesDisplayOrderHelp": "Подредете епизодите по дата на излъчване, излизане на DVD или абсолютна номерация.",
+    "SeriesCancelled": "Сериала е отменен.",
+    "Series": "Сериал",
+    "SelectAdminUsername": "Моля, изберете потребителско име за администраторския акаунт.",
+    "Season": "Сезон",
+    "SearchResults": "Резултати от търсенето",
+    "ScanForNewAndUpdatedFiles": "Сканирай за нови и актуализирани файлове",
+    "SaveSubtitlesIntoMediaFoldersHelp": "Съхраняването на субтитрите при видео файлове ще позволи по-лесното им управление.",
+    "SaveSubtitlesIntoMediaFolders": "Запазване на субтитрите в папките с медията",
+    "SaveChanges": "Запазете промените",
+    "RunAtStartup": "Пускай при стартиране",
+    "RestartPleaseWaitMessage": "Моля, изчакайте, докато сървъра се изключи и рестартира. Това може да отнеме минута или две.",
+    "RepeatOne": "Повтори един път",
+    "RepeatMode": "Режим на повторение",
+    "RepeatEpisodes": "Повтори епизодите",
+    "RepeatAll": "Повтори всички",
+    "ReleaseGroup": "Издаден от група",
+    "RefreshQueued": "Назначено е обновяване.",
+    "RefreshDialogHelp": "Метаданните се обновяват въз основа на настройките и интернет услугите, които са активирани от таблото за управление на сървъра.",
+    "Recordings": "Записи",
+    "RecordingScheduled": "Записът е насрочен.",
+    "RecordingPathChangeMessage": "Промяната на вашата папка за запис няма да мигрира съществуващите записи от старото местоположение към новото.Необходимо е да направите това ръчно.",
+    "RecordSeries": "Запиши сериал",
+    "RecommendationStarring": "В главните роли {0}",
+    "RecommendationDirectedBy": "Режисьор {0}",
+    "Rate": "Оценка",
+    "QueueAllFromHere": "Поред всичко от тук",
+    "ProductionLocations": "Места на заснемане",
+    "Previous": "Предишен",
+    "PreferEmbeddedEpisodeInfosOverFileNames": "Предпочитай \"вградената\" информация за епизода вместо името на файла",
+    "PreferEmbeddedEpisodeInfosOverFileNamesHelp": "Това използва информацията за епизода от вградените метаданни, ако е налична.",
+    "PreferEmbeddedTitlesOverFileNamesHelp": "Това определя заглавието по подразбиране, когато няма интернет метаданни или локални метаданни.",
+    "PluginInstalledMessage": "Добавката е успешно инсталирана. Джелифин ще трябва да бъде рестартиран, за да влязат в сила промените.",
+    "PleaseSelectTwoItems": "Моля, изберете поне два елемента.",
+    "PleaseEnterNameOrId": "Моля, въведете име или външен идентификатор.",
+    "PleaseConfirmPluginInstallation": "Моля, щракнете върху OK, за да потвърдите, че сте прочели горното и искате да продължите с инсталирането на добавката.",
+    "PleaseAddAtLeastOneFolder": "Моля, добавете поне една папка към тази библиотека, като щракнете върху бутона \"Добавяне\".",
+    "PlaybackErrorNoCompatibleStream": "Този клиент не е съвместим с медията и сървърът не изпраща съвместим формат за медията.",
+    "PlayNext": "Възпроизведи следващ",
+    "PlayFromBeginning": "Възпроизведи от началото",
+    "PlayCount": "Брой възпроизвеждания",
+    "PlaybackData": "Данни за възпроизвеждане",
+    "PlaceFavoriteChannelsAtBeginning": "Постави любимите канали в началото",
+    "PinCodeResetConfirmation": "Сигурни ли сте, че искате да нулирате пин кода?",
+    "PinCodeResetComplete": "Пин кодът е нулиран.",
+    "Person": "Личност",
+    "PerfectMatch": "Перфектно съвпадение",
+    "PasswordSaved": "Паролата е запазена.",
+    "PasswordResetProviderHelp": "Изберете доставчик за нулиране на пароли, който да се използва, когато този потребител поиска нулиране на паролата",
+    "PasswordResetConfirmation": "Сигурни ли сте, че искате да нулирате паролата?",
+    "PasswordResetComplete": "Паролата е нулирана.",
+    "PasswordMatchError": "Паролата и потвърждението на паролата трябва да съвпадат.",
+    "PackageInstallFailed": "Инсталирането на {0} версия {1}) е неуспешно.",
+    "PackageInstallCompleted": "Инсталирането на {0} версия {1}) е завършено.",
+    "PackageInstallCancelled": "Инсталирането на {0} версия {1}) е отменено.",
+    "OtherArtist": "Друг изпълнител",
+    "OptionWeekends": "Почивни дни",
+    "OptionWeekdays": "Делници",
+    "OptionTvdbRating": "Рейтинг според ТВДБ",
+    "OptionThumbCard": "Икона карта",
+    "OptionThumb": "Икона",
+    "OptionSubstring": "Подниз",
+    "OptionSaveMetadataAsHiddenHelp": "Промяната на това ще се прилага за нови метаданни, запазени занапред. Съществуващите файлове с метаданни ще бъдат актуализирани следващия път, когато бъдат запазени на сървъра.",
+    "OptionSaveMetadataAsHidden": "Запишете метаданните и изображенията като скрити файлове",
+    "OptionRequirePerfectSubtitleMatchHelp": "Изискването за перфектно съвпадение ще филтрира субтитрите, за да включва само тези, които са тествани и проверени с точния видео файл.Ако премахнете отметката, това ще увеличи броя изтеглени субтитри, но ще увеличи шансовете за изтегляне на субтитри с неправилна синхронизация или несъвпадащи с видеофайла.",
+    "OptionReportByteRangeSeekingWhenTranscodingHelp": "Това е необходимо за някои устройства, които не търсят \"по време\" правилно.",
+    "OptionReportByteRangeSeekingWhenTranscoding": "Подава информация, че сървърът поддържа търсене на байтове при прекодиране",
+    "OptionRegex": "Регуларен",
+    "OptionRandom": "Случаен",
+    "OptionProtocolHttp": "HTTP",
+    "OptionProtocolHls": "Директно предаване по HTTP",
+    "OptionPosterCard": "Плакат карта",
+    "OptionPoster": "Плакат",
+    "OptionPlainVideoItemsHelp": "Ако е активирано, всички видеофайлове са представени в DIDL като \"object.item.videoItem\" вместо по-конкретен тип, като например \"object.item.videoItem.movie\".",
+    "OptionPlainStorageFoldersHelp": "Ако е активирано, всички папки са представени в DIDL като \"object.container.storageFolder\" вместо по-конкретен тип, като например \"object.container.person.musicArtist\".",
+    "OptionMax": "Максимално",
+    "OptionLoginAttemptsBeforeLockoutHelp": "Стойност нула означава наследяване по подразбиране на три опита за нормални потребители и пет за администратори. Задаването на това на -1 ще деактивира функцията.",
+    "OptionLoginAttemptsBeforeLockout": "Определя колко неправилни опита за влизане могат да бъдат направени, преди да бъде блокиран.",
+    "OptionList": "Списък",
+    "OptionIgnoreTranscodeByteRangeRequestsHelp": "Ако са активирани, тези заявки ще бъдат удовлетворени, но ще се пренебрегне заглавната част от обхвата на байтовете.",
+    "OptionIgnoreTranscodeByteRangeRequests": "Игнорирайте заявките за обхват на байтове при прекодиране",
+    "OptionHlsSegmentedSubtitles": "HLS сегментирани субтитри",
+    "OptionExtractChapterImage": "Включи извличането на изображения от разделите",
+    "OptionEstimateContentLength": "Приблизителна дължина на съдържанието при транскодиране",
+    "OptionEquals": "Се равнява",
+    "OptionEnableM2tsModeHelp": "Включи режим m2ts ,когато се декодира до mpegts.",
+    "OptionEnableM2tsMode": "Включи режим M2ts",
+    "OptionEnableForAllTuners": "Активиране за всички тунер устройства",
+    "OptionEnableExternalContentInSuggestionsHelp": "Разрешете интернет трейлърите и телевизионните програми на живо да бъдат включени в предложеното съдържание.",
+    "OptionEnableExternalContentInSuggestions": "Активиране на външно съдържание в предложенията",
+    "OptionEmbedSubtitles": "Внедрено вътре в контейнера",
+    "OptionDownloadImagesInAdvanceHelp": "По подразбиране повечето изображения се изтеглят само когато са поискани от приложенията свързани с Джелифин.Активирайте тази опция, за да изтеглите всички изображения предварително, при добавянето на нова медия. Това може да доведе до значително по-дълго сканиране на библиотеката.",
+    "OptionDisplayFolderViewHelp": "Показвай папките заедно с тези от медийната библиотека. Това може да бъде полезно, ако искате да имате по разбираем изглед за папките.",
+    "OptionDateAddedImportTime": "Използвай датата на сканиране в библиотеката",
+    "OptionDateAddedFileTime": "Използвай датата на създаване на файла",
+    "OptionCaptionInfoExSamsung": "CaptionInfoEx (Samsung)",
+    "OptionBluray": "Блу-рей",
+    "OptionBlockTrailers": "Трейлъри",
+    "OptionBlockMusic": "Музика",
+    "OptionBlockLiveTvChannels": "Телевизионни канали на живо",
+    "OptionBlockChannelContent": "Съдържание на интернет канала",
+    "OptionBanner": "Банер",
+    "OptionAutomaticallyGroupSeriesHelp": "Ако е активирано, сезоните, които се намират в различни папки, ще бъдат автоматично обединени в един сериал.",
+    "OptionAutomaticallyGroupSeries": "Автоматично обединява сезони, които са разпределени в множество папки",
+    "OptionAllowVideoPlaybackTranscoding": "Разреши възпроизвеждане на видео, което изисква транскодиране",
+    "OptionAllowVideoPlaybackRemuxing": "Разреши възпроизвеждане на видео, което изисква преобразуване без повторно кодиране",
+    "OptionAllowSyncTranscoding": "Разреши изтегляне и синхронизиране на медия, която изисква транскодиране",
+    "OptionAllowMediaPlaybackTranscodingHelp": "Ограничаването на достъпа до транскодирането може да доведе до проблеми при възпроизвеждането в приложенията на Джелифин поради неподдържани медийни формати.",
+    "OptionAllowLinkSharingHelp": "Споделят се само уеб страници, съдържащи медийна информация.Медийните файлове никога не се споделят публично. Споделянията са ограничени във времето и изтичат след {0} дни.",
+    "OptionAllowContentDownloading": "Разрешаване на изтегляне и синхронизиране на медия",
+    "OptionForceRemoteSourceTranscoding": "Принудително транскодиране на отдалечени медийни източници (като поточна ТВ)",
+    "OptionAllowAudioPlaybackTranscoding": "Разреши възпроизвеждане на аудио, което изисква транскодиране",
+    "OnlyImageFormats": "Само графични формати (VOBSUB, PGS, SUB)",
+    "OnlyForcedSubtitlesHelp": "Ще бъдат показани само субтитри, маркирани за \"принудително\" зареждане.",
+    "OnlyForcedSubtitles": "Само принудително",
+    "OneChannel": "Един канал",
+    "NoSubtitlesHelp": "Субтитрите няма да бъдат заредени по подразбиране. Те все още могат да бъдат включени ръчно по време на възпроизвеждане.",
+    "NoPluginConfigurationMessage": "Тази добавка няма настройки за конфигуриране.",
+    "NoNewDevicesFound": "Не са намерени нови устройства. За да добавите нов тунер, затворете този диалогов прозорец и въведете ръчно информацията за устройството.",
+    "NoCreatedLibraries": "Изглежда, че все още не сте създали библиотеки. {0} Искате ли да ги създадете сега? {1}",
+    "NextUp": "Следващ по ред",
+    "Next": "Следващ",
+    "NewCollectionHelp": "Колекциите ви позволяват да създавате персонализирани групи от филми и друго библиотечно съдържание.",
+    "MusicLibraryHelp": "Прегледайте {0} ръководството за именуване на музика {1}.",
+    "MusicArtist": "Музикален изпълнител",
+    "MusicAlbum": "Музикален албум",
+    "Movie": "Филм",
+    "MovieLibraryHelp": "Прегледайте {0} ръководството за именуване на филми {1}.",
+    "MoveRight": "Премести надясно",
+    "MoveLeft": "Премести на ляво",
+    "MoreMediaInfo": "Информация за медията",
+    "MetadataSettingChangeHelp": "Промяната на настройките на метаданните ще повлияе на новото съдържание, което ще се добавя занапред.За да обновите съществуващото съдържание, отворете панела с подробности и щракнете върху бутона за опресняване или извършете групово обновяване с помощта на мениджъра на метаданни.",
+    "MessageSyncPlayErrorMedia": "Неуспешно активиране на услугата \"синхронизирано възпроизвеждане\"!Грешка в медията.",
+    "MessageSyncPlayErrorMissingSession": "Неуспешно активиране на услугата \"синхронизирано възпроизвеждане\"! Липсва сесия.",
+    "MessageSyncPlayErrorNoActivePlayer": "Не е намерен активен плеър.Функцията \"синхронизирано възпроизвеждане\" е изключена.",
+    "MessageSyncPlayErrorAccessingGroups": "Възникна грешка при достъп до списъка с групи.",
+    "MessageSyncPlayLibraryAccessDenied": "Достъпът до това съдържание е ограничен.",
+    "MessageSyncPlayJoinGroupDenied": "Необходимо е разрешени за използване на функцията \"синхронизирано възпроизвеждане\".",
+    "MessageSyncPlayCreateGroupDenied": "Необходимо е разрешени за създаване на група.",
+    "LabelSonyAggregationFlagsHelp": "Определя съдържанието на aggregationFlags елемента във urn:schemas-sonycom:av пространство от имена.",
+    "LabelXDlnaDocHelp": "Определя съдържанието на X_DLNADOC елемента в urn:schemas-dlna-org:device-1-0 пространство от имена.",
+    "LabelSkipForwardLength": "Време за придвижване напред:",
+    "LabelSkipBackLength": "Време за придвижване назад:",
+    "LabelRepositoryUrlHelp": "Местоположението на манифеста на хранилището, което искате да включите.",
+    "MessageNoGenresAvailable": "Доставчиците на метаданни ще могат да изтеглят жанрове от интернет.",
+    "MessageAddRepository": "Ако искате да добавите хранилище, щракнете върху бутона до заглавната част и попълнете исканата информация.",
+    "LabelRepositoryNameHelp": "Персонализирано име за разграничаване на това хранилище от всички останали добавени към вашия сървър.",
+    "LabelRepositoryName": "Име на хранилището",
+    "LabelRepositoryUrl": "Адрес на хранилището",
+    "HeaderNewRepository": "Ново хранилище",
+    "MessageNoRepositories": "Няма хранилища.",
+    "EnableFasterAnimationsHelp": "Използвайте по-бързи анимации и преходи",
+    "EnableFasterAnimations": "Бързи анимации",
+    "EnableDecodingColorDepth10Vp9": "Включи 10 битово хардуерно декодиране за VP9",
+    "EnableDecodingColorDepth10Hevc": "Включи 10 битово хардуерно декодиране за HEVC",
+    "ButtonCast": "Стриймване",
+    "ButtonSyncPlay": "SyncPlay",
+    "TabRepositories": "Хранилища"
 }
diff --git a/src/strings/ca.json b/src/strings/ca.json
index df1cdf28f6..680be3ef77 100644
--- a/src/strings/ca.json
+++ b/src/strings/ca.json
@@ -818,5 +818,6 @@
     "AllowFfmpegThrottling": "Transcodes de l’acceleració",
     "AllowOnTheFlySubtitleExtractionHelp": "Els subtítols incrustats es poden extreure de vídeos i entregar-los a clients en text senzill per tal d'evitar la transcodificació de vídeo. En alguns sistemes, això pot trigar molt i fer que la reproducció de vídeo s’aturi durant el procés d’extracció. Desactiveu-ho per tenir subtítols incrustats incrustats amb la transcodificació de vídeo quan no són compatibles amb el dispositiu client de forma nativa.",
     "AlbumArtist": "Album artista",
-    "Album": "Album"
+    "Album": "Album",
+    "ButtonSyncPlay": "SyncPlay"
 }
diff --git a/src/strings/cs.json b/src/strings/cs.json
index 8b631caf5a..5299165415 100644
--- a/src/strings/cs.json
+++ b/src/strings/cs.json
@@ -812,7 +812,7 @@
     "MessageNoAvailablePlugins": "Nejsou dostupné žádné zásuvné moduly.",
     "MessageNoMovieSuggestionsAvailable": "Žádné návrhy nejsou v současnosti k dispozici. Začněte sledovat a hodnotit filmy, a pak se vám doporučení zobrazí.",
     "MessageNoPluginsInstalled": "Nemáte instalovány žádné zásuvné moduly.",
-    "MessageNoTrailersFound": "Nebyly nalezeny žádné upoutávky k filmu. Chcete-li si zlepšit zážitek ze sledování, nainstalujte si kanál s upoutávkami.",
+    "MessageNoTrailersFound": "Chcete-li si zlepšit zážitek ze sledování, nainstalujte si kanál s upoutávkami.",
     "MessageNothingHere": "Tady nic není.",
     "MessagePasswordResetForUsers": "Obnovení hesla bylo provedeno následujícími uživateli.  Nyní se mohou přihlásit pomocí kódů PIN, které byly použity k provedení resetu.",
     "MessagePlayAccessRestricted": "Přehrávání tohoto obsahu je aktuálně omezeno. Další informace získáte od správce serveru.",
@@ -1059,7 +1059,6 @@
     "RepeatOne": "Opakovat jeden",
     "ReplaceAllMetadata": "Přepsat všechna metadata",
     "ReplaceExistingImages": "Nahradit existující obrázky",
-    "RestartPleaseWaitMessage": "Počkejte prosím, než se server Jellyfin vypne a restartuje. Může to trvat několik minut.",
     "ResumeAt": "Obnovit přehrávání od {0}",
     "Rewind": "Přetočit zpět",
     "RunAtStartup": "Spustit po startu",
@@ -1201,7 +1200,7 @@
     "Wednesday": "Středa",
     "WelcomeToProject": "Vítejte v Jellyfin!",
     "WizardCompleted": "To je zatím vše, co potřebujeme. Server Jellyfin začal shromažďovat informace o vaší knihovně médií. Vyzkoušejte některé z našich aplikací a potom klikněte na tlačítko <b> Dokončit </b> pro zobrazení <b>nástěnky</b>.",
-    "Writer": "Napsal",
+    "Writer": "Scénárista",
     "XmlDocumentAttributeListHelp": "Tyto atributy jsou použity na kořenový prvek každé XML odpovědi.",
     "XmlTvKidsCategoriesHelp": "Programy s těmito kategoriemi budou zobrazeny jako programy pro děti. Více kategorií oddělte \"|\".",
     "XmlTvMovieCategoriesHelp": "Programy s těmito kategoriemi budou zobrazeny jako filmy. Více kategorií oddělte \"|\".",
@@ -1232,7 +1231,7 @@
     "AutoBasedOnLanguageSetting": "Automaticky (na základě jazykového nastavení)",
     "Banner": "Výřez plakátu",
     "BestFit": "Nejvhodnější",
-    "Blacklist": "Černá listina",
+    "Blacklist": "Zakázat vše kromě výjimek",
     "BobAndWeaveWithHelp": "Bob and weave (vyšší kvalita, ale pomalejší)",
     "Browse": "Procházet",
     "BurnSubtitlesHelp": "Určuje, zda má server při překódování videa vypálit titulky do obrazu. Tato funkce má velký negativní vliv na výkon. Chcete-li vypálit grafické formáty titulků (VOBSUB, PGS, SUB, IDX, atd.) a některé titulky ASS nebo SSA, vyberte možnost Automaticky.",
@@ -1395,7 +1394,6 @@
     "HeaderFavoriteAlbums": "Oblíbená alba",
     "HeaderFavoriteArtists": "Oblíbení interpreti",
     "HeaderFavoriteSongs": "Oblíbená hudba",
-    "HeaderRestartingServer": "Restartování serveru",
     "LabelAuthProvider": "Poskytovatel ověření:",
     "LabelServerNameHelp": "Tento název bude použit k identifikaci serveru a bude výchozí pro název počítače serveru.",
     "LabelPasswordResetProvider": "Poskytovatel obnovy hesla:",
@@ -1490,7 +1488,7 @@
     "Vertical": "Svisle",
     "VideoRange": "Rozsah videa",
     "ViewPlaybackInfo": "Zobrazení informací o přehrávání",
-    "Whitelist": "Bílá listina",
+    "Whitelist": "Povolit vše kromě výjimek",
     "HeaderHome": "Domů",
     "DashboardOperatingSystem": "Operační systém: {0}",
     "DashboardArchitecture": "Architektura: {0}",
@@ -1540,8 +1538,6 @@
     "CopyStreamURLError": "Při kopírování URL došlo k chybě.",
     "LabelVideoResolution": "Rozlišení videa:",
     "LabelStreamType": "Typ streamu:",
-    "EnableFastImageFadeInHelp": "Zobrazí plakáty a další obrázky s rychlejší animací přechodu po dokončení načítání.",
-    "EnableFastImageFadeIn": "Rychlé animace přechodů obrazu",
     "LabelPlayerDimensions": "Zobrazené rozlišení:",
     "LabelDroppedFrames": "Vynechané snímky:",
     "LabelCorruptedFrames": "Poškozené snímky:",
@@ -1603,7 +1599,7 @@
     "HeaderDVR": "Nahrávání",
     "SaveChanges": "Uložit změny",
     "LabelSyncPlayPlaybackDiff": "Rozdíl v době přehrávání:",
-    "SyncPlayAccessHelp": "Určuje úroveň přístupu k synchronizaci přehrávání, kterou tento uživatel bude mít. Tato funkce umožňuje synchronizovat přehrávání s dalšími uživateli.",
+    "SyncPlayAccessHelp": "Určuje úroveň přístupu k synchronizaci přehrávání, kterou tento uživatel bude mít. Tato funkce umožňuje synchronizovat přehrávání s dalšími zařízeními.",
     "MessageSyncPlayErrorMedia": "Zapnutí synchronizace přehrávání se nezdařilo. Chyba média.",
     "MessageSyncPlayErrorMissingSession": "Zapnutí synchronizace přehrávání se nezdařilo. Nebyla nalezena relace.",
     "MessageSyncPlayErrorNoActivePlayer": "Nebyl nalezen žádný aktivní přehrávač. Synchronizace přehrávání byla vypnuta.",
@@ -1633,5 +1629,29 @@
     "HeaderSyncPlayEnabled": "Synchronizace přehrávání povolena",
     "HeaderSyncPlaySelectGroup": "Připojit ke skupině",
     "EnableDetailsBannerHelp": "Zobrazí obrázek ve vrchní části detailu položky.",
-    "EnableDetailsBanner": "Obrázek detailu"
+    "EnableDetailsBanner": "Obrázek detailu",
+    "ShowMore": "Zobrazit více",
+    "ShowLess": "Zobrazit méně",
+    "EnableBlurhashHelp": "Nenačtené obrázky budou zobrazeny pomocí neurčitých zástupných obrázků",
+    "EnableBlurhash": "Povolit zástupné obrázky",
+    "ButtonCast": "Přehrát v zařízení",
+    "ButtonSyncPlay": "SyncPlay",
+    "MessageNoGenresAvailable": "Povolit některým poskytovatelům metadat stahovat informace o žánrech z Internetu.",
+    "EnableFasterAnimationsHelp": "Použít rychlejší animace a přechody",
+    "EnableFasterAnimations": "Rychlejší animace",
+    "EnableDecodingColorDepth10Vp9": "Povolit 10bitové hardwarové dekódování formátu VP9",
+    "EnableDecodingColorDepth10Hevc": "Povolit 10bitové hardwarové dekódování formátu HEVC",
+    "TabRepositories": "Repozitáře",
+    "MessageAddRepository": "Pokud chcete přidat repozitář, klikněte na tlačítko vedle záhlaví a vyplňte požadované informace.",
+    "LabelRepositoryNameHelp": "Vlastní pojmenování, které slouží k odlišení tohoto repozitáře od ostatních repozitářů přidaných na vašem serveru.",
+    "LabelRepositoryName": "Název repozitáře",
+    "LabelRepositoryUrlHelp": "Umístění manifestu repozitáře, který chcete zahrnout.",
+    "LabelRepositoryUrl": "URL adresa repozitáře",
+    "HeaderNewRepository": "Nový repozitář",
+    "MessageNoRepositories": "Neexistují žádné repozitáře.",
+    "ButtonPlayer": "Přehrávač",
+    "Writers": "Scénáristé",
+    "ClearQueue": "Vymazat frontu",
+    "StopPlayback": "Zastavit přehrávání",
+    "ViewAlbumArtist": "Zobrazit interpreta alba"
 }
diff --git a/src/strings/da.json b/src/strings/da.json
index 45c0ddb336..5e29e1574c 100644
--- a/src/strings/da.json
+++ b/src/strings/da.json
@@ -1414,7 +1414,6 @@
     "RepeatAll": "Gentag alle",
     "RepeatMode": "Gentagelses tilstand",
     "RepeatOne": "Gentag én",
-    "RestartPleaseWaitMessage": "Vent venligst mens Jellyfin Server lukker og genstarter. Dette kan tage et minut eller to.",
     "RunAtStartup": "Kør ved opstart",
     "ScanForNewAndUpdatedFiles": "Skan for nye og opdaterede filer",
     "Schedule": "Tidsplan",
@@ -1500,7 +1499,6 @@
     "HeaderHome": "Hjem",
     "LabelServerName": "Server navn:",
     "LabelUserLoginAttemptsBeforeLockout": "Fejlede loginforsøg før bruger lukkes ude:",
-    "HeaderRestartingServer": "Genstarter Server",
     "ButtonAddImage": "Tilføj billede",
     "AllowFfmpegThrottlingHelp": "Når en omkodning eller remux kommer langt nok foran den nuværende afspildings position, pauses processen så der bruges færre resurser. Dette er mest brugbart når man ikke springer i filmen. Slå dette fra hvis du har problemer med playback.",
     "AllowFfmpegThrottling": "Begræns Omkodning",
@@ -1569,8 +1567,6 @@
     "LabelStreamType": "Stream type:",
     "LabelSonyAggregationFlags": "Sony aggregering flag:",
     "LabelSize": "Størrelse:",
-    "EnableFastImageFadeInHelp": "Aktivér hurtigere fade-in-animation til indlæste billeder",
-    "EnableFastImageFadeIn": "Hurtigt billede indtoning",
     "LabelPleaseRestart": "Ændringer vil træde i kraft efter web klienten er blevet genindlæst manuelt.",
     "LabelPlayMethod": "Afspilnings metode:",
     "LabelPlayerDimensions": "Afspillerdimensioner:",
@@ -1612,5 +1608,6 @@
     "Filter": "Filtrer",
     "New": "Nye",
     "ButtonTogglePlaylist": "Spilleliste",
-    "ButtonToggleContextMenu": "Mere"
+    "ButtonToggleContextMenu": "Mere",
+    "ButtonSyncPlay": "SyncPlay"
 }
diff --git a/src/strings/de.json b/src/strings/de.json
index 4e9934e9cc..eda47a1c0d 100644
--- a/src/strings/de.json
+++ b/src/strings/de.json
@@ -10,7 +10,7 @@
     "AddToPlaylist": "Zur Wiedergabeliste hinzufügen",
     "AddUser": "Benutzer anlegen",
     "AddedOnValue": "{0} hinzugefügt",
-    "AdditionalNotificationServices": "Durchsuche den Pluginkatalog, um weitere Benachrichtigungsdienste zu installieren.",
+    "AdditionalNotificationServices": "Durchsuchen sie den Pluginkatalog um weitere Benachrichtigungsdienste zu installieren.",
     "AirDate": "Erstausstrahlung",
     "Aired": "Ausgestrahlt",
     "Albums": "Alben",
@@ -145,7 +145,7 @@
     "ConfirmDeletion": "Bestätige Löschung",
     "ConfirmEndPlayerSession": "Möchtest du Jellyfin auf {0} beenden?",
     "Connect": "Verbinde",
-    "ContinueWatching": "Weiterschauen",
+    "ContinueWatching": "Fortsetzen",
     "Continuing": "Fortlaufend",
     "CriticRating": "Kritiker Bewertung",
     "CustomDlnaProfilesHelp": "Erstelle ein benutzerdefiniertes Profil für ein neues Zielgerät, oder um ein vorhandenes Systemprofil zu überschreiben.",
@@ -446,7 +446,7 @@
     "HeaderTunerDevices": "Tuner",
     "HeaderTuners": "Tuner",
     "HeaderTypeText": "Texteingabe",
-    "HeaderUpcomingOnTV": "Bald im TV",
+    "HeaderUpcomingOnTV": "Demnächst im Fernsehen",
     "HeaderUploadImage": "Bild hochladen",
     "HeaderUser": "Benutzer",
     "HeaderUsers": "Benutzer",
@@ -461,7 +461,7 @@
     "Help": "Hilfe",
     "Hide": "Verstecke",
     "HideWatchedContentFromLatestMedia": "Verberge gesehene Inhalte von neuesten Medien",
-    "HttpsRequiresCert": "Um sichere Verbindungen zu ermöglichen, musst du ein vertrauenswürdiges SSL-Zertifikat, wie beispielsweise eines von Let's Encrypt, bereitstellen. Stelle bitte entweder ein Zertifikat zur Verfügung oder deaktiviere sichere Verbindungen.",
+    "HttpsRequiresCert": "Um https für externe Verbindungen zu erzwingen, benötigst du ein vertrauenswürdiges SSL-Zertifikat, z.B. von Let's Encrypt. Bitte stelle entweder ein Zertifikat bereit, oder deaktiviere sichere Verbindungen.",
     "Identify": "Identifizieren",
     "Images": "Bilder",
     "ImportFavoriteChannelsHelp": "Wenn aktiviert, werden nur auf dem Tuner favorisierte Kanäle importiert.",
@@ -509,7 +509,7 @@
     "LabelBlockContentWithTags": "Blockiere Inhalte mit Tags:",
     "LabelBurnSubtitles": "Untertitel einbrennen:",
     "LabelCachePath": "Cache Pfad:",
-    "LabelCachePathHelp": "Legen Sie ein eigenes Verzeichnis für den Server Zwischenspeicher fest (z.B. für Bilder). Lassen Sie dieses Feld leer um die Standardeinstellung zu verwenden.",
+    "LabelCachePathHelp": "Gib einen benutzerdefinierten Speicherort für Server-Cache-Dateien wie beispielsweise Bilder an. Lasse das Feld leer, um den Server-Standard zu verwenden.",
     "LabelCancelled": "Abgebrochen",
     "LabelCertificatePassword": "Zertifikat Passwort:",
     "LabelCertificatePasswordHelp": "Wenn Dein Zertifikat ein Passwort benötigt, gib es hier ein.",
@@ -548,7 +548,7 @@
     "LabelDisplayOrder": "Anzeigereihenfolge:",
     "LabelDisplaySpecialsWithinSeasons": "Zeige Sonderinhalt innerhalb der Staffel in der er ausgestrahlt wurde",
     "LabelDownMixAudioScale": "Audio Verstärkung bei Downmixing:",
-    "LabelDownMixAudioScaleHelp": "Erhöhe die Audiolautstärke beim Heruntermischen. Setze auf 1, um die ursprüngliche Lautstärke beizubehalten.",
+    "LabelDownMixAudioScaleHelp": "Erhöhe die Audiolautstärke beim Zusammenmischen zu Stereo. Setze den Wert auf 1 um die Originallautstärke zu erhalten.",
     "LabelDownloadLanguages": "Herunterzuladende Sprachen:",
     "LabelDropImageHere": "Fotos hierher ziehen oder klicken im zu browsen.",
     "LabelDropShadow": "Schlagschatten:",
@@ -562,9 +562,9 @@
     "LabelEnableDlnaClientDiscoveryInterval": "Client-Entdeckungs Intervall (Sekunden)",
     "LabelEnableDlnaClientDiscoveryIntervalHelp": "Ermittelt die Zeit in Sekunden zwischen SSDP Suchanfragen die durch Jellyfin ausgeführt wurden.",
     "LabelEnableDlnaDebugLogging": "Aktiviere DLNA Debug Logging",
-    "LabelEnableDlnaDebugLoggingHelp": "Erstellt große Logdateien und sollte nur bei Bedarf zur Fehlersuche verwendet werden.",
+    "LabelEnableDlnaDebugLoggingHelp": "Erzeugt große Logdateien und sollte nur zur Fehlerbehebung benutzt werden.",
     "LabelEnableDlnaPlayTo": "Aktiviere DLNA Play To",
-    "LabelEnableDlnaPlayToHelp": "Geräte in deinem Netzwerk erkennen und deren Fernsteuerung ermöglichen.",
+    "LabelEnableDlnaPlayToHelp": "Jellyfin kann Geräte in Ihrem Netzwerk erkennen und bietet die Möglichkeit, diese fernzusteuern.",
     "LabelEnableDlnaServer": "DLNA-Server aktivieren",
     "LabelEnableDlnaServerHelp": "Erlaubt UPnP Geräten in Ihrem Netzwerk den Zugriff und die Wiedergabe von Inhalten.",
     "LabelEnableHardwareDecodingFor": "Aktiviere Hardware-Decoding für:",
@@ -577,14 +577,14 @@
     "LabelEvent": "Ereignis:",
     "LabelEveryXMinutes": "Alle:",
     "LabelExtractChaptersDuringLibraryScan": "Erzeuge Kapitelbilder während des Bibliothekscans",
-    "LabelExtractChaptersDuringLibraryScanHelp": "Generiert Kapitelbilder während des Imports von Videos beim Bibliothekenscan erzeugt. Anderenfalls werden die Kapitelbilder während einer eigens dafür geplanten Aufgabe erstellt, was den regelmäßig Bibliothekenscan beschleunigt.",
+    "LabelExtractChaptersDuringLibraryScanHelp": "Falls aktiviert, werden die Kapitelbilder während des Imports von Videos beim Bibliothekenscan erzeugt. Falls deaktiviert, werden die Kapitelbilder während einer eigens dafür geplanten Aufgabe erstellt, was den regelmäßig Bibliothekenscan beschleunigt.",
     "LabelFailed": "Fehlgeschlagen",
     "LabelFileOrUrl": "Datei oder URL:",
     "LabelFinish": "Fertig",
     "LabelFont": "Schriftart:",
     "LabelForgotPasswordUsernameHelp": "Bitte gib deinen Benutzernamen ein, falls du dich daran erinnerst.",
     "LabelFriendlyName": "Benutzerfreundlicher Name:",
-    "LabelServerNameHelp": "Dieser Name wird benutzt um den Server zu identifizieren, normalerweise wird der Server-/Computername verwendet.",
+    "LabelServerNameHelp": "Dieser Name wird benutzt um den Server zu identifizieren, standardmäßig wird der Server-/Computername verwendet.",
     "LabelGroupMoviesIntoCollections": "Gruppiere Filme in Collections",
     "LabelGroupMoviesIntoCollectionsHelp": "Wenn Filmlisten angezeigt werden, dann werden Filme, die zu einer Collection gehören, als ein gruppiertes Element angezeigt.",
     "LabelEncoderPreset": "H264 Encoding Voreinstellung:",
@@ -597,42 +597,42 @@
     "LabelIconMaxHeight": "Maximale Iconhöhe:",
     "LabelIconMaxHeightHelp": "Maximale Auflösung für durch UPnP übermittelte Icons:icon.",
     "LabelIconMaxWidth": "Maximale Iconbreite:",
-    "LabelIconMaxWidthHelp": "Maximale Auflösung für durch UPnP übermittelte Icons:icon.",
+    "LabelIconMaxWidthHelp": "Maximale Auflösung der Icons, die über upnp:icon angezeigt werden.",
     "LabelIdentificationFieldHelp": "Ein Teilstring oder Regex Ausdruck, der keine Groß- und Kleinschreibung berücksichtigt.",
     "LabelImageFetchersHelp": "Aktiviere und ordne deine bevorzugten Bildquellen nach Präferenzen.",
     "LabelImageType": "Bildtyp:",
     "LabelImportOnlyFavoriteChannels": "Beschränke auf favorisierte Kanäle",
     "LabelInNetworkSignInWithEasyPassword": "Schalte Login mit einfachen Passwort für das eigene Netzwerk ein",
-    "LabelInNetworkSignInWithEasyPasswordHelp": "Wenn aktiviert, können Sie sich in ihrem eigenen Netzwerk mit dem vereinfachten PIN bei Jellyfin Apps anmelden. Ihr reguläres Kennwort wird nur benötigt, wenn Sie unterwegs sind. Wenn Sie den PIN frei lassen, so benötigen Sie in Ihrem Netzwerk keinen PIN.",
+    "LabelInNetworkSignInWithEasyPasswordHelp": "Einfachen Pin verwenden, um sich bei Jellyfin Apps im lokalen Netzwerk anzumelden. Ihr reguläres Kennwort wird nur benötigt, wenn Sie unterwegs sind. Wenn Sie den PIN frei lassen, so benötigen Sie in Ihrem Netzwerk keinen PIN.",
     "LabelInternetQuality": "Internetqualität:",
     "LabelKeepUpTo": "Fortführen:",
     "LabelKidsCategories": "Kinderkategorien:",
     "LabelKodiMetadataDateFormat": "Veröffentlichungsdatum Format:",
-    "LabelKodiMetadataDateFormatHelp": "Alle Daten innerhalb von NFO-Dateien werden in diesem Format analysiert.",
-    "LabelKodiMetadataEnableExtraThumbs": "Kopiere Extrafanart in Extrathumbs",
+    "LabelKodiMetadataDateFormatHelp": "Alle Daten innerhalb von NFO-Dateien werden in diesem Format gelesen.",
+    "LabelKodiMetadataEnableExtraThumbs": "Kopiere Extra-Fanart- nach Extra-Vorschau-Feld",
     "LabelKodiMetadataEnableExtraThumbsHelp": "Beim downloaden von Bildern können diese sowohl als Extrafanart als auch als Extrathumb gespeichert werden, um maximale Kodi Kompatibilität zu erzielen.",
     "LabelKodiMetadataEnablePathSubstitution": "Aktiviere Pfadersetzung",
     "LabelKodiMetadataEnablePathSubstitutionHelp": "Aktiviert die Pfadersetzung für Bildpfade durch Benutzung der Server Pfadersetzung Einstellungen.",
     "LabelKodiMetadataSaveImagePaths": "Speicher Bildpfade innerhalb der NFO Dateien",
     "LabelKodiMetadataSaveImagePathsHelp": "Dies ist empfehlenswert wenn du Dateinamen hast, die nicht den Kodi Richtlinien entsprechen.",
-    "LabelKodiMetadataUser": "Speichere den \"Gesehen\" Status von Benutzern in NFO's für:",
-    "LabelKodiMetadataUserHelp": "Aktivieren, um den \"Gesehen\" Status in NFO-Dateien zu speichern, damit diese von anderen Anwendungen verwendet werden können.",
+    "LabelKodiMetadataUser": "Speichere den \"Gesehen\" Status von Benutzern in NFO-Dateien für:",
+    "LabelKodiMetadataUserHelp": "\"Gesehen\" Status in NFO-Dateien speichern, damit diese von anderen Anwendungen verwendet werden können.",
     "LabelLanNetworks": "Lokale Netzwerke:",
     "LabelLanguage": "Sprache:",
     "LabelLineup": "TV Programm:",
     "LabelLocalHttpServerPortNumber": "Lokale HTTP Portnummer:",
-    "LabelLocalHttpServerPortNumberHelp": "Die TCP Port Nummer, auf die der Jellyfin http Server hört.",
+    "LabelLocalHttpServerPortNumberHelp": "Die TCP-Portnummer, die der HTTP-Server von Jellyfin verwenden soll.",
     "LabelLockItemToPreventChanges": "Sperre diesen Eintrag um zukünftige Änderungen zu verhindern",
     "LabelLoginDisclaimer": "Anmeldung Haftungsausschluss:",
-    "LabelLoginDisclaimerHelp": "Dies wird am Boden des Anmeldebildschirms angezeigt.",
+    "LabelLoginDisclaimerHelp": "Diese Nachricht wird am unteren Ende des Anmeldebildschirms angezeigt.",
     "LabelManufacturer": "Hersteller:",
-    "LabelManufacturerUrl": "Hersteller URL",
+    "LabelManufacturerUrl": "Hersteller-URL",
     "LabelMatchType": "Übereinstimmungstyp:",
     "LabelMaxBackdropsPerItem": "Maximale Anzahl von Hintergründen pro Element:",
     "LabelMaxChromecastBitrate": "Max Chromcast Datenrate:",
     "LabelMaxParentalRating": "Höchste erlaubte elterlich Bewertung:",
     "LabelMaxResumePercentage": "Maximale Prozent für Wiederaufnahme:",
-    "LabelMaxResumePercentageHelp": "Titel werden als \"vollständig gesehen\" markiert, wenn sie nach dieser Zeitmarke gestoppt werden.",
+    "LabelMaxResumePercentageHelp": "Titel werden als vollständig gesehen markiert, wenn sie nach dieser Zeit gestoppt werden.",
     "LabelMaxScreenshotsPerItem": "Maximale Anzahl von Screenshots pro Element:",
     "LabelMaxStreamingBitrate": "Maximale Streaming-Qualität:",
     "LabelMaxStreamingBitrateHelp": "Wähle die maximale Bitrate während des streamens.",
@@ -645,12 +645,12 @@
     "LabelMetadataPathHelp": "Wähle ein Verzeichnis, für die heruntergeladenen Artworks und Metadaten.",
     "LabelMetadataReaders": "Metadatenleser:",
     "LabelMetadataReadersHelp": "Lege deine bevorzugte lokale Metadatenquelle fest und ordne sie nach Prioritäten. Die erste Datei die gefunden wird, wird verwendet.",
-    "LabelMetadataSavers": "Metadatenspeicherer:",
-    "LabelMetadataSaversHelp": "Wähle das Dateiformat in dem deine Metadaten gespeichert werden sollen.",
+    "LabelMetadataSavers": "Metadaten-Speicherer:",
+    "LabelMetadataSaversHelp": "Wähle das Dateiformat, in dem deine Metadaten gespeichert werden sollen.",
     "LabelMethod": "Methode:",
     "LabelMinBackdropDownloadWidth": "Minimale Breite für zu herunterladende Hintergründe:",
     "LabelMinResumeDuration": "Minimale Dauer für Wiederaufnahme:",
-    "LabelMinResumeDurationHelp": "Die Videolänge in Sekunden, ab der die Wiedergabeposition gespeichert wird und dich fortsetzen lässt.",
+    "LabelMinResumeDurationHelp": "Die kürzeste Videolänge in Sekunden, die den Wiedergabeposition speichert und dich fortsetzen lässt.",
     "LabelMinResumePercentage": "Minimale Prozent für Wiederaufnahme:",
     "LabelMinResumePercentageHelp": "Titel werden als \"Ungesehen\" eingetragen, wenn sie vor dieser Zeit gestoppt werden.",
     "LabelMinScreenshotDownloadWidth": "Minimale Breite für zu herunterladende Screenshot:",
@@ -661,7 +661,7 @@
     "LabelMonitorUsers": "Überwache Aktivität von:",
     "LabelMovieCategories": "Filmkategorien:",
     "LabelMoviePrefix": "Filmpräfix:",
-    "LabelMoviePrefixHelp": "Wenn ein Präfix in Filmtiteln angewendet wird, gib es hier ein damit Jellyfin es korrekt behandeln kann.",
+    "LabelMoviePrefixHelp": "Wenn ein Präfix in Filmtiteln angewendet wird, gib es hier ein damit der Server es korrekt behandeln kann.",
     "LabelMovieRecordingPath": "Film Aufnahmepfad (Optional):",
     "LabelMusicStreamingTranscodingBitrate": "Musik-Transkodierung Bitrate:",
     "LabelMusicStreamingTranscodingBitrateHelp": "Wähle die maximale Bitrate für das streamen von Musik.",
@@ -767,7 +767,7 @@
     "LabelTitle": "Titel:",
     "LabelTrackNumber": "Stück Nummer:",
     "LabelTranscodingAudioCodec": "Audio Codec:",
-    "LabelTranscodingTempPathHelp": "Dieses Verzeichnis beinhaltet Dateien die für den Betrieb des Transcoders benutzt werden. Wähle einen eigenen Pfad oder lasse das Feld frei, um den Standardspeicherort im Server Datenverzeichnis zu nutzen.",
+    "LabelTranscodingTempPathHelp": "Wähle einen eigenen Pfad für transkodierte Dateien. Lasse das Feld frei, um den Standardspeicherort zu nutzen.",
     "LabelTranscodingThreadCount": "Anzahl Transkodierungs-Threads:",
     "LabelTranscodingThreadCountHelp": "Legen Sie die maximale Anzahl von Transkodierungs-Threads fest. Das Reduzieren der Thread-Anzahl verringert die CPU Auslastung, wird aber möglicherweise die Transkodierung nicht schnell genug für eine störungsfrei Wiedergabe ermöglichen.",
     "LabelTranscodingVideoCodec": "Video Codec:",
@@ -801,7 +801,7 @@
     "Large": "Groß",
     "LatestFromLibrary": "Neueste {0}",
     "LearnHowYouCanContribute": "Erfahre, wie du unterstützen kannst.",
-    "LibraryAccessHelp": "Wähle die Medienverzeichnisse die du mit diesem Benutzer teilen möchtest. Administratoren können den Metadaten-Manager verwenden um alle Ordner zu bearbeiten.",
+    "LibraryAccessHelp": "Wähle die Bibliotheken aus, die du mit diesem Benutzer teilen möchtest. Administratoren können den Metadaten-Manager verwenden um alle Ordner zu bearbeiten.",
     "Like": "Mag ich",
     "List": "Liste",
     "LiveBroadcasts": "Liveübertragungen",
@@ -837,11 +837,11 @@
     "MessageConfirmDeleteGuideProvider": "Möchten Sie diese Quelle wirklich löschen?",
     "MessageConfirmDeleteTunerDevice": "Möchten Sie dieses Gerät wirklich löschen?",
     "MessageConfirmProfileDeletion": "Bist du dir sicher, dass du dieses Profil löschen möchtest?",
-    "MessageConfirmRecordingCancellation": "Aufzeichnung abbrechen?",
+    "MessageConfirmRecordingCancellation": "Aufnahme abbrechen?",
     "MessageConfirmRemoveMediaLocation": "Bist du dir sicher diese Medienquelle entfernen zu wollen?",
     "MessageConfirmRestart": "Möchten Sie Jellyfin Server wirklich neu starten?",
     "MessageConfirmRevokeApiKey": "Möchten Sie diesen API Schlüssel wirklich löschen? Die Verbindung der Anwendung zum Jellyfin Server wird sofort unterbrochen.",
-    "MessageConfirmShutdown": "Möchsten Sie Jellyfin Server wirklich beenden?",
+    "MessageConfirmShutdown": "Möchten Sie den Server wirklich herunterfahren?",
     "MessageContactAdminToResetPassword": "Bitte kontaktiere deinen Systemadministrator, um dein Passwort zurücksetzen zu lassen.",
     "MessageCreateAccountAt": "Erstellen Sie ein Konto bei {0}",
     "MessageDeleteTaskTrigger": "Bist du dir sicher, dass du diesen Aufgabenauslöser entfernen möchtest?",
@@ -862,7 +862,7 @@
     "MessageNoAvailablePlugins": "Keine verfügbaren Erweiterungen.",
     "MessageNoMovieSuggestionsAvailable": "Momentan sind keine Filmvorschläge verfügbar. Schaue und bewerte zuerst deine Filme. Komme danach zurück, um deine Filmvorschläge anzuschauen.",
     "MessageNoPluginsInstalled": "Du hast keine Plugins installiert.",
-    "MessageNoTrailersFound": "Keine Trailer gefunden. Installieren Sie den Trailer-Channel um Ihre Film-Bibliothek mit Trailer aus dem Internet zu erweitern.",
+    "MessageNoTrailersFound": "Installiere den Filmvorschau-Kanal um die Film-Bibliothek mit Filmvorschauen aus dem Internet zu erweitern.",
     "MessageNothingHere": "Nichts hier.",
     "MessagePasswordResetForUsers": "Die Passwörter der folgenden Benutzer wurden zurückgesetzt. Diese können sich nun mit den PIN-Codes anmelden, mit denen der Reset durchgeführt wurde.",
     "MessagePlayAccessRestricted": "Das Abspielen dieses Inhaltes ist derzeit eingeschränkt. Bitte kontaktiere deinen Server-Administrator für weitere Informationen.",
@@ -887,7 +887,7 @@
     "MoreUsersCanBeAddedLater": "Weitere Benutzer können später über das Dashboard hinzugefügt werden.",
     "MoveLeft": "Nach links bewegen",
     "MoveRight": "Nach rechts bewegen",
-    "MovieLibraryHelp": "Überprüfe den {0}Filmbenennungsguide{1}.",
+    "MovieLibraryHelp": "Überprüfe den {0}Filmbenennungsleitfaden{1}.",
     "Movies": "Filme",
     "Mute": "Stumm",
     "MySubtitles": "Meine Untertitel",
@@ -1085,7 +1085,7 @@
     "RecommendationStarring": "In der Hauptrolle {0}",
     "Record": "Aufnehmen",
     "RecordSeries": "Serie aufnehmen",
-    "RecordingCancelled": "Aufzeichnung abgebrochen.",
+    "RecordingCancelled": "Aufnahme abgebrochen.",
     "RecordingPathChangeMessage": "Das Ändern des Aufnahmeverzeichnisses wird alte Aufnahmen nicht automatisch verschieben. Wenn Du das möchtest, musst Du das selber machen.",
     "RecordingScheduled": "Aufnahme geplant.",
     "Recordings": "Aufnahmen",
@@ -1105,7 +1105,6 @@
     "ReplaceAllMetadata": "Ersetze alle Metadaten",
     "ReplaceExistingImages": "Ersetze vorhandene Bilder",
     "RequiredForAllRemoteConnections": "Benötigt für alle Remote Verbindungen",
-    "RestartPleaseWaitMessage": "Warte bitte bis der Jellyfin Server heruntergefahren und neu gestartet wurde. Dieser Vorgang dauert 1 bis 2 Minuten.",
     "ResumeAt": "Fortsetzen bei  {0}",
     "Rewind": "Zurückspulen",
     "RunAtStartup": "Nach Hochfahren automatisch starten",
@@ -1123,7 +1122,7 @@
     "SearchForMissingMetadata": "Suche nach fehlenden Metadaten",
     "SearchForSubtitles": "Suche nach Untertiteln",
     "SearchResults": "Suchergebnisse",
-    "SendMessage": "Sende Nachricht",
+    "SendMessage": "Nachricht senden",
     "Series": "Serien",
     "SeriesCancelled": "Serie abgebrochen.",
     "SeriesDisplayOrderHelp": "Sortiere Episoden nach Ausstrahlungsdatum, DVD Reihenfolge oder absoluter Nummerierung.",
@@ -1223,7 +1222,7 @@
     "TrackCount": "{0} Titel",
     "Trailers": "Trailer",
     "Tuesday": "Dienstag",
-    "TvLibraryHelp": "Überprüfe den {0}Serienbenennungsguide{1}.",
+    "TvLibraryHelp": "Überprüfe den {0}Serienbenennungsleitfaden{1}.",
     "Uniform": "Einheitlich",
     "UninstallPluginConfirmation": "Möchtest du {0} wirklich deinstallieren?",
     "UninstallPluginHeader": "Plugin deinstallieren",
@@ -1233,7 +1232,7 @@
     "Up": "Hoch",
     "Upload": "Hochladen",
     "UserAgentHelp": "Stelle einen benutzerdefinierten User-Agent HTTP header zur Verfügung.",
-    "UserProfilesIntro": "Jellyfin bietet die Unterstützung von Benutzerprofilen, mit eigenen Ansichten, Altersfreigaben und Spielstände von Medien.",
+    "UserProfilesIntro": "Jellyfin bietet Unterstützung für Benutzerprofile mit eigenen Ansichtseinstellungen, Wiedergabepositionen und Altersfreigaben.",
     "ValueAlbumCount": "{0} Alben",
     "ValueConditions": "Bedingungen: {0}",
     "ValueEpisodeCount": "{0} Episoden",
@@ -1322,7 +1321,7 @@
     "LabelVersion": "Version:",
     "LabelVersionNumber": "Version {0}",
     "LabelVideo": "Video",
-    "LeaveBlankToNotSetAPassword": "Du kannst dieses Feld frei lassen um kein Passwort zu setzen.",
+    "LeaveBlankToNotSetAPassword": "Dieses Feld frei lassen, um kein Passwort zu setzen.",
     "LinksValue": "Links: {0}",
     "MessageImageFileTypeAllowed": "Nur JPEG- und PNG-Dateien werden unterstützt.",
     "MessageImageTypeNotSelected": "Bitte wähle einen Bildtyp aus dem Drop-Down Menü aus.",
@@ -1397,7 +1396,7 @@
     "Thumb": "Miniaturansicht",
     "TitleSupport": "Hilfe",
     "Whitelist": "Erlaubt",
-    "AuthProviderHelp": "Wähle einen Authentifizierungsanbieter aus, der zur Authentifizierung des Passworts dieses Benutzers verwendet werden soll.",
+    "AuthProviderHelp": "Wähle einen Authentifizierungsanbieter, der zur Authentifizierung des Passworts dieses Benutzes verwendet werden soll.",
     "Features": "Funktionen",
     "HeaderFavoriteBooks": "Lieblingsbücher",
     "HeaderFavoriteMovies": "Lieblingsfilme",
@@ -1407,7 +1406,6 @@
     "HeaderFavoriteArtists": "Lieblings-Interpreten",
     "HeaderFavoriteSongs": "Lieblingslieder",
     "HeaderFavoriteVideos": "Lieblingsvideos",
-    "HeaderRestartingServer": "Server startet neu",
     "LabelAuthProvider": "Authentifizierungsanbieter:",
     "LabelServerName": "Servername:",
     "LabelTranscodePath": "Transkodierungspfad:",
@@ -1435,7 +1433,7 @@
     "LabelAudioBitrate": "Tonbitrate:",
     "ButtonAddImage": "Bild hinzufügen",
     "LabelSize": "Größe:",
-    "LabelTranscodes": "Transkoder:",
+    "LabelTranscodes": "Transcodiert:",
     "LabelTranscodingProgress": "Transcodierungsfortschritt:",
     "LabelAudioBitDepth": "Audio-Bittiefe:",
     "LabelPleaseRestart": "Die Änderungen werden nach dem manuellen Neuladen des Webclients wirksam.",
@@ -1458,7 +1456,7 @@
     "MessageNoServersAvailable": "Die automatische Serversuche konnte keinen Server finden.",
     "LabelPlayer": "Schauspieler:",
     "MediaInfoCodecTag": "Codec Tag",
-    "SubtitleOffset": "Untertitelvorlauf",
+    "SubtitleOffset": "Untertitel-Synchronisierung",
     "PlaybackData": "Wiedergabeinformationen",
     "OptionThumbCard": "Vorschaukarte",
     "OptionPosterCard": "Posterkarte",
@@ -1471,15 +1469,13 @@
     "OptionRandom": "Zufällig",
     "TabNetworking": "Netzwerk",
     "VideoRange": "Videobereich",
-    "ButtonSplit": "Aufteilen",
-    "SelectAdminUsername": "Bitte einen Benutzernamen für das Administrator-Konto auswählen.",
+    "ButtonSplit": "Trennen",
+    "SelectAdminUsername": "Bitte wählen Sie einen Benutzernamen für den Administrator-Account.",
     "HeaderNavigation": "Navigation",
     "CopyStreamURLError": "Beim Kopieren der URL ist ein Fehler aufgetreten.",
     "MessageConfirmAppExit": "Wirklich verlassen?",
     "LabelVideoResolution": "Videoauflösung:",
     "LabelStreamType": "Streamtyp:",
-    "EnableFastImageFadeInHelp": "Zeige Poster und andere Bilder mit einer schnelleren Einblendeanimation, wenn diese fertig geladen sind.",
-    "EnableFastImageFadeIn": "Schnelle Bildeinblendungsanimationen",
     "LabelPlayerDimensions": "Playerabmessungen:",
     "LabelDroppedFrames": "Verlorene Frames:",
     "LabelCorruptedFrames": "Fehlerhafte Frames:",
@@ -1551,7 +1547,7 @@
     "MessageSyncPlayGroupDoesNotExist": "Konnte der Gruppe nicht beitreten, da sie nicht existiert.",
     "MessageSyncPlayPlaybackPermissionRequired": "Wiedergabegenehmigung erforderlich.",
     "MessageSyncPlayNoGroupsAvailable": "Keine Gruppen verfügbar. Fange an, etwas abzuspielen.",
-    "MessageSyncPlayGroupWait": "<b>{0}</b> ist am laden...",
+    "MessageSyncPlayGroupWait": "<b>{0}</b> ist am laden…",
     "MessageSyncPlayUserLeft": "<b>{0}</b> hat die Gruppe verlassen.",
     "MessageSyncPlayUserJoined": "<b>{0}</b> ist der Gruppe beigetreten.",
     "MessageSyncPlayDisabled": "SyncPlay deaktiviert.",
@@ -1571,5 +1567,29 @@
     "HeaderSyncPlayEnabled": "SyncPlay aktiviert",
     "HeaderSyncPlaySelectGroup": "Tritt einer Gruppe bei",
     "EnableDetailsBannerHelp": "Zeigt ein Bannerbild im oberen Bereich der Seite Item-Details.",
-    "EnableDetailsBanner": "Detailbanner"
+    "EnableDetailsBanner": "Detailbanner",
+    "ShowMore": "Mehr anzeigen",
+    "ShowLess": "Weniger anzeigen",
+    "EnableBlurhashHelp": "Bilder, die noch nicht fertig geladen wurden, werden mit einem verschwommenen Platzhalter dargestellt",
+    "EnableBlurhash": "Verschwommene Platzhalter für Bilder erlauben",
+    "EnableFasterAnimations": "Schnellere Animationen",
+    "EnableDecodingColorDepth10Vp9": "Aktiviere 10-Bit-Hardware-Dekodierung für VP9",
+    "EnableDecodingColorDepth10Hevc": "Aktiviere 10-Bit-Hardware-Dekodierung für HEVC",
+    "MessageNoGenresAvailable": "Aktiviere einige Metadaten-Anbieter um Genres aus dem Internet zu holen.",
+    "EnableFasterAnimationsHelp": "Benutze schnellere Animationen und Übergänge",
+    "ButtonCast": "Besetzung",
+    "ButtonSyncPlay": "SyncPlay",
+    "TabRepositories": "Repositories",
+    "MessageAddRepository": "Wenn Sie ein Repository hinzufügen möchten, klicken Sie auf die Schaltfläche neben der Kopfzeile und füllen Sie die angeforderten Informationen aus.",
+    "LabelRepositoryUrlHelp": "Der Speicherort des Repository-Manifests, das Sie aufnehmen möchten.",
+    "LabelRepositoryNameHelp": "Ein benutzerdefinierter Name zur Unterscheidung dieses Repositorys von den anderen, die zu Ihrem Server hinzugefügt wurden.",
+    "LabelRepositoryName": "Name des Repository",
+    "LabelRepositoryUrl": "URL des Repository",
+    "HeaderNewRepository": "Neues Repository",
+    "MessageNoRepositories": "Keine Repositories.",
+    "ButtonPlayer": "Player",
+    "Writers": "Autoren",
+    "ClearQueue": "Wiedergabeliste leeren",
+    "StopPlayback": "Wiedergabe anhalten",
+    "ViewAlbumArtist": "Zeige Albumkünstler"
 }
diff --git a/src/strings/el.json b/src/strings/el.json
index f4021436c7..24fd7c0934 100644
--- a/src/strings/el.json
+++ b/src/strings/el.json
@@ -13,7 +13,7 @@
     "Albums": "Άλμπουμς",
     "All": "Όλα",
     "AllChannels": "Όλα τα κανάλια",
-    "AllComplexFormats": "Όλες οι σύνθετες μορφές (ASS, SSA, VOBSUB, PGS, SUB / IDX κ.λπ.)",
+    "AllComplexFormats": "Όλες οι σύνθετες μορφές (ASS, SSA, VOBSUB, PGS, SUB / IDX, ...)",
     "AllEpisodes": "Ολα τα επεισόδια",
     "AllLanguages": "Όλες οι γλώσσες",
     "AllLibraries": "Όλες οι βιβλιοθήκες",
@@ -23,7 +23,7 @@
     "AlwaysPlaySubtitlesHelp": "Οι υπότιτλοι που ταιριάζουν με τις προτιμήσεις γλώσσας θα φορτωθούν ανεξάρτητα από τη γλώσσα του ήχου.",
     "AnyLanguage": "Οποιαδήποτε γλώσσα",
     "Anytime": "Οποτεδήποτε",
-    "AroundTime": "Περίπου {0}",
+    "AroundTime": "Περίπου",
     "Art": "Τέχνη",
     "Artists": "Καλλιτέχνες",
     "AsManyAsPossible": "Οσο το δυνατον περισσοτερα",
@@ -985,7 +985,6 @@
     "RepeatOne": "Επαναλάβετε ένα",
     "ReplaceAllMetadata": "Αντικατάσταση όλων των μεταδεδομένων",
     "ReplaceExistingImages": "Αντικατάσταση υπαρχουσών εικόνων",
-    "RestartPleaseWaitMessage": "Περιμένετε μέχρι ο τερματικός σταθμός Jellyfin να τερματιστεί και να επανεκκινήσει. Αυτό μπορεί να διαρκέσει ένα λεπτό ή δύο.",
     "ResumeAt": "Συνέχιση από {0}",
     "Rewind": "Αναπαραγωγή προς τα πίσω",
     "RunAtStartup": "Εκτέλεση κατά την εκκίνηση",
@@ -1165,7 +1164,6 @@
     "HeaderSelectMetadataPathHelp": "Περιηγηθείτε ή επιλέξτε την διαδρομή αποθήκευσης των μεταδεδομένων. Ο φάκελος πρέπει να είναι εγγράψιμος.",
     "HeaderSelectMetadataPath": "Επιλέξτε Διαδρομή Μεταδεδομένων",
     "HeaderSelectCertificatePath": "Επιλέξτε Διαδρομή Πιστοποιητικού",
-    "HeaderRestartingServer": "Επανεκκίνηση Διακομιστή",
     "HeaderRemoveMediaFolder": "Αφαίρεση Φακέλου Μέσων",
     "HeaderPeople": "Πρόσωπα",
     "HeaderIdentification": "Ταυτοποίηση",
@@ -1236,5 +1234,6 @@
     "AllowFfmpegThrottlingHelp": "Όταν ένας διακωδικοποιητής ή remux φτάσει αρκετά μπροστά από την τρέχουσα θέση αναπαραγωγής, διακόψτε τη διαδικασία ώστε να καταναλώσει λιγότερους πόρους. Αυτό είναι πιο χρήσιμο όταν παρακολουθείτε χωρίς να αναζητάτε συχνά. Απενεργοποιήστε το εάν αντιμετωπίζετε προβλήματα αναπαραγωγής.",
     "ButtonTogglePlaylist": "Λίστα αναπαραγωγής",
     "ButtonToggleContextMenu": "Περισσότερα",
-    "ButtonSplit": "Διαχωρισμός"
+    "ButtonSplit": "Διαχωρισμός",
+    "ButtonSyncPlay": "SyncPlay"
 }
diff --git a/src/strings/en-gb.json b/src/strings/en-gb.json
index 6d49f52c77..a357f5c15e 100644
--- a/src/strings/en-gb.json
+++ b/src/strings/en-gb.json
@@ -63,7 +63,7 @@
     "Alerts": "Alerts",
     "All": "All",
     "AllChannels": "All channels",
-    "AllComplexFormats": "All complex formats (ASS, SSA, VOBSUB, PGS, SUB/IDX, etc.)",
+    "AllComplexFormats": "All Complex Formats (ASS, SSA, VOBSUB, PGS, SUB, IDX, …)",
     "AllEpisodes": "All episodes",
     "AllLanguages": "All languages",
     "AllLibraries": "All libraries",
@@ -71,7 +71,7 @@
     "AllowMediaConversion": "Allow media conversion",
     "AllowMediaConversionHelp": "Grant or deny access to the convert media feature.",
     "AllowOnTheFlySubtitleExtraction": "Allow subtitle extraction on the fly",
-    "AllowOnTheFlySubtitleExtractionHelp": "Embedded subtitles can be extracted from videos and delivered to clients in plain text in order to help prevent video transcoding. On some systems this can take a long time and cause video playback to stall during the extraction process. Disable this to have embedded subtitles burned in with video transcoding when they are not natively supported by the client device.",
+    "AllowOnTheFlySubtitleExtractionHelp": "Embedded subtitles can be extracted from videos and delivered to clients in plain text, in order to help prevent video transcoding. On some systems this can take a long time and cause video playback to stall during the extraction process. Disable this to have embedded subtitles burned in with video transcoding when they are not natively supported by the client device.",
     "AllowRemoteAccess": "Allow remote connections to this Jellyfin Server.",
     "AllowRemoteAccessHelp": "If unchecked, all remote connections will be blocked.",
     "AllowedRemoteAddressesHelp": "Comma separated list of IP addresses or IP/netmask entries for networks that will be allowed to connect remotely. If left blank, all remote addresses will be allowed.",
@@ -79,7 +79,7 @@
     "AlwaysPlaySubtitlesHelp": "Subtitles matching the language preference will be loaded regardless of the audio language.",
     "AnyLanguage": "Any Language",
     "Anytime": "Anytime",
-    "AroundTime": "Around {0}",
+    "AroundTime": "Around",
     "Art": "Art",
     "AsManyAsPossible": "As many as possible",
     "Ascending": "Ascending",
@@ -96,11 +96,11 @@
     "BirthLocation": "Birth location",
     "BirthPlaceValue": "Birth place: {0}",
     "Blacklist": "Blacklist",
-    "BookLibraryHelp": "Audio and text books are supported. Review the {0}book naming guide{1}.",
+    "BookLibraryHelp": "Audio and text books are supported. Review the {0} book naming guide {1}.",
     "Box": "Box",
     "BoxRear": "Box (rear)",
     "Browse": "Browse",
-    "BurnSubtitlesHelp": "Determines if the server should burn in subtitles when transcoding videos. Avoiding this will greatly improve performance. Select Auto to burn image based formats (VOBSUB, PGS, SUB, IDX) and certain ASS or SSA subtitles.",
+    "BurnSubtitlesHelp": "Determines if the server should burn in subtitles when transcoding videos. Avoiding this will greatly improve performance. Select Auto to burn image based formats (VOBSUB, PGS, SUB, IDX, …) and certain ASS or SSA subtitles.",
     "ButtonAdd": "Add",
     "ButtonAddMediaLibrary": "Add Media Library",
     "ButtonAddScheduledTaskTrigger": "Add Trigger",
@@ -561,7 +561,6 @@
     "RunAtStartup": "Run at startup",
     "Rewind": "Rewind",
     "ResumeAt": "Resume from {0}",
-    "RestartPleaseWaitMessage": "Please wait while Jellyfin Server shuts down and restarts. This may take a minute or two.",
     "RequiredForAllRemoteConnections": "Required for all remote connections",
     "ReplaceExistingImages": "Replace existing images",
     "ReplaceAllMetadata": "Replace all metadata",
@@ -720,7 +719,7 @@
     "MessagePlayAccessRestricted": "Playback of this content is currently restricted. Please contact your server administrator for more information.",
     "MessagePasswordResetForUsers": "The following users have had their passwords reset. They can now sign in with the pin codes that were used to perform the reset.",
     "MessageNothingHere": "Nothing here.",
-    "MessageNoTrailersFound": "No trailers found. Install the Trailer channel to enhance your movie experience by adding a library of internet trailers.",
+    "MessageNoTrailersFound": "Install the trailers channel to enhance your movie experience by adding a library of internet trailers.",
     "MessageNoServersAvailable": "No servers have been found using the automatic server discovery.",
     "MessageNoMovieSuggestionsAvailable": "No movie suggestions are currently available. Start watching and rating your movies, and then come back to view your recommendations.",
     "MessageNoAvailablePlugins": "No available plugins.",
@@ -837,8 +836,8 @@
     "LabelSecureConnectionsMode": "Secure connection mode:",
     "LabelSeasonNumber": "Season number:",
     "LabelScreensaver": "Screensaver:",
-    "EnableFastImageFadeIn": "Fast image fade-in",
-    "EnableFastImageFadeInHelp": "Enable faster fade-in animation for loaded images",
+    "EnableFasterAnimations": "Faster animations",
+    "EnableFasterAnimationsHelp": "Use faster animations and transitions",
     "LabelScheduledTaskLastRan": "Last ran {0}, taking {1}.",
     "LabelSaveLocalMetadataHelp": "Saving artwork into media folders will put them in a place where they can be easily edited.",
     "LabelRuntimeMinutes": "Run time (minutes):",
@@ -1246,7 +1245,7 @@
     "LabelPasswordResetProvider": "Password Reset Provider:",
     "LabelPasswordConfirm": "Password (confirm):",
     "LabelOriginalTitle": "Original title:",
-    "LabelOptionalNetworkPathHelp": "If this folder is shared on your network, supplying the network share path can allow Jellyfin apps on other devices to access media files directly.",
+    "LabelOptionalNetworkPathHelp": "If this folder is shared on your network, supplying the network share path can allow Jellyfin apps on other devices to access media files directly. For example, {0} or {1}.",
     "LabelNumberOfGuideDaysHelp": "Downloading more days worth of guide data provides the ability to schedule out further in advance and view more listings, but it will also take longer to download. Auto will choose based on the number of channels.",
     "LabelNumberOfGuideDays": "Number of days of guide data to download:",
     "LabelNumber": "Number:",
@@ -1435,7 +1434,6 @@
     "HeaderScenes": "Scenes",
     "HeaderRunningTasks": "Running Tasks",
     "HeaderRevisionHistory": "Revision History",
-    "HeaderRestartingServer": "Restarting Server",
     "HeaderRestart": "Restart",
     "HeaderResponseProfile": "Response Profile",
     "HeaderRemoveMediaLocation": "Remove Media Location",
@@ -1515,5 +1513,71 @@
     "ButtonTogglePlaylist": "Playlist",
     "ButtonToggleContextMenu": "More",
     "HeaderDVR": "DVR",
-    "ApiKeysCaption": "List of the currently enabled API keys"
+    "ApiKeysCaption": "List of the currently enabled API keys",
+    "ButtonCast": "Cast",
+    "ButtonSyncPlay": "SyncPlay",
+    "EnableBlurhashHelp": "Images that are still being loaded will be displayed with a blurred placeholder",
+    "EnableBlurhash": "Enable blurred placeholders for images",
+    "TabDVR": "DVR",
+    "TabRepositories": "Repositories",
+    "SyncPlayAccessHelp": "Select the level of access this user has to the SyncPlay feature. SyncPlay enables to sync playback with other devices.",
+    "ShowMore": "Show more",
+    "ShowLess": "Show less",
+    "SaveChanges": "Save changes",
+    "MessageSyncPlayErrorMedia": "Failed to enable SyncPlay! Media error.",
+    "MessageSyncPlayErrorMissingSession": "Failed to enable SyncPlay! Missing session.",
+    "MessageSyncPlayErrorNoActivePlayer": "No active player found. SyncPlay has been disabled.",
+    "MessageSyncPlayErrorAccessingGroups": "An error occurred while accessing groups list.",
+    "MessageSyncPlayLibraryAccessDenied": "Access to this content is restricted.",
+    "MessageSyncPlayJoinGroupDenied": "Permission required to use SyncPlay.",
+    "MessageSyncPlayCreateGroupDenied": "Permission required to create a group.",
+    "MessageSyncPlayGroupDoesNotExist": "Failed to join group because it does not exist.",
+    "MessageSyncPlayPlaybackPermissionRequired": "Playback permission required.",
+    "MessageSyncPlayNoGroupsAvailable": "No groups available. Start playing something first.",
+    "MessageSyncPlayGroupWait": "<b>{0}</b> is buffering…",
+    "MessageSyncPlayUserLeft": "<b>{0}</b> has left the group.",
+    "MessageSyncPlayUserJoined": "<b>{0}</b> has joined the group.",
+    "MessageSyncPlayDisabled": "SyncPlay disabled.",
+    "MessageSyncPlayEnabled": "SyncPlay enabled.",
+    "MessageNoGenresAvailable": "Enable some metadata providers to pull genres from the internet.",
+    "MessageAddRepository": "If you wish to add a repository, click the button next to the header and fill out the requested information.",
+    "LabelRepositoryNameHelp": "A custom name to distinguish this repository from any others added to your server.",
+    "LabelRepositoryName": "Repository Name",
+    "LabelRepositoryUrlHelp": "The location of the repository manifest you want to include.",
+    "LabelRepositoryUrl": "Repository URL",
+    "HeaderNewRepository": "New Repository",
+    "MessageNoRepositories": "No repositories.",
+    "LabelSyncPlayAccess": "SyncPlay access",
+    "LabelSyncPlayAccessNone": "Disabled for this user",
+    "LabelSyncPlayAccessJoinGroups": "Allow user to join groups",
+    "LabelSyncPlayAccessCreateAndJoinGroups": "Allow user to create and join groups",
+    "LabelSyncPlayLeaveGroupDescription": "Disable SyncPlay",
+    "LabelSyncPlayLeaveGroup": "Leave group",
+    "LabelSyncPlayNewGroupDescription": "Create a new group",
+    "LabelSyncPlayNewGroup": "New group",
+    "LabelSyncPlaySyncMethod": "Sync method:",
+    "LabelSyncPlayPlaybackDiff": "Playback time difference:",
+    "MillisecondsUnit": "ms",
+    "LabelSyncPlayTimeOffset": "Time offset with the server:",
+    "LabelRequireHttpsHelp": "If checked, the server will automatically redirect all requests over HTTP to HTTPS. This has no effect if the server is not listening on HTTPS.",
+    "LabelRequireHttps": "Require HTTPS",
+    "LabelNightly": "Nightly",
+    "LabelStable": "Stable",
+    "LabelChromecastVersion": "Chromecast Version",
+    "LabelEnableHttpsHelp": "Enables the server to listen on the configured HTTPS port. A valid certificate must also be configured in order for this to take effect.",
+    "LabelEnableHttps": "Enable HTTPS",
+    "HeaderSyncPlayEnabled": "SyncPlay enabled",
+    "HeaderSyncPlaySelectGroup": "Join a group",
+    "HeaderServerAddressSettings": "Server Address Settings",
+    "HeaderRemoteAccessSettings": "Remote Access Settings",
+    "HeaderHttpsSettings": "HTTPS Settings",
+    "EnableDetailsBannerHelp": "Display a banner image at the top of the item details page.",
+    "EnableDetailsBanner": "Details Banner",
+    "EnableDecodingColorDepth10Vp9": "Enable 10-Bit hardware decoding for VP9",
+    "EnableDecodingColorDepth10Hevc": "Enable 10-Bit hardware decoding for HEVC",
+    "ViewAlbumArtist": "View album artist",
+    "ClearQueue": "Clear queue",
+    "StopPlayback": "Stop playback",
+    "ButtonPlayer": "Player",
+    "Writers": "Writers"
 }
diff --git a/src/strings/en-us.json b/src/strings/en-us.json
index ae02aac882..57a025d8b7 100644
--- a/src/strings/en-us.json
+++ b/src/strings/en-us.json
@@ -228,6 +228,8 @@
     "EnableBackdropsHelp": "Display backdrops in the background of some pages while browsing the library.",
     "EnableCinemaMode": "Cinema mode",
     "EnableColorCodedBackgrounds": "Color coded backgrounds",
+    "EnableDecodingColorDepth10Hevc": "Enable 10-Bit hardware decoding for HEVC",
+    "EnableDecodingColorDepth10Vp9": "Enable 10-Bit hardware decoding for VP9",
     "EnableDisplayMirroring": "Display mirroring",
     "EnableExternalVideoPlayers": "External video players",
     "EnableExternalVideoPlayersHelp": "An external player menu will be shown when starting video playback.",
@@ -464,7 +466,6 @@
     "HeaderResponseProfile": "Response Profile",
     "HeaderResponseProfileHelp": "Response profiles provide a way to customize information sent to the device when playing certain kinds of media.",
     "HeaderRestart": "Restart",
-    "HeaderRestartingServer": "Restarting Server",
     "HeaderRevisionHistory": "Revision History",
     "HeaderRunningTasks": "Running Tasks",
     "HeaderScenes": "Scenes",
@@ -831,8 +832,8 @@
     "LabelSaveLocalMetadataHelp": "Saving artwork into media folders will put them in a place where they can be easily edited.",
     "LabelScheduledTaskLastRan": "Last ran {0}, taking {1}.",
     "LabelScreensaver": "Screensaver:",
-    "EnableFastImageFadeIn": "Fast Image Fade Animations",
-    "EnableFastImageFadeInHelp": "Show posters and other images with a quicker fade animation when they finish loading.",
+    "EnableFasterAnimations": "Faster animations",
+    "EnableFasterAnimationsHelp": "Use faster animations and transitions",
     "LabelSeasonNumber": "Season number:",
     "LabelSelectFolderGroups": "Automatically group content from the following folders into views such as Movies, Music and TV:",
     "LabelSelectFolderGroupsHelp": "Folders that are unchecked will be displayed by themselves in their own view.",
@@ -1028,11 +1029,19 @@
     "MessageItemsAdded": "Items added.",
     "MessageLeaveEmptyToInherit": "Leave empty to inherit settings from a parent item or the global default value.",
     "MessageNoAvailablePlugins": "No available plugins.",
+    "MessageNoRepositories": "No repositories.",
+    "HeaderNewRepository": "New Repository",
+    "LabelRepositoryUrl": "Repository URL",
+    "LabelRepositoryUrlHelp": "The location of the repository manifest you want to include.",
+    "LabelRepositoryName": "Repository Name",
+    "LabelRepositoryNameHelp": "A custom name to distinguish this repository from any others added to your server.",
+    "MessageAddRepository": "If you wish to add a repository, click the button next to the header and fill out the requested information.",
     "MessageNoCollectionsAvailable": "Collections allow you to enjoy personalized groupings of Movies, Series, and Albums. Click the + button to start creating collections.",
+    "MessageNoGenresAvailable": "Enable some metadata providers to pull genres from the internet.",
     "MessageNoMovieSuggestionsAvailable": "No movie suggestions are currently available. Start watching and rating your movies, and then come back to view your recommendations.",
     "MessageNoPluginsInstalled": "You have no plugins installed.",
     "MessageNoServersAvailable": "No servers have been found using the automatic server discovery.",
-    "MessageNoTrailersFound": "No trailers found. Install the Trailer channel to enhance your movie experience by adding a library of internet trailers.",
+    "MessageNoTrailersFound": "Install the trailers channel to enhance your movie experience by adding a library of internet trailers.",
     "MessageNothingHere": "Nothing here.",
     "MessagePasswordResetForUsers": "The following users have had their passwords reset. They can now sign in with the pin codes that were used to perform the reset.",
     "MessagePlayAccessRestricted": "Playback of this content is currently restricted. Please contact your server administrator for more information.",
@@ -1050,7 +1059,7 @@
     "MessageSyncPlayDisabled": "SyncPlay disabled.",
     "MessageSyncPlayUserJoined": "<b>{0}</b> has joined the group.",
     "MessageSyncPlayUserLeft": "<b>{0}</b> has left the group.",
-    "MessageSyncPlayGroupWait": "<b>{0}</b> is buffering...",
+    "MessageSyncPlayGroupWait": "<b>{0}</b> is buffering…",
     "MessageSyncPlayNoGroupsAvailable": "No groups available. Start playing something first.",
     "MessageSyncPlayPlaybackPermissionRequired": "Playback permission required.",
     "MessageSyncPlayGroupDoesNotExist": "Failed to join group because it does not exist.",
@@ -1344,7 +1353,6 @@
     "RepeatOne": "Repeat one",
     "ReplaceAllMetadata": "Replace all metadata",
     "ReplaceExistingImages": "Replace existing images",
-    "RestartPleaseWaitMessage": "Please wait while Jellyfin Server shuts down and restarts. This may take a minute or two.",
     "ResumeAt": "Resume from {0}",
     "Rewind": "Rewind",
     "RunAtStartup": "Run at startup",
@@ -1383,6 +1391,8 @@
     "Share": "Share",
     "ShowAdvancedSettings": "Show advanced settings",
     "ShowIndicatorsFor": "Show indicators for:",
+    "ShowLess": "Show less",
+    "ShowMore": "Show more",
     "ShowTitle": "Show title",
     "ShowYear": "Show year",
     "Shows": "Shows",
@@ -1422,6 +1432,7 @@
     "TabAlbums": "Albums",
     "TabArtists": "Artists",
     "TabCatalog": "Catalog",
+    "TabRepositories": "Repositories",
     "TabChannels": "Channels",
     "TabCodecs": "Codecs",
     "TabCollections": "Collections",
@@ -1526,7 +1537,7 @@
     "Vertical": "Vertical",
     "VideoRange": "Video range",
     "ViewAlbum": "View album",
-    "ViewArtist": "View artist",
+    "ViewAlbumArtist": "View album artist",
     "ViewPlaybackInfo": "View playback info",
     "Watched": "Watched",
     "Wednesday": "Wednesday",
@@ -1534,6 +1545,7 @@
     "Whitelist": "Whitelist",
     "WizardCompleted": "That's all we need for now. Jellyfin has begun collecting information about your media library. Check out some of our apps, and then click <b>Finish</b> to view the <b>Dashboard</b>.",
     "Writer": "Writer",
+    "Writers": "Writers",
     "XmlDocumentAttributeListHelp": "These attributes are applied to the root element of every XML response.",
     "XmlTvKidsCategoriesHelp": "Programs with these categories will be displayed as programs for children. Separate multiple with '|'.",
     "XmlTvMovieCategoriesHelp": "Programs with these categories will be displayed as movies. Separate multiple with '|'.",
@@ -1556,5 +1568,12 @@
     "EveryHour": "Every hour",
     "EveryXHours": "Every {0} hours",
     "OnApplicationStartup": "On application startup",
-    "UnsupportedPlayback": "Jellyfin cannot decrypt content protected by DRM but all content will be attempted regardless, including protected titles. Some files may appear completely black due to encryption or other unsupported features, such as interactive titles."
+    "UnsupportedPlayback": "Jellyfin cannot decrypt content protected by DRM but all content will be attempted regardless, including protected titles. Some files may appear completely black due to encryption or other unsupported features, such as interactive titles.",
+    "EnableBlurhash": "Enable blurred placeholders for images",
+    "EnableBlurhashHelp": "Images that are still being loaded will be displayed with a blurred placeholder",
+    "ButtonSyncPlay": "SyncPlay",
+    "ButtonCast": "Cast",
+    "ButtonPlayer": "Player",
+    "StopPlayback": "Stop playback",
+    "ClearQueue": "Clear queue"
 }
diff --git a/src/strings/eo.json b/src/strings/eo.json
index 3151c9e434..e2eebac174 100644
--- a/src/strings/eo.json
+++ b/src/strings/eo.json
@@ -1,5 +1,24 @@
 {
     "AddToCollection": "Aldoni al kolekto",
     "Actor": "Aktoro",
-    "Absolute": "Absoluto"
+    "Absolute": "Absoluta",
+    "ButtonSyncPlay": "SyncPlay",
+    "AllLanguages": "Ĉiuj lingvoj",
+    "AllEpisodes": "ĉiuj epizodoj",
+    "AllComplexFormats": "Ĉiuj Kompleksaj Formatoj (ASS, SSA, VOBSUB, PGS, SUB, IDX, ...)",
+    "AllChannels": "Ĉiuj kanaloj",
+    "All": "Ĉiuj",
+    "Alerts": "Alertoj",
+    "Albums": "Albumoj",
+    "AlbumArtist": "Albumo-Artisto",
+    "Album": "albumo",
+    "Aired": "Aerumita",
+    "AirDate": "Aera dato",
+    "AdditionalNotificationServices": "Foliumu la kromprogramon por instali aldonajn sciigajn servojn.",
+    "AddedOnValue": "aldonis {0}",
+    "AddToPlaylist": "aldoni al playlist",
+    "AddToPlayQueue": "Aldonu ludi voston",
+    "AddItemToCollectionHelp": "Aldonu erojn al kolektoj serĉante ilin kaj uzante ĝian alklakon aŭ frapetu menuojn por aldoni ilin al kolekto.",
+    "Add": "Aldoni",
+    "AccessRestrictedTryAgainLater": "Aliro nuntempe estas restriktita. Bonvolu reprovi poste."
 }
diff --git a/src/strings/es-ar.json b/src/strings/es-ar.json
index 2fc290c66c..d4030f13ff 100644
--- a/src/strings/es-ar.json
+++ b/src/strings/es-ar.json
@@ -8,13 +8,13 @@
     "HeaderLiveTV": "TV en vivo",
     "HeaderSeries": "Series",
     "LabelAll": "Todo",
-    "LabelDisplayMissingEpisodesWithinSeasons": "Mostar capítulos no disponibles en temporadas",
+    "LabelDisplayMissingEpisodesWithinSeasons": "Mostrar capítulos no disponibles en temporadas",
     "LabelFinish": "Terminar",
     "LabelNext": "Siguiente",
     "LabelPrevious": "Anterior",
     "LabelYourFirstName": "Su nombre:",
     "LabelYoureDone": "Ha terminado!",
-    "MoreUsersCanBeAddedLater": "Más usuarios se pueden agregar más tarde dentro del panel.",
+    "MoreUsersCanBeAddedLater": "Se pueden agregar más usuarios más tarde desde el tablero.",
     "NewCollectionNameExample": "Ejemplo: Colección de Star Wars",
     "OptionMissingEpisode": "Capítulos faltantes",
     "OptionUnairedEpisode": "Capítulos no emitidos",
@@ -22,13 +22,13 @@
     "TabEpisodes": "Capítulos",
     "TellUsAboutYourself": "Contanos acerca de vos",
     "ThisWizardWillGuideYou": "Este asistente le ayudará a guiarlo durante el proceso de configuración. Para comenzar, seleccione su idioma preferido.",
-    "UserProfilesIntro": "Jellyfin incluye soporte integrado para los perfiles de usuario, lo que permite a cada usuario tener su propia configuración de pantalla, estado de reproducción y controles parentales.",
+    "UserProfilesIntro": "Jellyfin incluye soporte para perfiles de usuario con configuraciones de visualización granulares, estado de reproducción y controles parentales.",
     "ValueAudioCodec": "Códec de audio: {0}",
     "ValueCodec": "Códec: {0}",
     "ValueConditions": "Condiciones: {0}",
     "ValueVideoCodec": "Códec de video: {0}",
     "WelcomeToProject": "Bienvenidos a Jellyfin!",
-    "WizardCompleted": "Eso es todo lo que necesitamos por ahora. Jellyfin ha comenzado a recolectar información sobre su biblioteca de medios. Dale un vistazo a algunas de nuestras aplicaciones y, a continuación, hacé clic en <b>Finalizar</b> para ver el <b>Panel de control del servidor</b>.",
+    "WizardCompleted": "Eso es todo lo que necesitamos por ahora. Jellyfin ha comenzado a recopilar información sobre su biblioteca de medios. Consulte algunas de nuestras aplicaciones y luego haga clic en <b>Finalizar</b> para ver el <b>Tablero</b>.",
     "Albums": "Álbumes",
     "Artists": "Artistas",
     "Books": "Libros",
@@ -68,7 +68,7 @@
     "AllowMediaConversion": "Permitir conversión de medios",
     "AllowMediaConversionHelp": "Permitir o denegar acceso a la opción de convertir medios.",
     "AllowOnTheFlySubtitleExtraction": "Permitir extracción de subtítulos al vuelo",
-    "AllowOnTheFlySubtitleExtractionHelp": "Los subtítulos incrustados pueden extraerse de los videos y entregarse a los reproductores en texto plano para ayudar a evitar la transcodificación de video. En algunos sistemas, esto puede tardar mucho tiempo y provocar que la reproducción de video se detenga durante el proceso de extracción. Deshabilite esta opción para que los subtítulos incrustados se graben con transcodificación de video cuando no estén soportados de forma nativa por el dispositivo cliente.",
+    "AllowOnTheFlySubtitleExtractionHelp": "Los subtítulos incrustados se pueden extraer de los videos y entregar a los clientes en texto plano, para ayudar a evitar la transcodificación de videos. En algunos sistemas, esto puede llevar mucho tiempo y provocar que la reproducción de video se detenga durante el proceso de extracción. Deshabilite esto para que los subtítulos incrustados se graben con la transcodificación de video cuando el dispositivo cliente no los admite de forma nativa.",
     "AllowRemoteAccess": "Permitir conexiones remotas a este servidor Jellyfin.",
     "AllowRemoteAccessHelp": "Si no está tildado, todas las conexiones remotas serán bloqueadas.",
     "AlwaysPlaySubtitles": "Reproducir siempre",
@@ -83,7 +83,7 @@
     "AllowHWTranscodingHelp": "Permita que el sintonizador transcodifique transmisiones sobre la marcha. Esto puede ayudar a reducir la transcodificación requerida por el servidor.",
     "AllowedRemoteAddressesHelp": "Lista separada por comas de direcciones IP o IP/máscara de red para redes a las que se les permitirá conectarse de forma remota. Si se deja vacía, todas las direcciones remotas serán permitidas.",
     "AlwaysPlaySubtitlesHelp": "Los subtítulos que concuerden con la preferencia de idioma se cargarán independientemente del idioma del audio.",
-    "AroundTime": "Alrededor de {0}",
+    "AroundTime": "Alrededor",
     "Art": "Arte",
     "AsManyAsPossible": "Tantos como sea posible",
     "AspectRatio": "Relación de aspecto",
@@ -97,12 +97,12 @@
     "BirthPlaceValue": "Lugar de nacimiento: {0}",
     "Blacklist": "Lista negra",
     "BobAndWeaveWithHelp": "Bob and weave (mayor calidad, pero más lento)",
-    "BookLibraryHelp": "Los libros de texto y audio libros son soportados. Revise la {0}Guía para Nomenclatura de Libros{1}.",
+    "BookLibraryHelp": "Se admiten libros de audio y texto. Revise la {0}guía de nombres de libros {1}.",
     "Box": "Caja",
     "BoxRear": "Caja (lado opuesto)",
     "Browse": "Explorar",
     "BrowsePluginCatalogMessage": "Explore nuestro catálogo de complementos para ver los complementos disponibles.",
-    "BurnSubtitlesHelp": "Determina si el servidor debe grabar subtítulos al transcodificar videos. Evitar esto mejorará altamente el rendimiento del servidor. Seleccione Auto para grabar formatos basados en imágenes (VOBSUB, PGS, SUB/IDX) y ciertos subtítulos ASS o SSA.",
+    "BurnSubtitlesHelp": "Determina si el servidor debe grabarse en subtítulos al transcodificar videos. Evitar esto mejorará en gran medida el rendimiento. Seleccione Automático para grabar formatos basados en imágenes (VOBSUB, PGS, SUB, IDX, ...) y ciertos subtítulos ASS o SSA.",
     "ButtonAccept": "Aceptar",
     "ButtonAdd": "Agregar",
     "ButtonAddMediaLibrary": "Agregar biblioteca de medios",
@@ -216,7 +216,7 @@
     "ButtonSubmit": "Enviar",
     "ButtonSubtitles": "Subtítulos",
     "ButtonSync": "Sincronizar",
-    "ButtonTrailer": "Tráiler",
+    "ButtonTrailer": "Avance",
     "ButtonTryAgain": "Intentar de nuevo",
     "ButtonUninstall": "Desinstalar",
     "ButtonUnmute": "Desilenciar",
@@ -241,7 +241,7 @@
     "ChannelAccessHelp": "Selecciona los canales a compartir con este usuario. Los administradores podrán editar todos los canales con el administrador de metadatos.",
     "ChannelNameOnly": "Sólo canal {0}",
     "ChannelNumber": "Número del canal",
-    "CinemaModeConfigurationHelp": "El modo cine trae la experiencia del cine directamente a tu living, con la posibilidad de reproducir tráilers e introducciones personalizadas antes de la función principal.",
+    "CinemaModeConfigurationHelp": "El modo cine trae la experiencia del cine directamente a tu living, con la posibilidad de reproducir avances e introducciones personalizadas antes de la función principal.",
     "CinemaModeFeatureDescription": "El modo cine te da la verdadera experiencia del cine con tráilers e introducciones personalizadas antes de la función principal.",
     "CloudSyncFeatureDescription": "Sincroniza tus medios a la nube para respaldos, archivados y conversiones más fáciles.",
     "ColorPrimaries": "Colores primarios",
@@ -305,7 +305,7 @@
     "Display": "Pantalla",
     "DisplayInMyMedia": "Mostrar en la pantalla de inicio",
     "DisplayInOtherHomeScreenSections": "Mostrar en las secciones de la pantalla principal, como últimos medios y continuar viendo",
-    "DisplayMissingEpisodesWithinSeasons": "Mostrar episodios faltantes entre temporadas",
+    "DisplayMissingEpisodesWithinSeasons": "Mostrar capítulos faltantes entre temporadas",
     "DisplayMissingEpisodesWithinSeasonsHelp": "Esto también debe estar habilitado para las bibliotecas de TV en la configuración del servidor.",
     "DisplayModeHelp": "Seleccione el estilo de diseño que desea en la Interfaz.",
     "DoNotRecord": "No grabar",
@@ -318,15 +318,15 @@
     "Downloads": "Descargas",
     "DownloadsValue": "{0} descargas",
     "DrmChannelsNotImported": "Canales con DRM no van a ser importados.",
-    "DropShadow": "Sombra paralela",
+    "DropShadow": "Dejar sombra",
     "DvrFeatureDescription": "Agendar grabaciones individuales de TV en vivo, grabaciones de series y mucho mas con Jellyfin DVR.",
     "DvrSubscriptionRequired": "Jellyfin DVR requiere una suscripción a Jellyfin Premiere.",
-    "EasyPasswordHelp": "Su código PIN fácil se utiliza para el acceso sin conexión en los clientes compatibles y también puede utilizarse para acceder fácilmente cuando se está en la misma red.",
+    "EasyPasswordHelp": "Su código PIN fácil se usa para acceder sin conexión a clientes compatibles y también se puede usar para iniciar sesión fácilmente en la red.",
     "Edit": "Editar",
     "EditImages": "Editar imagenes",
     "EditMetadata": "Editar metadata",
     "EditSubtitles": "Editar subtitulos",
-    "EnableBackdrops": "Imágenes de fondo",
+    "EnableBackdrops": "Fondos",
     "EnableBackdropsHelp": "Muestra imágenes de fondo en el fondo de algunas páginas mientras se navega por la biblioteca.",
     "EnableCinemaMode": "Modo cine",
     "EnableColorCodedBackgrounds": "Habilitar colores en el fondo del código",
@@ -337,9 +337,9 @@
     "EnableDebugLoggingHelp": "El registro de depuración debería activarse solo a fin de solucionar problemas. El incremento en el acceso al sistema de archivos podría prevenir que el servidor entre en modo de suspensión en algunos entornos.",
     "EnableDisplayMirroring": "Habilitar duplicación de la pantalla",
     "EnableExternalVideoPlayers": "Habilitar reproductores de video externos",
-    "EnableExternalVideoPlayersHelp": "Se mostrará un menú de reproductor externo al iniciar la reproducción de video",
+    "EnableExternalVideoPlayersHelp": "Se mostrará un menú de reproductor externo al iniciar la reproducción de video.",
     "EnableNextVideoInfoOverlay": "Mostrar la información del siguiente video durante la reproducción",
-    "EnableNextVideoInfoOverlayHelp": "Al finalizar un video, mostrar información sobre el siguiente vídeo en la lista de reproducción",
+    "EnableNextVideoInfoOverlayHelp": "Al final de un video, muestra información sobre el próximo video que aparece en la lista de reproducción actual.",
     "EnablePhotos": "Mostrar fotografías",
     "EnablePhotosHelp": "Las imágenes serán detectadas y mostradas junto con otros archivos multimedia.",
     "EnableStreamLooping": "Repetir automáticamente transmisiones en vivo",
@@ -350,7 +350,7 @@
     "EnableThemeVideosHelp": "Al habilitarse, los vídeos de tema se reproducirán de fondo mientras navegues por la biblioteca.",
     "Ended": "Finalizado",
     "EndsAtValue": "Termina en {0}",
-    "Episodes": "Episodios",
+    "Episodes": "Capítulos",
     "ErrorAddingListingsToSchedulesDirect": "Ocurrió un error al añadir el alineamiento a tu cuenta de Schedules Direct. Schedules Direct solo permite una cantidad limitada de alineamientos por cuenta. Quizás necesites ingresar al sitio de Schedules Direct y eliminar otros alineamientos de tu cuenta antes de continuar.",
     "ErrorAddingMediaPathToVirtualFolder": "Ocurrió un error al agregar la ruta de medios. Por favor, asegurate que la ruta es válida y que el proceso que sirve Jellyfin tiene acceso a esa ubicación.",
     "ErrorAddingTunerDevice": "Ocurrió un error al añadir el dispositivo sintonizador. Por favor asegurate que está disponible e intenta de nuevo.",
@@ -392,7 +392,7 @@
     "GuideProviderSelectListings": "Seleccionar Listados",
     "HeaderFavoriteSongs": "Canciones favoritas",
     "HeaderFavoriteShows": "Programas favoritos",
-    "HeaderFavoriteEpisodes": "Episodios favoritos",
+    "HeaderFavoriteEpisodes": "Capítulos favoritos",
     "HeaderFavoriteArtists": "Artistas favoritos",
     "HeaderFavoriteAlbums": "Álbumes favoritos",
     "Shows": "Programas",
@@ -409,12 +409,12 @@
     "HeaderBooks": "Libros",
     "HeaderBlockItemsWithNoRating": "Bloquear elementos con rating de información vacía o no reconocible:",
     "HeaderAutomaticUpdates": "Actualizaciones Automáticas",
-    "HeaderAudioSettings": "Configuración del Audio",
+    "HeaderAudioSettings": "Configuraciones de audio",
     "HeaderAudioBooks": "Audiolibros",
     "HeaderAppearsOn": "Aparece en",
     "HeaderApp": "Aplicación",
-    "HeaderApiKeysHelp": "Las aplicaciones externas requieren una llave API para poder comunicarse con el servidor Jellyfin. Las llaves se emiten iniciando sesión con una cuenta Jellyfin u otorgando manualmente una clave a la aplicación.",
-    "HeaderApiKeys": "Llaves API",
+    "HeaderApiKeysHelp": "Se requiere que las aplicaciones externas tengan una clave de API para comunicarse con el servidor Jellyfin. Las claves se emiten iniciando sesión con una cuenta Jellyfin, u otorgando manualmente una clave a la aplicación.",
+    "HeaderApiKeys": "Claves de API",
     "HeaderApiKey": "Contraseña API",
     "HeaderAllowMediaDeletionFrom": "Permitir el borrado de medios desde",
     "HeaderAlert": "Alerta",
@@ -428,14 +428,14 @@
     "HeaderActivity": "Actividad",
     "HeaderActiveRecordings": "Grabaciones activas",
     "HeaderActiveDevices": "Dispositivos activos",
-    "HeaderAccessScheduleHelp": "Crear un calendario de acceso, para limitar el acceso en determinadas horas.",
-    "HeaderAccessSchedule": "Acceder al Calendario",
+    "HeaderAccessScheduleHelp": "Cree un horario de acceso para limitar el acceso a ciertas horas.",
+    "HeaderAccessSchedule": "Horario de acceso",
     "HardwareAccelerationWarning": "Habilitar la aceleración de hardware puede causar inestabilidad en algunos entornos. Asegúrese de que su sistema operativo y los controladores de vídeo estén completamente actualizados. Si tiene dificultades para reproducir el vídeo después de habilitarlo, deberá volver a cambiar la configuración a \"Nada\".",
     "HandledByProxy": "Manejado por un proxy reverso",
     "HDPrograms": "Programas en HD",
     "EncoderPresetHelp": "Elige un valor más rápido para mejorar el desempeño, o elige un valor más lento para mejorar la calidad.",
     "FetchingData": "Obteniendo información adicional",
-    "Episode": "Episodio",
+    "Episode": "Capítulo",
     "Yesterday": "Ayer",
     "ClientSettings": "Configuración de cliente",
     "BoxSet": "Colección",
@@ -469,10 +469,10 @@
     "HeaderFavoriteBooks": "Libros favoritos",
     "HeaderExternalIds": "IDs externos:",
     "HeaderError": "Error",
-    "HeaderEpisodes": "Episodios",
+    "HeaderEpisodes": "Capítulos",
     "HeaderEnabledFields": "Campos habilitados",
     "HeaderEditImages": "Editar imágenes",
-    "HeaderEasyPinCode": "Pin sencillo",
+    "HeaderEasyPinCode": "Código PIN fácil",
     "HeaderDownloadSync": "Descargar y sincronizar",
     "HeaderDisplay": "Pantalla",
     "HeaderDirectPlayProfile": "Perfil Direct Play",
@@ -599,7 +599,7 @@
     "HeaderStatus": "Estado",
     "HeaderStartNow": "Empezar ahora",
     "HeaderSpecialFeatures": "Características especiales",
-    "HeaderSpecialEpisodeInfo": "Información especial del episodio",
+    "HeaderSpecialEpisodeInfo": "Información especial del capítulo",
     "HeaderSortOrder": "Orden de clasificación",
     "HeaderSortBy": "Ordenar por",
     "HeaderShutdown": "Apagar",
@@ -625,7 +625,6 @@
     "HeaderScenes": "Escenas",
     "HeaderRunningTasks": "Ejecución de tareas",
     "HeaderRevisionHistory": "Revisión histórica",
-    "HeaderRestartingServer": "Reiniciando servidor",
     "HeaderRestart": "Reiniciar",
     "HeaderResponseProfile": "Perfil de respuesta",
     "HeaderRemoveMediaLocation": "Eliminar ubicación de medios",
@@ -642,7 +641,7 @@
     "HeaderPluginInstallation": "Instalación de complementos",
     "HeaderPleaseSignIn": "Por favor, inicie sesión",
     "HeaderNextVideoPlayingInValue": "Reproducción del siguiente video en {0}",
-    "HeaderNextEpisodePlayingInValue": "Reproducción del siguiente episodio en {0}",
+    "HeaderNextEpisodePlayingInValue": "Reproducción del siguiente capítulo en {0}",
     "HeaderMoreLikeThis": "Más como esto",
     "HeaderMetadataSettings": "Configuraciones de metadatos",
     "HeaderMediaInfo": "Información de medios",
@@ -658,5 +657,1001 @@
     "LabelAirDays": "Días al aire:",
     "LabelAccessStart": "Hora de inicio:",
     "LabelAccessEnd": "Hora de finalización:",
-    "HeaderDVR": "DVR"
+    "HeaderDVR": "DVR",
+    "LabelBlockContentWithTags": "Bloquear elementos con etiquetas:",
+    "LabelBlastMessageIntervalHelp": "Determina la duración en segundos entre los mensajes explosivos vivos.",
+    "LabelBlastMessageInterval": "Intervalo de mensaje vivo (segundos)",
+    "LabelBitrate": "Tasa de bits:",
+    "LabelBirthYear": "Año de nacimiento:",
+    "LabelBirthDate": "Fecha de nacimiento:",
+    "LabelBindToLocalNetworkAddressHelp": "Opcional. Anule la dirección IP local para vincular el servidor http. Si se deja vacío, el servidor se vinculará a todas las direcciones disponibles. Cambiar este valor requiere reiniciar el servidor Jellyfin.",
+    "LabelBindToLocalNetworkAddress": "Enlace a la dirección de red local:",
+    "LabelAutomaticallyRefreshInternetMetadataEvery": "Actualizar automáticamente los metadatos desde internet:",
+    "LabelAuthProvider": "Proveedor de autenticación:",
+    "LabelAudioSampleRate": "Frecuencia de muestreo de audio:",
+    "LabelAudioLanguagePreference": "Idioma de audio preferido:",
+    "LabelAudioCodec": "Códec de audio:",
+    "LabelAudioChannels": "Canales de audio:",
+    "LabelAudioBitrate": "Velocidad de bits de audio:",
+    "LabelAudio": "Audio",
+    "LabelAllowedRemoteAddresses": "Filtro de dirección IP remota:",
+    "LabelAllowServerAutoRestartHelp": "El servidor solo se reiniciará durante los períodos de inactividad cuando no haya usuarios activos.",
+    "LabelAllowServerAutoRestart": "Permita que el servidor se reinicie automáticamente para aplicar actualizaciones",
+    "LabelAllowHWTranscoding": "Permitir transcodificación con hardware",
+    "LabelAlbumArtists": "Artistas del álbum:",
+    "LabelContentType": "Tipo de contenido:",
+    "LabelCommunityRating": "Valoración de la comunidad:",
+    "LabelCollection": "Colección:",
+    "LabelChannels": "Canales:",
+    "LabelCertificatePasswordHelp": "Si su certificado requiere una contraseña, ingrésela aquí.",
+    "LabelCertificatePassword": "Contraseña del certificado:",
+    "LabelCancelled": "Cancelado",
+    "LabelCachePath": "Ruta a la caché:",
+    "LabelCache": "Caché:",
+    "LabelBurnSubtitles": "Grabar subtítulos:",
+    "LabelAudioBitDepth": "Profundidad de bits de audio:",
+    "LabelArtistsHelp": "Separar usando múltiples ;",
+    "LabelInNetworkSignInWithEasyPassword": "Habilitar el inicio de sesión en la red con mi código PIN fácil",
+    "LabelImportOnlyFavoriteChannels": "Restringir a canales marcados como favoritos",
+    "LabelImageType": "Tipo de imagen:",
+    "LabelImageFetchersHelp": "Habilite y clasifique sus buscadores de imágenes preferidos en orden de prioridad.",
+    "LabelIdentificationFieldHelp": "Una subcadena que no distingue entre mayúsculas y minúsculas o expresión regular.",
+    "LabelIconMaxWidthHelp": "Resolución máxima de íconos expuestos a través de comentarios UPnP.",
+    "LabelIconMaxWidth": "Ancho máximo del ícono:",
+    "LabelIconMaxHeightHelp": "Resolución máxima de íconos expuestos a través de comentarios UPnP.",
+    "LabelIconMaxHeight": "Altura máxima del ícono:",
+    "LabelHttpsPortHelp": "El número de puerto TCP al que debe unirse el servidor HTTPS de Jellyfin.",
+    "LabelHttpsPort": "Número de puerto HTTPS local:",
+    "LabelHomeScreenSectionValue": "Sección de la pantalla de inicio {0}:",
+    "LabelHomeNetworkQuality": "Calidad de la red doméstica:",
+    "LabelHardwareAccelerationTypeHelp": "La aceleración por hardware requiere una configuración adicional.",
+    "LabelHardwareAccelerationType": "Aceleración por hardware:",
+    "LabelEncoderPreset": "Preajuste de codificación H264 y H265:",
+    "LabelH264Crf": "H264 que codifica CRF:",
+    "LabelGroupMoviesIntoCollectionsHelp": "Al mostrar listas de películas, las películas que pertenecen a una colección se mostrarán como un elemento agrupado.",
+    "LabelGroupMoviesIntoCollections": "Agrupar películas en colecciones",
+    "LabelServerNameHelp": "Este nombre se usará para identificar el servidor y será el nombre predeterminado de la computadora del servidor.",
+    "LabelFriendlyName": "Nombre amigable:",
+    "LabelFormat": "Formato:",
+    "LabelForgotPasswordUsernameHelp": "Ingrese su nombre de usuario, si lo recuerda.",
+    "LabelFont": "Fuente:",
+    "LabelFolder": "Carpeta:",
+    "LabelFileOrUrl": "Archivo o URL:",
+    "LabelFailed": "Fallido",
+    "LabelExtractChaptersDuringLibraryScanHelp": "Genere imágenes de capítulos cuando se importen videos durante el escaneo de la biblioteca. De lo contrario, se extraerán durante la tarea programada de las imágenes de los capítulos, lo que permitirá que el análisis de la biblioteca regular se complete más rápido.",
+    "LabelExtractChaptersDuringLibraryScan": "Extraer imágenes de capítulos durante el escaneo de la biblioteca",
+    "LabelBaseUrlHelp": "Agrega un subdirectorio personalizado a la URL del servidor. Por ejemplo: <code>http://ejemplo.com/<b>&lt;baseurl&gt;</b></code>",
+    "LabelBaseUrl": "URL base:",
+    "LabelEveryXMinutes": "Cada:",
+    "LabelEvent": "Evento:",
+    "LabelEpisodeNumber": "Número de capítulo:",
+    "LabelEndDate": "Fecha final:",
+    "LabelEnableSingleImageInDidlLimitHelp": "Algunos dispositivos no se procesarán correctamente si se incrustan varias imágenes en Didl.",
+    "LabelEnableSingleImageInDidlLimit": "Limitar a una sola imagen incrustada",
+    "LabelEnableRealtimeMonitorHelp": "Los cambios en los archivos se procesarán de inmediato, en los sistemas de archivos compatibles.",
+    "LabelEnableRealtimeMonitor": "Habilitar monitoreo en tiempo real",
+    "LabelEnableHttpsHelp": "Permite que el servidor escuche en el puerto HTTPS configurado. También se debe configurar un certificado válido para que esto surta efecto.",
+    "LabelEnableHttps": "Habilitar HTTPS",
+    "LabelEnableHardwareDecodingFor": "Habilite la decodificación por hardware para:",
+    "LabelEnableDlnaServerHelp": "Permite a los dispositivos UPnP en su red navegar y reproducir contenido.",
+    "LabelEnableDlnaServer": "Habilitar servidor DLNA",
+    "LabelEnableDlnaPlayToHelp": "Detecta dispositivos dentro de tu red y ofrece la posibilidad de controlarlos de forma remota.",
+    "LabelEnableDlnaPlayTo": "Habilitar DLNA para reproducir",
+    "LabelEnableDlnaDebugLoggingHelp": "Cree archivos de registro grandes y solo se deben usar según sea necesario para fines de resolución de problemas.",
+    "LabelEnableDlnaDebugLogging": "Habilitar el registro de depuración DLNA",
+    "LabelEnableDlnaClientDiscoveryIntervalHelp": "Determina la duración en segundos entre las búsquedas SSDP realizadas por Jellyfin.",
+    "LabelEnableDlnaClientDiscoveryInterval": "Intervalo de descubrimiento del cliente (segundos)",
+    "LabelEnableBlastAliveMessagesHelp": "Habilítelo si el servidor no es detectado confiablemente por otros dispositivos UPnP en su red.",
+    "LabelEnableBlastAliveMessages": "Explosión de mensajes vivos",
+    "LabelEnableAutomaticPortMapHelp": "Reenvíe automáticamente los puertos públicos de su enrutador a los puertos locales de su servidor a través de UPnP. Es posible que esto no funcione con algunos modelos de enrutadores o configuraciones de red. Los cambios no se aplicarán hasta después de reiniciar el servidor.",
+    "LabelEnableAutomaticPortMap": "Habilitar asignación automática de puertos",
+    "LabelEmbedAlbumArtDidlHelp": "Algunos dispositivos prefieren este método para obtener la carátula del álbum. Otros pueden no reproducir con esta opción habilitada.",
+    "LabelEmbedAlbumArtDidl": "Incruste la carátula del álbum en Didl",
+    "LabelEasyPinCode": "Código pin fácil:",
+    "LabelDynamicExternalId": "{0} Id:",
+    "LabelDropShadow": "Disminuir sombra:",
+    "LabelDroppedFrames": "Marcos caídos:",
+    "LabelDropImageHere": "Suelta la imagen aquí, o haz clic para buscar.",
+    "LabelDownloadLanguages": "Descargar idiomas:",
+    "LabelDownMixAudioScaleHelp": "Aumenta el audio al mezclar. Un valor de uno preservará el volumen original.",
+    "LabelDownMixAudioScale": "Aumento de audio al mezclar:",
+    "LabelDisplaySpecialsWithinSeasons": "Muestra especiales en las temporadas en las que se transmitieron",
+    "LabelDisplayOrder": "Orden de visualización:",
+    "LabelDisplayName": "Nombre para mostrar:",
+    "LabelDisplayMode": "Modo de visualización:",
+    "LabelDisplayLanguageHelp": "Traducir Jellyfin es un proyecto en curso.",
+    "LabelDisplayLanguage": "Idioma de la pantalla:",
+    "LabelDiscNumber": "Número de disco:",
+    "LabelDidlMode": "Modo DIDL:",
+    "LabelDeviceDescription": "Descripción del dispositivo",
+    "LabelDeinterlaceMethod": "Método de desentrelazado:",
+    "LabelDefaultUserHelp": "Determina qué biblioteca de usuario debe mostrarse en los dispositivos conectados. Esto se puede anular para cada dispositivo usando perfiles.",
+    "LabelDefaultUser": "Usuario predeterminado:",
+    "LabelDefaultScreen": "Pantalla predeterminada:",
+    "LabelDay": "Día:",
+    "LabelDateTimeLocale": "Fecha hora local:",
+    "LabelDateAddedBehaviorHelp": "Si un valor de metadatos está presente, siempre se usará antes de cualquiera de estas opciones.",
+    "LabelDateAddedBehavior": "Comportamiento de fecha agregada para contenido nuevo:",
+    "LabelDateAdded": "Fecha agregada:",
+    "LabelDashboardTheme": "Tema del panel del servidor:",
+    "LabelCustomRating": "Calificación personalizada:",
+    "LabelCustomDeviceDisplayNameHelp": "Proporcione un nombre personalizado para mostrar o déjelo vacío para usar el nombre informado por el dispositivo.",
+    "LabelCustomDeviceDisplayName": "Nombre para mostrar:",
+    "LabelCustomCssHelp": "Aplique su propio estilo personalizado a la interfaz web.",
+    "LabelCustomCss": "CSS personalizado:",
+    "LabelCustomCertificatePathHelp": "Ruta a un archivo PKCS #12 que contiene un certificado y una clave privada para habilitar el soporte TLS en un dominio personalizado.",
+    "LabelCustomCertificatePath": "Ruta del certificado SSL personalizado:",
+    "LabelCurrentPassword": "Contraseña actual:",
+    "LabelCriticRating": "Valoración crítica:",
+    "LabelCountry": "País:",
+    "LabelCorruptedFrames": "Marcos corruptos:",
+    "LabelCachePathHelp": "Especifique una ubicación personalizada para los archivos de caché del servidor, como las imágenes. Déjelo en blanco para usar el servidor predeterminado.",
+    "LabelAppNameExample": "Ejemplo: Sickbeard, Sonarr",
+    "LabelAlbumArtMaxWidthHelp": "Resolución máxima de la carátula del álbum expuesta a través upnp:albumArtURI.",
+    "LabelAlbumArtMaxWidth": "Ancho máximo de la carátula del álbum:",
+    "LabelAlbumArtMaxHeightHelp": "Resolución máxima de la carátula del álbum expuesta a través de upnp:albumArtURI.",
+    "LabelAlbumArtMaxHeight": "Altura máxima de la carátula del álbum:",
+    "ImportMissingEpisodesHelp": "Si está habilitado, la información sobre capítulos faltantes se importará a su base de datos Jellyfin y se mostrará dentro de temporadas y series. Esto puede causar escaneos de bibliotecas significativamente más largos.",
+    "HeaderSyncPlayEnabled": "SyncPlay habilitado",
+    "HeaderSyncPlaySelectGroup": "Unirse a un grupo",
+    "HeaderResponseProfileHelp": "Los perfiles de respuesta proporcionan una forma de personalizar la información enviada al dispositivo cuando se reproducen ciertos tipos de medios.",
+    "HeaderKodiMetadataHelp": "Para habilitar o deshabilitar metadatos NFO, edite una biblioteca en la configuración de la biblioteca Jellyfin y localice la sección de ahorradores de metadatos.",
+    "EnableDetailsBannerHelp": "Muestra una imagen de la pancarta en la parte superior de la página de detalles del elemento.",
+    "EnableDetailsBanner": "Detalles de la pancarta",
+    "EnableDecodingColorDepth10Vp9": "Habilitar la decodificación por hardware de VP9 de 10-Bit",
+    "EnableDecodingColorDepth10Hevc": "Habilitar la decodificación por hardware de HEVC de 10-Bit",
+    "LabelKodiMetadataEnableExtraThumbsHelp": "Al descargar imágenes, se pueden guardar en extrafanart y extrathumbs para obtener la máxima compatibilidad con Kodi.",
+    "LabelKodiMetadataEnableExtraThumbs": "Copiar extrafanart al campo extrathumbs",
+    "LabelKodiMetadataDateFormatHelp": "Todas las fechas dentro de los archivos NFO se analizarán usando este formato.",
+    "LabelKodiMetadataDateFormat": "Formato de fecha de lanzamiento:",
+    "LabelKidsCategories": "Categorías de niños:",
+    "LabelKeepUpTo": "Mantente al día con:",
+    "LabelInternetQuality": "Calidad de internet:",
+    "LabelDeathDate": "Fecha de muerte:",
+    "HeaderTypeImageFetchers": "{0} Buscadores de imágenes",
+    "LabelSyncPlayNewGroupDescription": "Crea un nuevo grupo",
+    "LabelSyncPlayNewGroup": "Nuevo grupo",
+    "LabelSyncPlaySyncMethod": "Método de sincronización:",
+    "LabelSyncPlayPlaybackDiff": "Diferencia horaria de reproducción:",
+    "MillisecondsUnit": "ms",
+    "LabelSyncPlayTimeOffset": "Compensación horaria con el servidor:",
+    "LabelSupportedMediaTypes": "Tipos de medios soportados:",
+    "LabelSubtitles": "Subtítulos",
+    "LabelSubtitlePlaybackMode": "Modo de subtítulos:",
+    "LabelSubtitleFormatHelp": "Ejemplo: srt",
+    "LabelSubtitleDownloaders": "Descargadores de subtítulos:",
+    "LabelStreamType": "Tipo de transmisión:",
+    "LabelStopping": "Deteniendo",
+    "LabelStatus": "Estado:",
+    "LabelSportsCategories": "Categorías de deportes:",
+    "LabelSpecialSeasonsDisplayName": "Nombre de la temporada especial:",
+    "LabelSource": "Fuente:",
+    "LabelSoundEffects": "Efectos de sonido:",
+    "LabelSortTitle": "Ordenar título:",
+    "LabelSortOrder": "Orden de clasificación:",
+    "LabelSortBy": "Ordenar por:",
+    "LabelSonyAggregationFlagsHelp": "Determina el contenido del elemento aggregationFlags en el espacio de nombres urn:schemas-sonycom:av.",
+    "LabelSonyAggregationFlags": "Banderas de agregación de Sony:",
+    "LabelSkipIfGraphicalSubsPresentHelp": "Mantener versiones de texto de subtítulos dará como resultado una entrega más eficiente y disminuirá la probabilidad de transcodificación de video.",
+    "LabelSkipIfGraphicalSubsPresent": "Omita si el video ya contiene subtítulos incrustados",
+    "LabelSkipIfAudioTrackPresentHelp": "Desmarque esto para asegurarse de que todos los videos tengan subtítulos, independientemente del idioma de audio.",
+    "LabelSkipIfAudioTrackPresent": "Omita si la pista de audio predeterminada coincide con el idioma de descarga",
+    "LabelSkipBackLength": "Saltar de nuevo la longitud:",
+    "LabelSkin": "Piel:",
+    "LabelSize": "Tamaño:",
+    "LabelSimultaneousConnectionLimit": "Límite de transmisiones simultáneas:",
+    "LabelServerName": "Nombre del servidor:",
+    "LabelServerHostHelp": "192.168.1.100:8096 o https://miservidor.com",
+    "LabelServerHost": "Host:",
+    "LabelSeriesRecordingPath": "Ruta de grabación de la serie (opcional):",
+    "LabelSerialNumber": "Número de serie",
+    "LabelSendNotificationToUsers": "Enviar la notificación a:",
+    "LabelSelectVersionToInstall": "Seleccione la versión para instalar:",
+    "LabelSelectUsers": "Seleccionar usuarios:",
+    "LabelSelectFolderGroupsHelp": "Las carpetas que no están marcadas se mostrarán por sí mismas en su propia vista.",
+    "LabelSelectFolderGroups": "Agrupe automáticamente el contenido de las siguientes carpetas en vistas como Películas, Música y TV:",
+    "LabelSeasonNumber": "Número de temporada:",
+    "EnableFasterAnimationsHelp": "Usa animaciones y transiciones más rápidas",
+    "EnableFasterAnimations": "Animaciones más rápidas",
+    "LabelScreensaver": "Salvapantallas:",
+    "LabelScheduledTaskLastRan": "Última ejecución {0}, tomando {1}.",
+    "LabelSaveLocalMetadataHelp": "Guardar las ilustraciones en carpetas de medios las colocará en un lugar donde puedan editarse fácilmente.",
+    "LabelSaveLocalMetadata": "Guardar ilustraciones en carpetas de medios",
+    "LabelRuntimeMinutes": "Tiempo de ejecución (minutos):",
+    "LabelRequireHttps": "Requerir HTTPS",
+    "LabelRemoteClientBitrateLimit": "Límite de velocidad de transmisión en Internet (Mbps):",
+    "LabelReleaseDate": "Fecha de lanzamiento:",
+    "LabelRefreshMode": "Modo de actualización:",
+    "LabelRecordingPathHelp": "Especifique la ubicación predeterminada para guardar grabaciones. Si se deja vacío, se utilizará la carpeta de datos del programa del servidor.",
+    "LabelRecordingPath": "Ruta de grabación predeterminada:",
+    "LabelRecord": "Grabar:",
+    "LabelReasonForTranscoding": "Motivo de la transcodificación:",
+    "LabelReadHowYouCanContribute": "Aprende cómo puedes contribuir.",
+    "LabelPublicHttpsPortHelp": "El número de puerto público que debe asignarse al puerto HTTPS local.",
+    "LabelPublicHttpsPort": "Número de puerto HTTPS público:",
+    "LabelPublicHttpPortHelp": "El número de puerto público que debe asignarse al puerto HTTP local.",
+    "LabelPublicHttpPort": "Número de puerto HTTP público:",
+    "LabelProtocolInfoHelp": "El valor que se utilizará al responder a las solicitudes GetProtocolInfo del dispositivo.",
+    "LabelProtocolInfo": "Información del protocolo:",
+    "LabelProtocol": "Protocolo:",
+    "LabelProfileVideoCodecs": "Códecs de video:",
+    "LabelProfileContainersHelp": "Separado por coma. Esto se puede dejar vacío para aplicar a todos los contenedores.",
+    "LabelProfileContainer": "Contenedor:",
+    "LabelProfileCodecsHelp": "Separado por coma. Esto puede dejarse vacío para aplicar a todos los códecs.",
+    "LabelProfileCodecs": "Códecs:",
+    "LabelProfileAudioCodecs": "Códecs de audio:",
+    "LabelPreferredSubtitleLanguage": "Idioma de subtítulos preferido:",
+    "LabelPreferredDisplayLanguageHelp": "La traducción de Jellyfin es un proyecto en curso.",
+    "LabelPreferredDisplayLanguage": "Idioma de visualización preferido:",
+    "LabelPostProcessorArgumentsHelp": "Use {ruta} como la ruta al archivo de grabación.",
+    "LabelPostProcessorArguments": "Argumentos de la línea de comando del post-procesador:",
+    "LabelPostProcessor": "Aplicación de postprocesamiento:",
+    "LabelPleaseRestart": "Los cambios surtirán efecto después de volver a cargar manualmente el cliente web.",
+    "LabelPlayMethod": "Método de reproducción:",
+    "LabelPlaylist": "Lista de reproducción:",
+    "LabelPlayerDimensions": "Dimensiones del reproductor:",
+    "LabelPlayer": "Reproductor:",
+    "LabelPlayDefaultAudioTrack": "Reproduce la pista de audio predeterminada independientemente del idioma",
+    "LabelPlaceOfBirth": "Lugar de nacimiento:",
+    "LabelPersonRoleHelp": "Ejemplo: conductor de camión de helados",
+    "LabelPersonRole": "Rol:",
+    "LabelPath": "Ruta:",
+    "LabelPasswordRecoveryPinCode": "Código PIN:",
+    "LabelPasswordResetProvider": "Proveedor de restablecimiento de contraseña:",
+    "LabelPasswordConfirm": "Contraseña (confirmación):",
+    "LabelPassword": "Contraseña:",
+    "LabelParentalRating": "Calificación parental:",
+    "LabelParentNumber": "Número parental:",
+    "LabelOverview": "Visión general:",
+    "LabelOriginalTitle": "Título original:",
+    "LabelOriginalAspectRatio": "Relación de aspecto original:",
+    "LabelOptionalNetworkPathHelp": "Si esta carpeta se comparte en su red, el suministro de la ruta compartida de la red puede permitir que las aplicaciones Jellyfin en otros dispositivos accedan directamente a los archivos multimedia. Por ejemplo, {0} o {1}.",
+    "LabelOptionalNetworkPath": "(Opcional) Carpeta de red compartida:",
+    "LabelNumberOfGuideDaysHelp": "La descarga de datos de la guía por más días proporciona la capacidad de programar con mayor anticipación y ver más listados, pero también tomará más tiempo descargarlos. Auto elegirá en función de la cantidad de canales.",
+    "LabelNumberOfGuideDays": "Número de días de datos de guía para descargar:",
+    "LabelNumber": "Número:",
+    "LabelNotificationEnabled": "Habilitar esta notificación",
+    "LabelNewsCategories": "Categorías de noticias:",
+    "LabelNewPasswordConfirm": "Nueva contraseña confirmada:",
+    "LabelNewPassword": "Nueva contraseña:",
+    "LabelNewName": "Nuevo nombre:",
+    "LabelNightly": "Nocturna",
+    "LabelStable": "Estable",
+    "LabelChromecastVersion": "Versión de Chromecast",
+    "LabelName": "Nombre:",
+    "LabelMusicStreamingTranscodingBitrateHelp": "Especifique una tasa de bits máxima cuando transmita música.",
+    "LabelMusicStreamingTranscodingBitrate": "Velocidad de bits de transcodificación de música:",
+    "LabelMovieRecordingPath": "Ruta de grabación de películas (opcional):",
+    "LabelMoviePrefixHelp": "Si se aplica un prefijo a los títulos de las películas, ingréselo aquí para que el servidor pueda manejarlo correctamente.",
+    "LabelMoviePrefix": "Prefijo de película:",
+    "LabelMovieCategories": "Categorías de películas:",
+    "LabelMonitorUsers": "Monitorear la actividad de:",
+    "LabelModelUrl": "URL del modelo",
+    "LabelModelNumber": "Número de modelo",
+    "LabelModelName": "Nombre del modelo",
+    "LabelModelDescription": "Descripción del modelo",
+    "LabelMinScreenshotDownloadWidth": "Ancho mínimo de descarga de captura de pantalla:",
+    "LabelMinResumePercentageHelp": "Se supone que los títulos no se reproducen si se detienen antes de este momento.",
+    "LabelMinResumePercentage": "Porcentaje mínimo de reanudación:",
+    "LabelMinResumeDurationHelp": "La duración de video más corta en segundos que guardará la ubicación de reproducción y le permitirá reanudar.",
+    "LabelMinResumeDuration": "Duración mínima de la reanudación:",
+    "LabelMinBackdropDownloadWidth": "Ancho mínimo de descarga de fondo:",
+    "LabelMethod": "Método:",
+    "LabelMetadataSaversHelp": "Elija los formatos de archivo para guardar sus metadatos.",
+    "LabelMetadataSavers": "Ahorradores de metadatos:",
+    "LabelMetadataReadersHelp": "Clasifique sus fuentes de metadatos locales preferidas en orden de prioridad. Se leerá el primer archivo encontrado.",
+    "LabelMetadataReaders": "Lectores de metadatos:",
+    "LabelMetadataPathHelp": "Especifique una ubicación personalizada para las ilustraciones y los metadatos descargados.",
+    "LabelMetadataPath": "Ruta a los metadatos:",
+    "LabelMetadataDownloadersHelp": "Habilite y clasifique sus descargadores de metadatos preferidos en orden de prioridad. Los descargadores de menor prioridad solo se utilizarán para completar la información que falta.",
+    "LabelMetadataDownloadLanguage": "Idioma de descarga preferido:",
+    "LabelMetadata": "Metadatos:",
+    "LabelMessageTitle": "Título del mensaje:",
+    "LabelMessageText": "Mensaje de texto:",
+    "LabelMaxStreamingBitrateHelp": "Especifique una tasa de bits máxima al transmitir.",
+    "LabelMaxStreamingBitrate": "Máxima calidad de transmisión:",
+    "LabelMaxScreenshotsPerItem": "Número máximo de capturas de pantalla por elemento:",
+    "LabelMaxResumePercentageHelp": "Se asume que los títulos fueron vistos si se detienen después de este tiempo.",
+    "LabelMaxResumePercentage": "Porcentaje máximo de reanudación:",
+    "LabelMaxParentalRating": "Calificación parental máxima permitida:",
+    "LabelMaxChromecastBitrate": "Calidad de transmisión del Chromecast:",
+    "LabelMaxBackdropsPerItem": "Número máximo de fondos por artículo:",
+    "LabelManufacturerUrl": "URL del fabricante",
+    "LabelManufacturer": "Fabricante:",
+    "LabelLogs": "Registros:",
+    "LabelLoginDisclaimerHelp": "Un mensaje que se mostrará en la parte inferior de la página de inicio de sesión.",
+    "LabelLockItemToPreventChanges": "Bloquee este elemento para evitar futuros cambios",
+    "LabelLocalHttpServerPortNumberHelp": "El número de puerto TCP al que debe unirse al servidor Jellyfin mediante HTTP.",
+    "LabelLocalHttpServerPortNumber": "Número de puerto HTTP local:",
+    "LabelLibraryPageSize": "Tamaño de página de la biblioteca:",
+    "LabelLanguage": "Idioma:",
+    "LabelLanNetworks": "Redes LAN:",
+    "OptionBlockBooks": "Libros",
+    "OptionBanner": "Pancarta",
+    "OptionAutomaticallyGroupSeriesHelp": "Si está habilitado, las series que se distribuyen en varias carpetas dentro de esta biblioteca se fusionarán automáticamente en una sola serie.",
+    "OptionAutomaticallyGroupSeries": "Combinar automáticamente series que se extienden a través de múltiples carpetas",
+    "OptionAutomatic": "Auto",
+    "OptionAuto": "Auto",
+    "OptionAscending": "Ascendente",
+    "OptionArtist": "Artista",
+    "OptionAllowVideoPlaybackTranscoding": "Permitir reproducción de video que requiere transcodificación",
+    "OptionAllowVideoPlaybackRemuxing": "Permitir reproducción de video que requiere conversión sin volver a codificar",
+    "OptionAllowUserToManageServer": "Permitir a este usuario administrar el servidor",
+    "OptionAllowSyncTranscoding": "Permitir la descarga y sincronización de medios que requieren transcodificación",
+    "OptionAllowRemoteSharedDevicesHelp": "Los dispositivos DLNA se consideran compartidos hasta que un usuario comienza a controlarlos.",
+    "OptionAllowRemoteSharedDevices": "Permitir el control remoto de dispositivos compartidos",
+    "OptionAllowRemoteControlOthers": "Permitir el control remoto de otros usuarios",
+    "OptionAllowMediaPlaybackTranscodingHelp": "Restringir el acceso a la transcodificación puede causar fallas de reproducción en las aplicaciones Jellyfin debido a formatos de medios no compatibles.",
+    "OptionAllowMediaPlayback": "Permitir reproducción de medios",
+    "OptionAllowManageLiveTv": "Permitir la administración de grabaciones de TV en vivo",
+    "OptionAllowLinkSharingHelp": "Solo se comparten páginas web que contienen información de medios. Los archivos multimedia nunca se comparten públicamente. Las acciones tienen un límite de tiempo y caducarán después de {0} días.",
+    "OptionAllowLinkSharing": "Permitir compartir en redes sociales",
+    "OptionAllowContentDownloading": "Permitir la descarga y sincronización de medios",
+    "OptionAllowBrowsingLiveTv": "Permitir el acceso a TV en vivo",
+    "OptionForceRemoteSourceTranscoding": "Forzar la transcodificación de fuentes de medios remotos (como LiveTV)",
+    "OptionAllowAudioPlaybackTranscoding": "Permitir reproducción de audio que requiere transcodificación",
+    "OptionAllUsers": "Todos los usuarios",
+    "OptionAlbumArtist": "Artista del álbum",
+    "OptionAlbum": "Álbum",
+    "OptionAdminUsers": "Administradores",
+    "Option3D": "3D",
+    "OnlyImageFormats": "Solo formatos de imagen (VOBSUB, PGS, SUB)",
+    "OnlyForcedSubtitlesHelp": "Solo se cargarán los subtítulos marcados como forzados.",
+    "OnlyForcedSubtitles": "Solo forzado",
+    "OneChannel": "Un canal",
+    "Off": "Apagado",
+    "NumLocationsValue": "{0} carpetas",
+    "Normal": "Normal",
+    "None": "Nunguno",
+    "NoSubtitlesHelp": "Los subtítulos no se cargarán de manera predeterminada. Todavía se pueden activar manualmente durante la reproducción.",
+    "NoSubtitles": "Ninguno",
+    "NoSubtitleSearchResultsFound": "No se han encontrado resultados.",
+    "NoPluginConfigurationMessage": "Este complemento no tiene opciones para configurar.",
+    "NoNextUpItemsMessage": "Nada encontrado. ¡Comienza a ver tus shows!",
+    "NoNewDevicesFound": "No se encontraron nuevos dispositivos. Para agregar un nuevo sintonizador, cierre este cuadro de diálogo e ingrese la información del dispositivo manualmente.",
+    "NoCreatedLibraries": "Parece que todavía no has creado ninguna biblioteca. {0}¿Te gustaría crear una ahora?{1}",
+    "No": "No",
+    "NextUp": "Siguiente",
+    "Next": "Siguiente",
+    "News": "Noticias",
+    "NewEpisodesOnly": "Solo capítulos nuevos",
+    "NewEpisodes": "Nuevos capítulos",
+    "NewCollectionHelp": "Las colecciones le permiten crear agrupaciones personalizadas de películas y otro contenido de la biblioteca.",
+    "NewCollection": "Nueva colección",
+    "Never": "Nunca",
+    "Name": "Nombre",
+    "MySubtitles": "Mis subtítulos",
+    "Mute": "Silenciar",
+    "MusicVideo": "Video musical",
+    "MusicArtist": "Artista musical",
+    "MusicAlbum": "Álbum de música",
+    "Movie": "Película",
+    "MoveRight": "Mover a la derecha",
+    "MoveLeft": "Mover a la izquierda",
+    "MoreMediaInfo": "Información de medios",
+    "MoreFromValue": "Más de {0}",
+    "Monday": "Lunes",
+    "Mobile": "Móvil",
+    "MinutesBefore": "minutos antes",
+    "MinutesAfter": "minutos después",
+    "MetadataSettingChangeHelp": "Cambiar la configuración de metadatos afectará el contenido nuevo que se agrega en el futuro. Para actualizar el contenido existente, abra la pantalla de detalles y haga clic en el botón actualizar, o realice actualizaciones masivas utilizando el administrador de metadatos.",
+    "MetadataManager": "Administrador de metadatos",
+    "Metadata": "Metadatos",
+    "MessageSyncPlayErrorMedia": "¡Error al habilitar SyncPlay! Error de medios.",
+    "MessageSyncPlayErrorMissingSession": "¡Error al habilitar SyncPlay! Falta sesión.",
+    "MessageSyncPlayErrorNoActivePlayer": "No se ha encontrado ningún reproductor activo. SyncPlay ha sido deshabilitado.",
+    "MessageSyncPlayErrorAccessingGroups": "Se produjo un error al acceder a la lista de grupos.",
+    "MessageSyncPlayLibraryAccessDenied": "El acceso a este contenido está restringido.",
+    "MessageSyncPlayJoinGroupDenied": "Se requiere permiso para usar SyncPlay.",
+    "MessageSyncPlayCreateGroupDenied": "Se requiere permiso para crear un grupo.",
+    "MessageSyncPlayGroupDoesNotExist": "No se pudo unir al grupo porque no existe.",
+    "MessageSyncPlayPlaybackPermissionRequired": "Se requiere permiso de reproducción.",
+    "MessageSyncPlayNoGroupsAvailable": "No hay grupos disponibles. Comienza a reproducir algo primero.",
+    "MessageSyncPlayGroupWait": "<b>{0}</b> está almacenando...",
+    "MessageSyncPlayUserLeft": "<b>{0}</b> ha abandonado el grupo.",
+    "MessageSyncPlayUserJoined": "<b>{0}</b> se ha unido al grupo.",
+    "MessageSyncPlayDisabled": "SyncPlay deshabilitado.",
+    "MessageSyncPlayEnabled": "SyncPlay habilitado.",
+    "MessageYouHaveVersionInstalled": "Actualmente tiene instalada la versión {0}.",
+    "MessageUnsetContentHelp": "El contenido se mostrará como carpetas simples. Para obtener mejores resultados, use el administrador de metadatos para configurar los tipos de contenido de las subcarpetas.",
+    "MessageUnableToConnectToServer": "No podemos conectarnos al servidor seleccionado en este momento. Asegúrese de que se esté ejecutando e intente nuevamente.",
+    "MessageTheFollowingLocationWillBeRemovedFromLibrary": "Las siguientes ubicaciones de medios se eliminarán de su biblioteca:",
+    "MessageSettingsSaved": "Configuraciones guardadas.",
+    "MessageReenableUser": "Ver abajo para volver a habilitar",
+    "MessagePluginInstallDisclaimer": "Los complementos creados por miembros de la comunidad Jellyfin son una excelente manera de mejorar su experiencia Jellyfin con características y beneficios adicionales. Antes de la instalación, tenga en cuenta los efectos que pueden tener en su servidor Jellyfin, como escaneos de bibliotecas más largos, procesamiento en segundo plano adicional y disminución de la estabilidad del sistema.",
+    "MessagePluginConfigurationRequiresLocalAccess": "Para configurar este complemento, inicie sesión directamente en su servidor local.",
+    "MessagePleaseWait": "Por favor espere. Esto puede tardar un minuto.",
+    "MessagePleaseEnsureInternetMetadata": "Asegúrese de que la descarga de metadatos de Internet esté habilitada.",
+    "MessagePlayAccessRestricted": "La reproducción de este contenido está actualmente restringida. Póngase en contacto con el administrador del servidor para obtener más información.",
+    "MessagePasswordResetForUsers": "Los siguientes usuarios han restablecido sus contraseñas. Ahora pueden iniciar sesión con los códigos PIN que se usaron para realizar el restablecimiento.",
+    "MessageNothingHere": "Nada aquí.",
+    "MessageNoTrailersFound": "Instale el canal de avances para mejorar su experiencia cinematográfica agregando una biblioteca de avances de Internet.",
+    "MessageNoServersAvailable": "No se han encontrado servidores con el descubrimiento automático de servidores.",
+    "MessageNoPluginsInstalled": "No tienes complementos instalados.",
+    "MessageNoMovieSuggestionsAvailable": "Actualmente no hay sugerencias de películas disponibles. Comienza a ver y calificar tus películas y luego vuelve a ver tus recomendaciones.",
+    "MessageNoGenresAvailable": "Permitir a algunos proveedores de metadatos extraer géneros de Internet.",
+    "MessageNoCollectionsAvailable": "Las colecciones le permiten disfrutar de agrupaciones personalizadas de películas, series y álbumes. Haga clic en el botón + para comenzar a crear colecciones.",
+    "MessageAddRepository": "Si desea agregar un repositorio, haga clic en el botón al lado del encabezado y complete la información solicitada.",
+    "LabelRepositoryNameHelp": "Un nombre personalizado para distinguir este repositorio de cualquier otro agregado a su servidor.",
+    "LabelRepositoryName": "Nombre del repositorio",
+    "LabelRepositoryUrlHelp": "La ubicación del manifiesto del repositorio que desea incluir.",
+    "LabelRepositoryUrl": "URL del repositorio",
+    "HeaderNewRepository": "Nuevo repositorio",
+    "MessageNoRepositories": "Sin repositorios.",
+    "MessageNoAvailablePlugins": "No hay complementos disponibles.",
+    "MessageLeaveEmptyToInherit": "Deje en blanco para heredar la configuración de un elemento primario o el valor predeterminado global.",
+    "MessageItemsAdded": "Artículos añadidos.",
+    "MessageItemSaved": "Artículo guardado.",
+    "MessageUnauthorizedUser": "No tiene autorización para acceder al servidor en este momento. Póngase en contacto con el administrador del servidor para obtener más información.",
+    "MessageInvalidUser": "Usuario o contraseña inválidos. Inténtalo de nuevo.",
+    "MessageInvalidForgotPasswordPin": "Se ingresó un código PIN no válido o caducado. Inténtalo de nuevo.",
+    "MessageInstallPluginFromApp": "Este complemento debe instalarse desde la aplicación en la que desea utilizarlo.",
+    "MessageImageTypeNotSelected": "Seleccione un tipo de imagen del menú desplegable.",
+    "MessageImageFileTypeAllowed": "Solo se admiten archivos JPEG y PNG.",
+    "MessageForgotPasswordInNetworkRequired": "Intente nuevamente dentro de su red doméstica para iniciar el proceso de restablecimiento de contraseña.",
+    "MessageForgotPasswordFileCreated": "El siguiente archivo se ha creado en su servidor y contiene instrucciones sobre cómo proceder:",
+    "MessageFileReadError": "Se produjo un error al leer el archivo. Inténtalo de nuevo.",
+    "MessageEnablingOptionLongerScans": "Habilitar esta opción puede resultar en escaneos de biblioteca significativamente más largos.",
+    "MessageDownloadQueued": "Descarga en cola.",
+    "MessageDirectoryPickerLinuxInstruction": "Para Linux en Arch Linux, CentOS, Debian, Fedora, openSUSE o Ubuntu, debe otorgar al usuario del servicio al menos acceso de lectura a sus ubicaciones de almacenamiento.",
+    "MessageDirectoryPickerBSDInstruction": "Para BSD, es posible que deba configurar el almacenamiento dentro de su jaula (Jail) FreeNAS para permitir que Jellyfin acceda a él.",
+    "MessageDeleteTaskTrigger": "¿Estás seguro de que desea eliminar este activador de tarea?",
+    "MessageCreateAccountAt": "Cree una cuenta en {0}",
+    "MessageContactAdminToResetPassword": "Póngase en contacto con el administrador del sistema para restablecer su contraseña.",
+    "MessageConfirmShutdown": "¿Está seguro de que desea apagar el servidor?",
+    "MessageConfirmRevokeApiKey": "¿Está seguro de que desea revocar esta clave de API? La conexión de la aplicación al servidor Jellyfin se cerrará abruptamente.",
+    "MessageConfirmRestart": "¿Está seguro de que desea reiniciar el servidor Jellyfin?",
+    "MessageConfirmRemoveMediaLocation": "¿Estás seguro de que deseas eliminar esta ubicación?",
+    "MessageConfirmRecordingCancellation": "¿Cancelar grabación?",
+    "MessageConfirmProfileDeletion": "¿Estás seguro de que deseas eliminar este perfil?",
+    "MessageConfirmDeleteTunerDevice": "¿Estás seguro de que deseas eliminar este dispositivo?",
+    "MessageConfirmDeleteGuideProvider": "¿Está seguro de que desea eliminar este proveedor de guías?",
+    "MessageConfirmAppExit": "¿Quieres salir?",
+    "MessageAreYouSureYouWishToRemoveMediaFolder": "¿Estás seguro de que deseas eliminar esta carpeta multimedia?",
+    "MessageAreYouSureDeleteSubtitles": "¿Estás seguro de que deseas eliminar este archivo de subtítulos?",
+    "MessageAlreadyInstalled": "Esta versión ya está instalada.",
+    "Menu": "Menú",
+    "MediaIsBeingConverted": "Los medios se están convirtiendo a un formato compatible con el dispositivo que los reproduce.",
+    "MediaInfoStreamTypeVideo": "Video",
+    "MediaInfoStreamTypeSubtitle": "Subtítulo",
+    "MediaInfoStreamTypeEmbeddedImage": "Imagen incrustada",
+    "MediaInfoStreamTypeData": "Data",
+    "MediaInfoStreamTypeAudio": "Audio",
+    "MediaInfoSoftware": "Software",
+    "MediaInfoTimestamp": "Marca de tiempo",
+    "MediaInfoSize": "Tamaño",
+    "MediaInfoSampleRate": "Frecuencia de muestreo",
+    "MediaInfoResolution": "Resolución",
+    "MediaInfoRefFrames": "Marcos de referencia",
+    "MediaInfoProfile": "Perfil",
+    "MediaInfoPixelFormat": "Formato de píxeles",
+    "MediaInfoPath": "Ruta",
+    "MediaInfoLevel": "Nivel",
+    "MediaInfoLayout": "Diseño",
+    "MediaInfoLanguage": "Idioma",
+    "MediaInfoInterlaced": "Entrelazado",
+    "MediaInfoFramerate": "Cuadros por segundo",
+    "MediaInfoForced": "Forzado",
+    "MediaInfoExternal": "Externo",
+    "MediaInfoDefault": "Predeterminado",
+    "MediaInfoContainer": "Contenedor",
+    "MediaInfoCodecTag": "Etiqueta de códec",
+    "MediaInfoCodec": "Códec",
+    "MediaInfoChannels": "Canales",
+    "MediaInfoBitrate": "Tasa de bits",
+    "MediaInfoBitDepth": "Profundidad de bits",
+    "MediaInfoAspectRatio": "Relación de aspecto",
+    "MediaInfoAnamorphic": "Anamórfico",
+    "MaxParentalRatingHelp": "El contenido con una calificación más alta estará oculto para este usuario.",
+    "MapChannels": "Canales de mapas",
+    "ManageRecording": "Administrar grabación",
+    "ManageLibrary": "Administrar biblioteca",
+    "Logo": "Logo",
+    "LiveTV": "TV en vivo",
+    "LiveBroadcasts": "Transmisiones en vivo",
+    "Live": "En vivo",
+    "List": "Lista",
+    "LinksValue": "Enlaces: {0}",
+    "Like": "Me gusta",
+    "LeaveBlankToNotSetAPassword": "Puede dejar este campo en blanco para no establecer una contraseña.",
+    "LearnHowYouCanContribute": "Aprende cómo puedes contribuir.",
+    "LaunchWebAppOnStartup": "Iniciar la interfaz web al iniciar el servidor",
+    "LatestFromLibrary": "Últimos {0}",
+    "Large": "Grande",
+    "LabelffmpegPathHelp": "La ruta al archivo de la aplicación ffmpeg o la carpeta que contiene ffmpeg.",
+    "LabelffmpegPath": "Ruta de FFmpeg:",
+    "LabelZipCode": "Código postal:",
+    "LabelYear": "Año:",
+    "LabelWeb": "Web:",
+    "LabelVideoResolution": "Resolución de video:",
+    "LabelVideoCodec": "Códec de vídeo:",
+    "LabelVideoBitrate": "Tasa de bits de video:",
+    "LabelVideo": "Video",
+    "DashboardArchitecture": "Arquitectura: {0}",
+    "DashboardOperatingSystem": "Sistema operativo: {0}",
+    "DashboardServerName": "Servidor: {0}",
+    "DashboardVersionNumber": "Versión: {0}",
+    "LabelVersionInstalled": "{0} instalado",
+    "LabelVersion": "Versión:",
+    "LabelValue": "Valor:",
+    "LabelVaapiDeviceHelp": "Este es el nodo de representación que se utiliza para la aceleración por hardware.",
+    "LabelUsername": "Nombre de usuario:",
+    "LabelUserRemoteClientBitrateLimitHelp": "Anule el valor global predeterminado establecido en la configuración de reproducción del servidor.",
+    "LabelUserLoginAttemptsBeforeLockout": "Intentos de inicio de sesión fallidos antes de que el usuario quede bloqueado:",
+    "LabelUserLibraryHelp": "Seleccione qué biblioteca de usuario mostrar al dispositivo. Deje en blanco para heredar la configuración predeterminada.",
+    "LabelUserLibrary": "Biblioteca de usuario:",
+    "LabelUserAgent": "Agente de usuario:",
+    "LabelUser": "Usuario:",
+    "LabelUseNotificationServices": "Utiliza los siguientes servicios:",
+    "LabelTypeText": "Texto",
+    "LabelTypeMetadataDownloaders": "{0} descargadores de metadatos:",
+    "LabelType": "Tipo:",
+    "LabelTunerType": "Tipo de sintonizador:",
+    "LabelTunerIpAddress": "Dirección IP del sintonizador:",
+    "LabelTriggerType": "Tipo de disparador:",
+    "LabelTranscodingVideoCodec": "Códec de vídeo:",
+    "LabelTranscodingThreadCountHelp": "Elija el número máximo de hilos para usar al transcodificar. Reducir el recuento de hilos disminuirá el uso de la CPU, pero es posible que no se convierta lo suficientemente rápido para una experiencia de reproducción fluida.",
+    "LabelTranscodingThreadCount": "Conteo de hilos de transcodificación:",
+    "LabelTranscodingProgress": "Progreso de transcodificación:",
+    "LabelTranscodingFramerate": "Velocidad de fotogramas de transcodificación:",
+    "LabelTranscodes": "Transcodificaciones:",
+    "LabelTranscodingTempPathHelp": "Especifique una ruta personalizada para los archivos de transcodificación servidos a los clientes. Déjelo en blanco para usar el servidor predeterminado.",
+    "LabelTranscodePath": "Ruta para las transcodificaciones:",
+    "LabelTranscodingContainer": "Contenedor:",
+    "LabelTranscodingAudioCodec": "Códec de audio:",
+    "LabelTrackNumber": "Número de pista:",
+    "LabelTitle": "Título:",
+    "LabelTimeLimitHours": "Límite de tiempo (horas):",
+    "LabelTime": "Hora:",
+    "LabelTheme": "Tema:",
+    "LabelTextSize": "Tamaño del texto:",
+    "LabelTextColor": "Color de texto:",
+    "LabelTextBackgroundColor": "Color de fondo del texto:",
+    "LabelTagline": "Lema:",
+    "LabelTag": "Etiqueta:",
+    "LabelTVHomeScreen": "Pantalla de inicio del modo TV:",
+    "LabelSyncPlayAccess": "Acceso SyncPlay",
+    "LabelSyncPlayAccessNone": "Deshabilitado para este usuario",
+    "LabelSyncPlayAccessJoinGroups": "Permitir al usuario unirse a grupos",
+    "LabelSyncPlayAccessCreateAndJoinGroups": "Permitir al usuario crear y unirse a grupos",
+    "LabelSyncPlayLeaveGroupDescription": "Deshabilitar SyncPlay",
+    "LabelSyncPlayLeaveGroup": "Dejar grupo",
+    "OptionEnableForAllTuners": "Habilitar para todos los dispositivos sintonizadores",
+    "OptionEnableExternalContentInSuggestionsHelp": "Permita que se incluyan avances de Internet y programas de TV en vivo dentro del contenido sugerido.",
+    "OptionEnableExternalContentInSuggestions": "Habilitar contenido externo en sugerencias",
+    "OptionEnableAccessToAllLibraries": "Habilite el acceso a todas las bibliotecas",
+    "OptionEnableAccessToAllChannels": "Habilita el acceso a todos los canales",
+    "OptionEnableAccessFromAllDevices": "Habilite el acceso desde todos los dispositivos",
+    "OptionEmbedSubtitles": "Incrustar dentro del contenedor",
+    "OptionDvd": "DVD",
+    "OptionDownloadThumbImage": "Pulgar",
+    "OptionDownloadPrimaryImage": "Primario",
+    "OptionDownloadMenuImage": "Menú",
+    "OptionDownloadLogoImage": "Logo",
+    "OptionDownloadImagesInAdvanceHelp": "Por defecto, la mayoría de las imágenes solo se descargan cuando lo solicita una aplicación Jellyfin. Active esta opción para descargar todas las imágenes de antemano, ya que se importan nuevos medios. Esto puede causar escaneos de biblioteca significativamente más largos.",
+    "OptionDownloadImagesInAdvance": "Descargar imágenes por adelantado",
+    "OptionDownloadDiscImage": "Disco",
+    "OptionDownloadBoxImage": "Caja",
+    "OptionDownloadBannerImage": "Pancarta",
+    "OptionDownloadBackImage": "Volver",
+    "OptionDownloadArtImage": "Arte",
+    "OptionDisplayFolderViewHelp": "Mostrar carpetas junto con sus otras bibliotecas de medios. Esto puede ser útil si desea tener una vista de carpeta simple.",
+    "OptionDisplayFolderView": "Mostrar una vista de carpeta para mostrar carpetas de medios simples",
+    "OptionDislikes": "No me gustas",
+    "OptionDisableUserHelp": "Si está deshabilitado, el servidor no permitirá ninguna conexión de este usuario. Las conexiones existentes se terminarán abruptamente.",
+    "OptionDisableUser": "Deshabilitar este usuario",
+    "OptionDescending": "Descendente",
+    "OptionDatePlayed": "Fecha de reproducción",
+    "OptionDateAddedImportTime": "Use la fecha escaneada en la biblioteca",
+    "OptionDateAddedFileTime": "Usar fecha de creación de archivo",
+    "OptionDateAdded": "Fecha agregada",
+    "OptionDaily": "Diario",
+    "OptionCustomUsers": "Personalizado",
+    "OptionCriticRating": "Valoración crítica",
+    "OptionContinuing": "Continuo",
+    "OptionCommunityRating": "Calificación de la comunidad",
+    "OptionCaptionInfoExSamsung": "CaptionInfoEx (Samsung)",
+    "OptionBluray": "Blu-ray",
+    "OptionBlockTvShows": "Programas de televisión",
+    "OptionBlockTrailers": "Avances",
+    "OptionBlockMusic": "Música",
+    "OptionBlockMovies": "Películas",
+    "OptionBlockLiveTvChannels": "Canales de TV en vivo",
+    "OptionBlockChannelContent": "Contenido del canal de internet",
+    "MusicLibraryHelp": "Revise la {0}guía de nomenclatura musical{1}.",
+    "MovieLibraryHelp": "Revise la {0}guía de nombres de películas{1}.",
+    "LibraryAccessHelp": "Seleccione las bibliotecas para compartir con este usuario. Los administradores podrán editar todas las carpetas con el administrador de metadatos.",
+    "LaunchWebAppOnStartupHelp": "Abra el cliente web en su navegador web predeterminado cuando el servidor arranque inicialmente. Esto no ocurrirá cuando use la función de reinicio del servidor.",
+    "LanNetworksHelp": "Lista separada por comas de direcciones IP o entradas de IP/máscara de red para redes que se considerarán en la red local cuando se impongan restricciones de ancho de banda. Si se establece, todas las demás direcciones IP se considerarán en la red externa y estarán sujetas a las restricciones de ancho de banda externo. Si se deja en blanco, solo se considera que la subred del servidor está en la red local.",
+    "LabelXDlnaDocHelp": "Determina el contenido del elemento X_DLNADOC en el espacio de nombres urn:schemas-dlna-org:device-1-0.",
+    "LabelXDlnaDoc": "Doc. X-DLNA:",
+    "LabelXDlnaCapHelp": "Determina el contenido del elemento X_DLNACAP en el espacio de nombres urn:schemas-dlna-org:device-1-0.",
+    "LabelXDlnaCap": "Tapa X-DLNA:",
+    "LabelVaapiDevice": "Dispositivo VA API:",
+    "LabelStopWhenPossible": "Detener cuando sea posible:",
+    "LabelStartWhenPossible": "Iniciar cuando sea posible:",
+    "LabelRequireHttpsHelp": "Si se marca, el servidor redirigirá automáticamente todas las solicitudes a través de HTTP a HTTPS. Esto no tiene efecto si el servidor no está escuchando en HTTPS.",
+    "LabelRemoteClientBitrateLimitHelp": "Un límite opcional de velocidad de bits por flujo para todos los dispositivos fuera de la red. Esto es útil para evitar que los dispositivos soliciten una tasa de bits superior a la que puede manejar su conexión a Internet. Esto puede aumentar la carga de la CPU en su servidor para transcodificar videos sobre la marcha a una tasa de bits más baja.",
+    "LabelMatchType": "Tipo de concordancia:",
+    "LabelLoginDisclaimer": "Descargo de responsabilidad de inicio de sesión:",
+    "LabelLineup": "Alineación:",
+    "LabelLibraryPageSizeHelp": "Establece la cantidad de elementos para mostrar en una página de biblioteca. Establezca a 0 para deshabilitar la paginación.",
+    "LabelKodiMetadataUserHelp": "Guarde los datos de observación en archivos NFO para que otras aplicaciones los utilicen.",
+    "LabelKodiMetadataUser": "Guarde los datos de observación del usuario en archivos NFO para:",
+    "LabelKodiMetadataSaveImagePathsHelp": "Esto se recomienda si tiene nombres de archivos de imágenes que no cumplen con las pautas de Kodi.",
+    "LabelKodiMetadataSaveImagePaths": "Guardar rutas de imagen dentro de archivos nfo",
+    "LabelKodiMetadataEnablePathSubstitutionHelp": "Permite la sustitución de rutas de imágenes utilizando la configuración de sustitución de rutas del servidor.",
+    "LabelKodiMetadataEnablePathSubstitution": "Habilitar sustitución de ruta",
+    "LabelInNetworkSignInWithEasyPasswordHelp": "Use el código PIN fácil para iniciar sesión en clientes dentro de su red local. Su contraseña habitual sólo será necesaria fuera de casa. Si el código PIN se deja en blanco, no necesitará una contraseña dentro de su red doméstica.",
+    "LabelAlbumArtPN": "Art PN de álbum:",
+    "LabelAlbumArtHelp": "PN utilizado para la carátula del álbum, dentro del atributo dlna:profileID en upnp:albumArtURI. Algunos dispositivos requieren un valor específico, independientemente del tamaño de la imagen.",
+    "LabelAirsBeforeSeason": "Aires antes de la temporada:",
+    "LabelAirsBeforeEpisode": "Aires antes del capítulo:",
+    "LabelAirsAfterSeason": "Aires después de la temporada:",
+    "OptionEnableM2tsMode": "Habilitar el modo M2ts",
+    "ReleaseDate": "Fecha de lanzamiento",
+    "RefreshQueued": "Actualizar cola.",
+    "RefreshMetadata": "Actualizar metadatos",
+    "RefreshDialogHelp": "Los metadatos se actualizan en función de la configuración y los servicios de Internet que están habilitados en el panel del servidor Jellyfin.",
+    "Refresh": "Actualizar",
+    "Recordings": "Grabaciones",
+    "RecordingScheduled": "Grabación programada.",
+    "RecordingPathChangeMessage": "Cambiar su carpeta de grabación no migrará las grabaciones existentes de la ubicación anterior a la nueva. Tendrá que moverlos manualmente si lo desea.",
+    "RecordingCancelled": "Grabación cancelada.",
+    "RecordSeries": "Grabar series",
+    "Record": "Grabar",
+    "RecommendationStarring": "Protagonizada por {0}",
+    "RecommendationDirectedBy": "Dirigido por {0}",
+    "RecommendationBecauseYouWatched": "Porque viste {0}",
+    "RecommendationBecauseYouLike": "Porque te gusta {0}",
+    "RecentlyWatched": "Recientemente visto",
+    "Rate": "Velocidad",
+    "Raised": "Elevado",
+    "QueueAllFromHere": "Hacer cola todo desde aquí",
+    "Quality": "Calidad",
+    "Programs": "Programas",
+    "ProductionLocations": "Ubicaciones de producción",
+    "Producer": "Productor",
+    "Primary": "Primario",
+    "Previous": "Anterior",
+    "Premieres": "Estrenos",
+    "Premiere": "Estreno",
+    "PreferEmbeddedEpisodeInfosOverFileNames": "Prefiere la información incrustada del capítulo sobre los nombres de archivo",
+    "PreferEmbeddedEpisodeInfosOverFileNamesHelp": "Esto usa la información de los metadatos incrustados del capítulo si está disponible.",
+    "PreferEmbeddedTitlesOverFileNamesHelp": "Esto determina el título de visualización predeterminado cuando no hay metadatos de Internet o metadatos locales disponibles.",
+    "PreferEmbeddedTitlesOverFileNames": "Preferir títulos incrustados sobre nombres de archivo",
+    "PluginInstalledMessage": "El complemento se ha instalado correctamente. El servidor Jellyfin deberá reiniciarse para que los cambios surtan efecto.",
+    "PleaseSelectTwoItems": "Seleccione al menos dos elementos.",
+    "PleaseRestartServerName": "Reinicie el servidor Jellyfin - {0}.",
+    "PleaseEnterNameOrId": "Por favor, introduzca un nombre o una ID externa.",
+    "PleaseConfirmPluginInstallation": "Haga clic en Aceptar para confirmar que ha leído lo anterior y desea continuar con la instalación del complemento.",
+    "PleaseAddAtLeastOneFolder": "Agregue al menos una carpeta a esta biblioteca haciendo clic en el botón Agregar.",
+    "Played": "Reproducido",
+    "PlaybackErrorNoCompatibleStream": "Este cliente no es compatible con los medios y el servidor no envía un formato de medios compatible.",
+    "PlayNextEpisodeAutomatically": "Reproducir el próximo capítulo automáticamente",
+    "PlayNext": "Reproducir siguiente",
+    "PlayFromBeginning": "Reproducir desde el principio",
+    "PlayCount": "Cuenta de reproducciones",
+    "PlaybackData": "Datos de reproducción",
+    "PlayAllFromHere": "Reproducir todo desde aquí",
+    "Play": "Reproducir",
+    "PlaceFavoriteChannelsAtBeginning": "Colocar los canales favoritos al principio",
+    "PinCodeResetConfirmation": "¿Estás seguro de que deseas restablecer el código PIN?",
+    "PinCodeResetComplete": "El código pin ha sido restablecido.",
+    "PictureInPicture": "Imagen en imagen",
+    "Person": "Persona",
+    "PerfectMatch": "Combinación perfecta",
+    "People": "Personas",
+    "PasswordSaved": "Contraseña guardada.",
+    "PasswordResetProviderHelp": "Elija un proveedor de restablecimiento de contraseña para usar cuando este usuario solicite un restablecimiento de contraseña",
+    "PasswordResetHeader": "Restablecer contraseña",
+    "PasswordResetConfirmation": "¿Estás seguro de que deseas restablecer la contraseña?",
+    "PasswordResetComplete": "La contraseña ha sido restablecida.",
+    "PasswordMatchError": "La contraseña y la confirmación de la contraseña deben coincidir.",
+    "PackageInstallFailed": "La instalación de {0} (versión {1}) falló.",
+    "PackageInstallCompleted": "Instalación {0} (versión {1}) completada.",
+    "PackageInstallCancelled": "Instalación de {0} (versión {1}) cancelada.",
+    "Overview": "Visión general",
+    "OtherArtist": "Otro artista",
+    "OriginalAirDateValue": "Fecha de emisión original: {0}",
+    "OptionWeekly": "Semanal",
+    "OptionWeekends": "Fines de semana",
+    "OptionWeekdays": "Días de la semana",
+    "OptionWednesday": "Miércoles",
+    "OptionWakeFromSleep": "Despertarse del sueño",
+    "OptionUnplayed": "No reproducido",
+    "OptionTvdbRating": "Calificación de TVDB",
+    "OptionTuesday": "Martes",
+    "OptionTrackName": "Nombre de la pista",
+    "OptionThumbCard": "Tarjeta del pulgar",
+    "OptionThumb": "Pulgar",
+    "OptionThursday": "Jueves",
+    "OptionSunday": "Domingo",
+    "OptionSubstring": "Subcadena",
+    "OptionSpecialEpisode": "Especiales",
+    "OptionSaveMetadataAsHiddenHelp": "Cambiar esto se aplicará a los nuevos metadatos guardados en el futuro. Los archivos de metadatos existentes se actualizarán la próxima vez que el servidor Jellyfin los guarde.",
+    "OptionSaveMetadataAsHidden": "Guardar metadatos e imágenes como archivos ocultos",
+    "OptionSaturday": "Sábado",
+    "OptionRuntime": "Tiempo de ejecución",
+    "OptionResumable": "Reanudable",
+    "OptionResElement": "elemento res",
+    "OptionRequirePerfectSubtitleMatchHelp": "Requerir una combinación perfecta filtrará los subtítulos para incluir solo aquellos que han sido probados y verificados con su archivo de video exacto. Desmarcar esto aumentará la probabilidad de que se descarguen los subtítulos, pero aumentará las posibilidades de texto de subtítulos incorrecto o incorrecto.",
+    "OptionRequirePerfectSubtitleMatch": "Descargar solo subtítulos que coincidan perfectamente con mis archivos de video",
+    "OptionReportByteRangeSeekingWhenTranscodingHelp": "Esto es necesario para algunos dispositivos que no buscan el tiempo muy bien.",
+    "OptionReportByteRangeSeekingWhenTranscoding": "Informe que el servidor admite la búsqueda de bytes al transcodificar",
+    "OptionReleaseDate": "Fecha de lanzamiento",
+    "OptionRegex": "Regex",
+    "OptionRandom": "Aleatorio",
+    "OptionProtocolHttp": "HTTP",
+    "OptionProtocolHls": "Transmisión en vivo HTTP",
+    "OptionProfileVideoAudio": "Video Audio",
+    "OptionProfileVideo": "Video",
+    "OptionProfilePhoto": "Foto",
+    "OptionProfileAudio": "Audio",
+    "OptionPremiereDate": "Fecha de estreno",
+    "OptionPosterCard": "Tarjeta de póster",
+    "OptionPoster": "Póster",
+    "OptionPlayed": "Reproducido",
+    "OptionPlayCount": "Cuento de reproducciones",
+    "OptionPlainVideoItemsHelp": "Si está habilitado, todos los videos se representan en DIDL como \"object.item.videoItem\" en lugar de un tipo más específico, como \"object.item.videoItem.movie\".",
+    "OptionPlainVideoItems": "Mostrar todos los videos como elementos de video simples",
+    "OptionPlainStorageFoldersHelp": "Si está habilitado, todas las carpetas se representan en DIDL como \"object.container.storageFolder\" en lugar de un tipo más específico, como \"object.container.person.musicArtist\".",
+    "OptionPlainStorageFolders": "Mostrar todas las carpetas como carpetas de almacenamiento sin formato",
+    "OptionParentalRating": "Calificación parental",
+    "OptionOnInterval": "En un intervalo",
+    "OptionOnAppStartup": "En el inicio de la aplicación",
+    "OptionNone": "Ninguno",
+    "OptionNew": "Nuevo…",
+    "OptionNameSort": "Nombre",
+    "OptionMonday": "Lunes",
+    "OptionMax": "Máx.",
+    "OptionLoginAttemptsBeforeLockoutHelp": "Un valor de cero significa heredar el valor predeterminado de tres intentos para usuarios normales y cinco para administradores. Establecer esto en -1 deshabilitará la función.",
+    "OptionLoginAttemptsBeforeLockout": "Determina cuántos intentos de inicio de sesión incorrectos se pueden realizar antes de que ocurra el bloqueo.",
+    "OptionList": "Lista",
+    "OptionLikes": "Me gustas",
+    "OptionIsSD": "SD",
+    "OptionIsHD": "HD",
+    "OptionImdbRating": "Calificación de IMDb",
+    "OptionIgnoreTranscodeByteRangeRequestsHelp": "Si está habilitado, estas solicitudes serán atendidas pero ignorarán el encabezado del rango de bytes.",
+    "OptionIgnoreTranscodeByteRangeRequests": "Ignorar las solicitudes de rango de bytes de transcodificación",
+    "OptionHomeVideos": "Fotos",
+    "OptionHlsSegmentedSubtitles": "Subtítulos segmentados HLS",
+    "OptionHideUserFromLoginHelp": "Útil para cuentas de administrador privadas u ocultas. El usuario deberá iniciar sesión manualmente ingresando su nombre de usuario y contraseña.",
+    "OptionHideUser": "Ocultar a este usuario de las pantallas de inicio de sesión",
+    "OptionHasTrailer": "Avance",
+    "OptionHasThemeVideo": "Video temático",
+    "OptionHasThemeSong": "Tema musical",
+    "OptionHasSubtitles": "Subtítulos",
+    "OptionHasSpecialFeatures": "Características especiales",
+    "OptionFriday": "Viernes",
+    "OptionFavorite": "Favoritos",
+    "OptionExtractChapterImage": "Habilitar la extracción de imágenes de capítulos",
+    "OptionExternallyDownloaded": "Descarga externa",
+    "OptionEveryday": "Cada día",
+    "OptionEstimateContentLength": "Estimar la longitud del contenido al transcodificar",
+    "OptionEquals": "Igual a",
+    "OptionEnded": "Terminó",
+    "OptionEnableM2tsModeHelp": "Habilite el modo m2ts al codificar en mpegts.",
+    "ReplaceExistingImages": "Reemplazar imágenes existentes",
+    "ReplaceAllMetadata": "Reemplazar todos los metadatos",
+    "RepeatOne": "Repetir uno",
+    "RepeatMode": "Modo de repetición",
+    "RepeatEpisodes": "Repetir capítulos",
+    "RepeatAll": "Repetir todo",
+    "Repeat": "Repetir",
+    "RemoveFromPlaylist": "Eliminar de la lista de reproducción",
+    "RemoveFromCollection": "Eliminar de la colección",
+    "RememberMe": "Recuérdame",
+    "ReleaseGroup": "Grupo de lanzamiento",
+    "ButtonCast": "Transmitir",
+    "ButtonSyncPlay": "SyncPlay",
+    "EnableBlurhashHelp": "Las imágenes que aún se están cargando se mostrarán con un marcador de posición borroso",
+    "EnableBlurhash": "Habilitar marcadores de posición borrosos para imágenes",
+    "OnApplicationStartup": "En el inicio de la aplicación",
+    "EveryXHours": "Cada {0} horas",
+    "EveryHour": "Cada hora",
+    "EveryXMinutes": "Cada {0} minutos",
+    "OnWakeFromSleep": "Al despertar del sueño",
+    "WeeklyAt": "{0}s en {1}",
+    "DailyAt": "Diariamente en {0}",
+    "LastSeen": "Visto por última vez {0}",
+    "PersonRole": "como {0}",
+    "ListPaging": "{0}-{1} de {2}",
+    "WriteAccessRequired": "El servidor Jellyfin requiere acceso de escritura a esta carpeta. Asegúrese del acceso de escritura e intente nuevamente.",
+    "PathNotFound": "La ruta no se pudo encontrar. Asegúrese de que la ruta sea válida e intente nuevamente.",
+    "Yes": "Sí",
+    "YadifBob": "YADIF Bob",
+    "Yadif": "YADIF",
+    "XmlTvSportsCategoriesHelp": "Los programas con estas categorías se mostrarán como programas deportivos. Separe múltiples con '|'.",
+    "XmlTvPathHelp": "Una ruta a un archivo XMLTV. Jellyfin leerá este archivo y lo revisará periódicamente en busca de actualizaciones. Usted es responsable de crear y actualizar el archivo.",
+    "XmlTvNewsCategoriesHelp": "Los programas con estas categorías se mostrarán como programas de noticias. Separe múltiples con '|'.",
+    "XmlTvMovieCategoriesHelp": "Los programas con estas categorías se mostrarán como películas. Separe múltiples con '|'.",
+    "XmlTvKidsCategoriesHelp": "Los programas con estas categorías se mostrarán como programas para niños. Separe múltiples con '|'.",
+    "XmlDocumentAttributeListHelp": "Estos atributos se aplican al elemento raíz de cada respuesta XML.",
+    "Writer": "Escritor",
+    "Whitelist": "Lista blanca",
+    "Wednesday": "Miércoles",
+    "Watched": "Visto",
+    "ViewPlaybackInfo": "Ver información de reproducción",
+    "ViewArtist": "Ver artista",
+    "ViewAlbum": "Ver álbum",
+    "VideoRange": "Rango de video",
+    "Vertical": "Vertical",
+    "ValueTimeLimitSingleHour": "Límite de tiempo: 1 hora",
+    "ValueTimeLimitMultiHour": "Límite de tiempo: {0} horas",
+    "ValueSongCount": "{0} canciones",
+    "ValueSeriesCount": "{0} series",
+    "ValueSeconds": "{0} segundos",
+    "ValueOneSong": "1 canción",
+    "ValueOneSeries": "1 serie",
+    "ValueOneMusicVideo": "1 video musical",
+    "ValueOneMovie": "1 película",
+    "ValueOneAlbum": "1 álbum",
+    "ValueMusicVideoCount": "{0} videos musicales",
+    "ValueMovieCount": "{0} películas",
+    "ValueMinutes": "{0} min",
+    "ValueOneEpisode": "1 capítulo",
+    "ValueEpisodeCount": "{0} capítulos",
+    "ValueDiscNumber": "Disco {0}",
+    "ValueContainer": "Contenedor: {0}",
+    "ValueAlbumCount": "{0} álbumes",
+    "UserAgentHelp": "Proporcione un encabezado HTTP de agente de usuario personalizado.",
+    "Upload": "Subir",
+    "Up": "Subir arriba",
+    "Unrated": "Sin calificación",
+    "Unplayed": "No reproducido",
+    "Unmute": "Dejar de silenciar",
+    "UninstallPluginHeader": "Desinstalar complemento",
+    "UninstallPluginConfirmation": "¿Estás seguro de que deseas desinstalar {0}?",
+    "Uniform": "Uniforme",
+    "TvLibraryHelp": "Revise la {0}guía de nombres de TV{1}.",
+    "Tuesday": "Martes",
+    "Transcoding": "Transcodificación",
+    "TrackCount": "{0} pistas",
+    "Track": "Pista",
+    "TitlePlayback": "Reproducción",
+    "TitleHostingSettings": "Configuraciones de alojamiento",
+    "TitleHardwareAcceleration": "Aceleración por hardware",
+    "Thursday": "Jueves",
+    "Thumb": "Pulgar",
+    "TheseSettingsAffectSubtitlesOnThisDevice": "Esta configuración afecta los subtítulos en este dispositivo",
+    "ThemeVideos": "Videos temáticos",
+    "ThemeSongs": "Canciones temáticas",
+    "TagsValue": "Etiquetas: {0}",
+    "Tags": "Etiquetas",
+    "TabUsers": "Usuarios",
+    "TabUpcoming": "Próximamente",
+    "TabTranscoding": "Transcodificación",
+    "MarkUnplayed": "Marcar no reproducido",
+    "MarkPlayed": "Marcar reproducido",
+    "LabelSkipForwardLength": "Saltar hacia adelante longitud:",
+    "Trailers": "Avances",
+    "TabTrailers": "Avances",
+    "TabSuggestions": "Sugerencias",
+    "TabStreaming": "Transmisión",
+    "TabSongs": "Canciones",
+    "TabShows": "Programas",
+    "TabSettings": "Configuraciones",
+    "TabServer": "Servidor",
+    "TabSeries": "Series",
+    "TabScheduledTasks": "Tareas programadas",
+    "TabResumeSettings": "Continuar",
+    "TabResponses": "Respuestas",
+    "TabRecordings": "Grabaciones",
+    "TabProfiles": "Perfiles",
+    "TabProfile": "Perfil",
+    "TabPlugins": "Complementos",
+    "TabPlaylists": "Listas de reproducción",
+    "TabPlaylist": "Lista de reproducción",
+    "TabPlayback": "Reproducción",
+    "TabPassword": "Contraseña",
+    "TabParentalControl": "Control parental",
+    "TabOther": "Otro",
+    "TabNotifications": "Notificaciones",
+    "TabNfoSettings": "Configuraciones de NFO",
+    "TabNetworking": "Redes",
+    "TabNetworks": "Redes",
+    "TabMyPlugins": "Mis complementos",
+    "TabMusicVideos": "Videos musicales",
+    "TabMusic": "Música",
+    "TabMovies": "Películas",
+    "TabMetadata": "Metadatos",
+    "TabLogs": "Registros",
+    "TabLiveTV": "TV en vivo",
+    "TabLatest": "Último",
+    "TabInfo": "Información",
+    "TabGuide": "Guía",
+    "TabGenres": "Géneros",
+    "TabFavorites": "Favoritos",
+    "TabDVR": "DVR",
+    "TabDisplay": "Pantalla",
+    "TabDirectPlay": "Reproducción directa",
+    "TabDevices": "Dispositivos",
+    "TabDashboard": "Tablero",
+    "TabContainers": "Contenedores",
+    "TabCollections": "Colecciones",
+    "TabCodecs": "Códecs",
+    "TabChannels": "Canales",
+    "TabRepositories": "Repositorios",
+    "TabCatalog": "Catálogo",
+    "TabArtists": "Artistas",
+    "TabAlbums": "Álbumes",
+    "TabAlbumArtists": "Artistas del álbum",
+    "TabAdvanced": "Avanzado",
+    "TabAccess": "Acceso",
+    "TV": "TV",
+    "SystemDlnaProfilesHelp": "Los perfiles del sistema son de solo lectura. Los cambios en un perfil del sistema se guardarán en un nuevo perfil personalizado.",
+    "SyncPlayAccessHelp": "Seleccione el nivel de acceso que este usuario tiene a la función SyncPlay. SyncPlay permite sincronizar la reproducción con otros dispositivos.",
+    "Sunday": "Domingo",
+    "Suggestions": "Sugerencias",
+    "Subtitles": "Subtítulos",
+    "SubtitleOffset": "Desplazamiento de subtítulos",
+    "SubtitleDownloadersHelp": "Habilite y clasifique sus descargadores de subtítulos preferidos en orden de prioridad.",
+    "SubtitleAppearanceSettingsDisclaimer": "Esta configuración no se aplicará a los subtítulos gráficos (PGS, DVD, etc.) ni a los subtítulos ASS/SSA que incorporen sus propios estilos.",
+    "SubtitleAppearanceSettingsAlsoPassedToCastDevices": "Esta configuración también se aplica a cualquier reproducción de Chromecast iniciada por este dispositivo.",
+    "Studios": "Estudios",
+    "StopRecording": "Detener grabación",
+    "Sports": "Deportes",
+    "SortName": "Ordenar por nombre",
+    "SortChannelsBy": "Ordenar canales por:",
+    "SortByValue": "Ordenar por {0}",
+    "Sort": "Ordenar",
+    "SmartSubtitlesHelp": "Los subtítulos que coincidan con la preferencia de idioma se cargarán cuando el audio esté en un idioma extranjero.",
+    "Smart": "Inteligente",
+    "Smaller": "Más pequeño",
+    "SmallCaps": "Letras minúsculas",
+    "Small": "Pequeño",
+    "SkipEpisodesAlreadyInMyLibraryHelp": "Los capítulos se compararán usando los números de temporada y episodio, cuando estén disponibles.",
+    "SkipEpisodesAlreadyInMyLibrary": "No grabar capítulos que ya están en mi biblioteca",
+    "SimultaneousConnectionLimitHelp": "El número máximo de transmisiones simultáneas permitidas. Ingrese 0 para ilimitado.",
+    "Filter": "Filtrar",
+    "New": "Nuevo",
+    "Shuffle": "Mezclar",
+    "ShowYear": "Mostrar año",
+    "ShowTitle": "Mostrar título",
+    "ShowMore": "Mostrar más",
+    "ShowLess": "Mostrar menos",
+    "ShowIndicatorsFor": "Mostrar indicadores para:",
+    "ShowAdvancedSettings": "Mostrar configuración avanzada",
+    "Share": "Compartir",
+    "SettingsWarning": "Cambiar estos valores puede causar inestabilidad o fallas de conectividad. Si tiene algún problema, le recomendamos cambiarlos a los valores predeterminados.",
+    "SettingsSaved": "Configuraciones guardadas.",
+    "Settings": "Configuraciones",
+    "ServerUpdateNeeded": "Este servidor Jellyfin necesita ser actualizado. Para descargar la última versión, visite {0}",
+    "ServerRestartNeededAfterPluginInstall": "El servidor Jellyfin deberá reiniciarse después de instalar un complemento.",
+    "ServerNameIsShuttingDown": "Servidor Jellyfin: {0} se está cerrando.",
+    "ServerNameIsRestarting": "Servidor Jellyfin: {0} se está reiniciando.",
+    "SeriesYearToPresent": "{0} - Presente",
+    "SeriesSettings": "Configuraciones de la serie",
+    "SeriesRecordingScheduled": "Grabación de la serie programada.",
+    "SeriesDisplayOrderHelp": "Ordenar capítulos por fecha de emisión, orden de DVD o numeración absoluta.",
+    "SeriesCancelled": "Series canceladas.",
+    "Series": "Series",
+    "SendMessage": "Enviar mensaje",
+    "SelectAdminUsername": "Seleccione un nombre de usuario para la cuenta de administrador.",
+    "Season": "Temporada",
+    "SearchResults": "Resultados de la búsqueda",
+    "SearchForSubtitles": "Buscar subtítulos",
+    "SearchForMissingMetadata": "Buscar metadatos faltantes",
+    "SearchForCollectionInternetMetadata": "Busque en Internet obras de arte y metadatos",
+    "Search": "Buscar",
+    "Screenshots": "Capturas de pantalla",
+    "Screenshot": "Captura de pantalla",
+    "Schedule": "Programación",
+    "ScanLibrary": "Escanear biblioteca",
+    "ScanForNewAndUpdatedFiles": "Escanear en busca de archivos nuevos y actualizados",
+    "SaveSubtitlesIntoMediaFoldersHelp": "Almacenar subtítulos junto a los archivos de video les permitirá administrarlos más fácilmente.",
+    "SaveSubtitlesIntoMediaFolders": "Guardar subtítulos en carpetas de medios",
+    "SaveChanges": "Guardar cambios",
+    "Save": "Guardar",
+    "Saturday": "Sábado",
+    "Runtime": "Tiempo de ejecución",
+    "RunAtStartup": "Ejecutar en el arranque",
+    "Rewind": "Rebobinar",
+    "ResumeAt": "Reanudar desde {0}",
+    "ButtonPlayer": "Reproductor",
+    "Writers": "Escritores",
+    "ClearQueue": "Eliminar cola",
+    "StopPlayback": "Detener reproducción",
+    "ViewAlbumArtist": "Ver artista del álbum"
 }
diff --git a/src/strings/es-mx.json b/src/strings/es-mx.json
index 3a711a558e..ca4973bd71 100644
--- a/src/strings/es-mx.json
+++ b/src/strings/es-mx.json
@@ -1066,7 +1066,7 @@
     "OptionReportByteRangeSeekingWhenTranscodingHelp": "Esto es requerido para algunos dispositivos que no pueden hacer búsquedas de tiempo muy bien.",
     "OptionRequirePerfectSubtitleMatch": "Solo descargar subtítulos que coincidan perfectamente con mis archivos de video",
     "OptionRequirePerfectSubtitleMatchHelp": "Solicitar una coincidencia perfecta filtrará los subtítulos para incluir solo aquellos que han sido probados y verificados exactamente con tu archivo de video. Desmarcar esta opción incrementará las probabilidades de que se descarguen subtítulos, pero incrementará las posibilidades de obtener subtítulos mal sincronizados o con texto incorrecto.",
-    "OptionResElement": "elemento res",
+    "OptionResElement": "Elemento res",
     "OptionResumable": "Reanudable",
     "OptionRuntime": "Duración",
     "OptionSaturday": "Sábado",
@@ -1159,7 +1159,6 @@
     "ReplaceAllMetadata": "Reemplazar todos los metadatos",
     "ReplaceExistingImages": "Reemplazar imágenes existentes",
     "RequiredForAllRemoteConnections": "Requerido para todas las conexiones remotas",
-    "RestartPleaseWaitMessage": "Por favor, espera mientras el servidor Jellyfin se apaga y reinicia. Esto puede tomar un minuto o dos.",
     "ResumeAt": "Reanudar desde {0}",
     "Rewind": "Rebobinar",
     "RunAtStartup": "Ejecutar al iniciar",
@@ -1361,7 +1360,6 @@
     "HeaderFavoriteSongs": "Canciones favoritas",
     "HeaderFavoriteVideos": "Videos favoritos",
     "HeaderHome": "Inicio",
-    "HeaderRestartingServer": "Reiniciando servidor",
     "HeaderVideos": "Videos",
     "Horizontal": "Horizontal",
     "LabelAudio": "Audio",
@@ -1426,7 +1424,7 @@
     "ValueSeriesCount": "{0} series",
     "Vertical": "Vertical",
     "OptionThumb": "Miniatura",
-    "OptionThumbCard": "Tarjeta miniatura",
+    "OptionThumbCard": "Miniatura",
     "HeaderFavoriteBooks": "Libros favoritos",
     "LabelPleaseRestart": "Los cambios tendrán efecto después de recargar manualmente el cliente web.",
     "LabelPlayMethod": "Método de reproducción:",
@@ -1453,7 +1451,6 @@
     "LabelTranscodingFramerate": "Velocidad de cuadros de la transcodificación:",
     "LabelSize": "Tamaño:",
     "SelectAdminUsername": "Por favor, selecciona un nombre de usuario para la cuenta de administrador.",
-    "EnableFastImageFadeInHelp": "Habilita una animación más rápida de desvanecimiento para las imágenes cargadas.",
     "LabelDroppedFrames": "Cuadros saltados:",
     "CopyStreamURLError": "Hubo un error al copiar la URL.",
     "ButtonSplit": "Dividir",
@@ -1484,14 +1481,13 @@
     "MessageConfirmAppExit": "¿Deseas salir?",
     "LabelVideoResolution": "Resolución de video:",
     "LabelStreamType": "Tipo de transmisión:",
-    "EnableFastImageFadeIn": "Desvanecimiento rápido de animaciones",
     "LabelPlayerDimensions": "Dimensiones del reproductor:",
     "LabelCorruptedFrames": "Cuadros corruptos:",
     "HeaderNavigation": "Navegación",
     "HeaderFavoritePeople": "Personas favoritas",
     "Episode": "Episodio",
     "ClientSettings": "Configuración del cliente",
-    "BoxSet": "Box Set",
+    "BoxSet": "Colección",
     "AskAdminToCreateLibrary": "Pide a un administrador crear una biblioteca.",
     "Artist": "Artista",
     "AllowFfmpegThrottlingHelp": "Cuando una transcodificación o remuxeado se adelanta lo suficiente de la posición de reproducción actual, se pausa el proceso para que consuma menos recursos. Esto es más útil cuando se mira sin buscar con frecuencia. Apaga esto si experimentas problemas de reproducción.",
@@ -1525,7 +1521,7 @@
     "HeaderHttpsSettings": "Opciones HTTPS",
     "HeaderDVR": "DVR",
     "ApiKeysCaption": "Lista de claves API actualmente habilitadas",
-    "SyncPlayAccessHelp": "Selecciona el nivel de acceso que este usuario tiene a la función SyncPlay. SyncPlay permite sincronizar la reproducción con otros dispositivos.",
+    "SyncPlayAccessHelp": "Selecciona el nivel de acceso que este usuario tiene en la función SyncPlay. SyncPlay permite sincronizar la reproducción con otros dispositivos.",
     "MessageSyncPlayErrorMedia": "¡Fallo al activar SyncPlay! Error en el archivo de medios.",
     "MessageSyncPlayErrorMissingSession": "¡Fallo al activar SyncPlay! Falta la sesión.",
     "MessageSyncPlayErrorNoActivePlayer": "No se ha encontrado ningún reproductor activo. SyncPlay ha sido desactivado.",
@@ -1556,5 +1552,29 @@
     "HeaderSyncPlayEnabled": "SyncPlay habilitado",
     "HeaderSyncPlaySelectGroup": "Unirse a un grupo",
     "EnableDetailsBannerHelp": "Mostrar una imagen banner en la parte superior de la página de detalles del elemento.",
-    "EnableDetailsBanner": "Banner de detalles"
+    "EnableDetailsBanner": "Banner de detalles",
+    "ButtonSyncPlay": "SyncPlay",
+    "ButtonPlayer": "Reproductor",
+    "ButtonCast": "Elenco",
+    "EnableBlurhashHelp": "Imágenes que aún están siendo cargadas serán mostradas difuminadas",
+    "EnableBlurhash": "Habilitar imágenes de fondo difuminadas",
+    "TabRepositories": "Repositorios",
+    "ShowMore": "Mostrar más",
+    "ShowLess": "Mostrar menos",
+    "MessageNoGenresAvailable": "Habilitar algunos proveedores de metadatos para traer los generos desde internet.",
+    "MessageAddRepository": "Si desea agregar un repositorio, haz click en el botón junto al encabezado y completa la información requerida.",
+    "LabelRepositoryNameHelp": "Un nombre personalizado para distinguir este repositorio de otros añadidos a tu servidor.",
+    "LabelRepositoryName": "Nombre del repositorio",
+    "LabelRepositoryUrlHelp": "La ubicación del repositorio que desea agregar.",
+    "LabelRepositoryUrl": "URL del repositorio",
+    "HeaderNewRepository": "Nuevo repositorio",
+    "MessageNoRepositories": "Sin repositorios.",
+    "EnableFasterAnimationsHelp": "Usar animaciones y transiciones más rapidas",
+    "EnableFasterAnimations": "Animaciones más rápidas",
+    "EnableDecodingColorDepth10Vp9": "Habilitar la decodificación por hardware de 10 bit para VP9",
+    "EnableDecodingColorDepth10Hevc": "Habilitar la decodificación por hardware de 10 bit para HEVC",
+    "ClearQueue": "Limpiar cola",
+    "StopPlayback": "Detener reproducción",
+    "Writers": "Escritores",
+    "ViewAlbumArtist": "Ver el artista del album"
 }
diff --git a/src/strings/es.json b/src/strings/es.json
index ab46562f94..640a51d634 100644
--- a/src/strings/es.json
+++ b/src/strings/es.json
@@ -1,9 +1,9 @@
 {
-    "AccessRestrictedTryAgainLater": "El acceso está restringido actualmente. Por favor, inténtalo más tarde.",
+    "AccessRestrictedTryAgainLater": "Actualmente el acceso está restringido. Por favor, inténtalo de nuevo más tarde.",
     "Add": "Añadir",
-    "AddItemToCollectionHelp": "Agregue elementos a las colecciones buscándolos y haciendo clic con el botón derecho o tocando los menús para agregarlos a una colección.",
-    "AddToCollection": "Añadir a la colección",
-    "AddToPlaylist": "Añadir a la lista de reproducción",
+    "AddItemToCollectionHelp": "Puedes añadir elementos a las colecciones buscándolos en tu biblioteca. Una vez hecho esto, abre el menú y selecciona 'Añadir a una colección'.",
+    "AddToCollection": "Añadir a una colección",
+    "AddToPlaylist": "Añadir a una lista de reproducción",
     "AddedOnValue": "Añadido {0}",
     "AdditionalNotificationServices": "Visite el catálogo de extensiones para instalar servicios de notificación adicionales.",
     "Albums": "Álbumes",
@@ -14,11 +14,11 @@
     "AllEpisodes": "Todos los episodios",
     "AllLanguages": "Todos los idiomas",
     "AllLibraries": "Todas las bibliotecas",
-    "AllowHWTranscodingHelp": "Permite al sintonizador transcodificar secuencias en vivo. Esto puede ayudar a reducir la transcodificación requerida por el servidor.",
+    "AllowHWTranscodingHelp": "Permite al sintonizador convertir el contenido directamente. Esto puede ayudar a reducir la potencia requerida por el servidor.",
     "AllowMediaConversion": "Permitir convertir los medios",
     "AllowMediaConversionHelp": "Concede o deniega el acceso a la función de conversión de medios.",
     "AllowOnTheFlySubtitleExtraction": "Permitir la extracción de subtítulos sobre la marcha",
-    "AllowOnTheFlySubtitleExtractionHelp": "Los subtítulos incrustados pueden extraerse de los vídeos y enviarse en texto sin formato para ayudar a evitar la transcodificación del vídeo. En algunos sistemas, esto puede llevar mucho tiempo y hacer que la reproducción de vídeo se bloquee durante el proceso de extracción. Deshabilite esta opción para tener subtítulos incrustados grabados con transcodificación de video cuando no sean compatibles de forma nativa con el cliente.",
+    "AllowOnTheFlySubtitleExtractionHelp": "Cuando el cliente sea compatible, los subtítulos pueden extraerse durante la reproducción para evitar convertir el vídeo. Sin embargo, y en algunos servidores, esto puede llevar mucho tiempo y hacer que la reproducción tenga cortes durante el proceso. Deshabilita esta opción para grabar los subtítulos directamente en el vídeo cuando no sean compatibles de forma nativa con el cliente.",
     "AllowRemoteAccess": "Permitir conexiones remotas a este servidor Jellyfin.",
     "AllowRemoteAccessHelp": "Si no está activado, todas las conexiones remotas serán bloqueadas.",
     "AllowedRemoteAddressesHelp": "Lista separada por comas de direcciones IP o entradas de IP / máscara de red para redes a las que se les permitirá conectarse de forma remota. Si se deja en blanco, se permitirán todas las direcciones remotas.",
@@ -192,7 +192,7 @@
     "ExitFullscreen": "Quitar pantalla completa",
     "ExtraLarge": "Extragrande",
     "ExtractChapterImagesHelp": "La extracción de imágenes de capítulos permitirá a los clientes mostrar gráficamente la selección de escenas. El proceso puede ser lento, intensivo en recursos y requerir varios gigabytes de espacio. Se ejecuta cuando se añaden vídeos y también como tarea programable por la noche. El horario es configurable en el área de tareas programadas. No se recomienda ejecutar esta tarea durante las horas pico de uso.",
-    "FFmpegSavePathNotFound": "No podemos localizar FFmpeg usando la ruta que has ingresado. FFprobe también es necesario y debe existir en la misma carpeta. Estos componentes normalmente se agrupan juntos en la misma descarga. Compruebe la ruta y vuelva a intentarlo.",
+    "FFmpegSavePathNotFound": "No se ha podido localizar ffmpeg ni ffprobe en la ruta especificada. Comprueba la ruta y vuelva a intentarlo.",
     "FastForward": "Avanzar rápido",
     "Favorite": "Favorito",
     "Favorites": "Favoritos",
@@ -249,7 +249,7 @@
     "HeaderChannels": "Canales",
     "HeaderChapterImages": "Imágenes de capítulos",
     "HeaderCodecProfile": "Perfil de códec",
-    "HeaderCodecProfileHelp": "Perfiles de códec indican las limitaciones de un dispositivo cuando se reproducen códecs específicos. Si se aplica una limitación entonces el medio se transcodificará, incluso si el códec está configurado para reproducción directa.",
+    "HeaderCodecProfileHelp": "Los perfiles de los códecs indican las limitaciones de un dispositivo cuando reproduce un códec en específico. Si lo que se va a reproducir no está dentro de estos límites (por ejemplo, bitrate demasiado alto), el contenido se convertirá, incluso si el códec está configurado para reproducción directa.",
     "HeaderConfigureRemoteAccess": "Configurar acceso remoto",
     "HeaderConfirmPluginInstallation": "Confirmar la instalación del complemento",
     "HeaderConfirmProfileDeletion": "Confirmar borrado del perfil",
@@ -257,7 +257,7 @@
     "HeaderConnectToServer": "Conectar al servidor",
     "HeaderConnectionFailure": "Fallo de conexión",
     "HeaderContainerProfile": "Perfil de contenedor",
-    "HeaderContainerProfileHelp": "Perfiles de códec indican las limitaciones de un dispositivo mientras reproduce formatos específicos. Si se aplica una limitación entonces el medio se transcodificará, incluso si el formato está configurado para reproducción directa.",
+    "HeaderContainerProfileHelp": "Los perfiles de los contenedores indican las limitaciones de un dispositivo cuando reproduce contenido en un formato en específico. Si lo que se va a reproducir no está dentro de estos límites, el contenedor del contenido se cambiará, incluso si el formato está configurado para reproducción directa.",
     "HeaderContinueListening": "Continuar escuchando",
     "HeaderContinueWatching": "Continuar viendo",
     "HeaderCustomDlnaProfiles": "Perfiles personalizados",
@@ -375,8 +375,8 @@
     "HeaderSelectServer": "Selecionar servidor",
     "HeaderSelectServerCachePath": "Seleccione la ruta para el caché del servidor",
     "HeaderSelectServerCachePathHelp": "Navega o introduce la ruta para alojar los archivos caché del servidor. Tienes que tener permisos de escritura en esa carpeta.",
-    "HeaderSelectTranscodingPath": "Seleccione la ruta temporal del transcodificador",
-    "HeaderSelectTranscodingPathHelp": "Busque o escriba la ruta de acceso que se utilizará para la transcodificación de archivos temporales. La carpeta debe tener permiso de escritura.",
+    "HeaderSelectTranscodingPath": "Ruta para los archivos temporales de las conversiones",
+    "HeaderSelectTranscodingPathHelp": "Busca o escribe la ruta que se utilizará para guardar los archivos temporales que se generarán mientras se convierten los archivos. Jellyfin debe tener permisos de escritura en la carpeta.",
     "HeaderSendMessage": "Enviar mensaje",
     "HeaderSeries": "Series",
     "HeaderSeriesOptions": "Opciones de series",
@@ -399,12 +399,12 @@
     "HeaderTags": "Etiquetas",
     "HeaderTaskTriggers": "Tareas de activación",
     "HeaderThisUserIsCurrentlyDisabled": "Este usuario está desactivado",
-    "HeaderTranscodingProfile": "Perfil de transcodificación",
-    "HeaderTranscodingProfileHelp": "Añadir perfiles de transcodificación para indicar qué formatos se deben utilizar cuando se requiera transcodificación.",
+    "HeaderTranscodingProfile": "Parámetros de conversión",
+    "HeaderTranscodingProfileHelp": "Añade los diferentes parámetros de conversión para este dispositivo, de manera que el servidor convierta automáticamente el contenido en un formato compatible para él.",
     "HeaderTunerDevices": "Sintonizadores",
     "HeaderTuners": "Sintonizadores",
     "HeaderTypeImageFetchers": "{0} capturadores de imágenes",
-    "HeaderTypeText": "Entrar texto",
+    "HeaderTypeText": "Introducir texto",
     "HeaderUpcomingOnTV": "Próximamente en la televisión",
     "HeaderUploadImage": "Subir imagen",
     "HeaderUser": "Usuario",
@@ -449,7 +449,7 @@
     "LabelAlbumArtPN": "Carátula del album PN:",
     "LabelAlbumArtists": "Artistas de los álbumes:",
     "LabelAll": "Todo",
-    "LabelAllowHWTranscoding": "Permitir transcodificación por hardware",
+    "LabelAllowHWTranscoding": "Activar la conversión acelerada por hardware",
     "LabelAllowServerAutoRestart": "Permitir al servidor reiniciarse automáticamente para aplicar las actualizaciones",
     "LabelAllowServerAutoRestartHelp": "El servidor solo se reiniciará durante periodos de reposo, cuando no haya usuarios activos.",
     "LabelAllowedRemoteAddresses": "Filtro de dirección IP remota:",
@@ -620,8 +620,8 @@
     "LabelMoviePrefix": "Prefijo de película:",
     "LabelMoviePrefixHelp": "Si se aplica un prefijo a títulos de películas, escríbalo para que el servidor pueda manejarlo correctamente.",
     "LabelMovieRecordingPath": "Ruta de grabaciones de películas (opcional):",
-    "LabelMusicStreamingTranscodingBitrate": "Tasa de bits de transcodificación de música:",
-    "LabelMusicStreamingTranscodingBitrateHelp": "Especifique una tasa de bits máxima cuando transmita música.",
+    "LabelMusicStreamingTranscodingBitrate": "Tasa de bits para la reproducción de música:",
+    "LabelMusicStreamingTranscodingBitrateHelp": "Tasa de bits máxima para la música.",
     "LabelName": "Nombre:",
     "LabelNewName": "Nuevo nombre:",
     "LabelNewPassword": "Nueva contraseña:",
@@ -667,14 +667,14 @@
     "LabelPublicHttpsPort": "Puerto público HTTPS:",
     "LabelPublicHttpsPortHelp": "Puerto público que debe ser enlazado al puerto local HTTPS.",
     "LabelReadHowYouCanContribute": "Aprenda cómo contribuir.",
-    "LabelReasonForTranscoding": "Motivo de la transcodificación:",
+    "LabelReasonForTranscoding": "Motivo por el que se realiza la conversión:",
     "LabelRecord": "Grabar:",
     "LabelRecordingPath": "Ruta de grabaciones por defecto:",
     "LabelRecordingPathHelp": "Especifica la ubicación por defecto para guardar las grabaciones. Si lo dejas vacío se usará la carpeta de datos del servidor.",
     "LabelRefreshMode": "Modo de refresco:",
     "LabelReleaseDate": "Fecha de lanzamiento:",
     "LabelRemoteClientBitrateLimit": "Límite de la transmisión de tasa de bits por internet (Mbps):",
-    "LabelRemoteClientBitrateLimitHelp": "Un límite opcional de tasa de bits para todos los dispositivos fuera de la red. Esto es útil para evitar que los dispositivos soliciten una tasa de bits más alta que la que su conexión a Internet puede manejar. Esto puede ocasionar una mayor carga de la CPU en su servidor para transcodificar vídeos sobre la marcha a una tasa de bits más baja.",
+    "LabelRemoteClientBitrateLimitHelp": "Especifica el bitrate máximo para los dispositivos que se encuentren fuera de la red local. Esto es útil para permitir la reproducción del contenido que tengas con una tasa de bits muy alta cuando la conexión a internet de tu servidor o la del cliente no sea lo suficientemente rápida. Esto ocasionará mayor carga, ya que el contenido que supere esta tasa de bits se convertirá para que esté dentro del límite establecido.",
     "LabelRuntimeMinutes": "Tiempo de ejecución (minutos):",
     "LabelSaveLocalMetadata": "Guardar imágenes y etiquetas en las carpetas de medios",
     "LabelSaveLocalMetadataHelp": "Guardar imágenes y etiquetas directamente en las carpetas en las que estén los elementos hará que se puedan editar más fácilmente.",
@@ -694,7 +694,7 @@
     "LabelSkipIfAudioTrackPresent": "Omitir si la pista de audio por defecto coincide con el idioma de descarga",
     "LabelSkipIfAudioTrackPresentHelp": "Desactive esta opción para asegurar que todos los vídeos tienen subtítulos, sin importar el idioma de audio.",
     "LabelSkipIfGraphicalSubsPresent": "Saltar si el vídeo tiene subtítulos integrados",
-    "LabelSkipIfGraphicalSubsPresentHelp": "Mantener versiones de texto de subtítulos dará lugar a una entrega más eficiente y a disminuir la probabilidad de transcodificación de vídeo.",
+    "LabelSkipIfGraphicalSubsPresentHelp": "Mantener versiones de los subtítulos en texto plano puede hacer que la reproducción sea más eficiente en un número mayor de dispositivos, evitando la conversión del vídeo.",
     "LabelSonyAggregationFlags": "Agregación de banderas Sony:",
     "LabelSonyAggregationFlagsHelp": "Determina el contenido del elemento aggregationFlags en el espacio de nombre urn:schemas-sonycom:av.",
     "LabelSortTitle": "Clasificar por título:",
@@ -721,9 +721,9 @@
     "LabelTrackNumber": "Número de pista:",
     "LabelTranscodingAudioCodec": "Códec de audio:",
     "LabelTranscodingContainer": "Contenedor:",
-    "LabelTranscodingTempPathHelp": "Establece la ruta personaliza para la transcodificación de archivos servidos a los clientes. Dejar en blanco para usar la ruta por defecto del servidor.",
-    "LabelTranscodingThreadCount": "Cantidad de instancias de transcodificación:",
-    "LabelTranscodingThreadCountHelp": "Selecciona el número máximo de instancias de transcodificación. Reducirlas disminuirá el uso del procesador pero puede no convertirá lo suficientemente rápido para una reproducción fluida.",
+    "LabelTranscodingTempPathHelp": "Establece la carpeta que se usará para almacenar los archivos temporales de las conversiones. Déjalo en blanco para usar la ruta por defecto.",
+    "LabelTranscodingThreadCount": "Núcleos a utilizar durante la conversión:",
+    "LabelTranscodingThreadCountHelp": "Selecciona el número de núcleos a utilizar para la conversión. A menos núcleos, menor será el uso del procesador, pero puede que la conversión no vaya lo suficientemente rápido para una reproducción fluida.",
     "LabelTranscodingVideoCodec": "Códec de video:",
     "LabelTriggerType": "Tipo de evento:",
     "LabelTunerIpAddress": "IP del sintonizador:",
@@ -749,8 +749,8 @@
     "LabelYourFirstName": "Tu nombre:",
     "LabelYoureDone": "¡Ya está!",
     "LabelZipCode": "Código postal:",
-    "LabelffmpegPath": "Ruta de FFmpeg:",
-    "LabelffmpegPathHelp": "a ruta de acceso al archivo de la aplicación FFmpeg o la carpeta que contiene FFmpeg.",
+    "LabelffmpegPath": "Ruta de ffmpeg:",
+    "LabelffmpegPathHelp": "Carpeta donde se encuentra ffmpeg, el componente utilizado para realizar las conversiones. No la cambies a no ser que sepas lo que haces.",
     "LanNetworksHelp": "Lista de direcciones IP separadas por comas o entradas de dirección IP / máscara de red para redes que se considerarán en la red local al imponer restricciones de ancho de banda. Si se establece, todas las demás direcciones IP se considerarán en la red externa y estarán sujetas a las restricciones de ancho de banda externo. Si se deja en blanco, solo se considera que la subred del servidor está en la red local.",
     "Large": "Grande",
     "LatestFromLibrary": "Reciente en {0}",
@@ -821,7 +821,7 @@
     "MessageNoAvailablePlugins": "No hay extensiones disponibles.",
     "MessageNoMovieSuggestionsAvailable": "No hay sugerencias de películas disponibles. Comience ver y calificar sus películas y vuelva para ver las recomendaciones.",
     "MessageNoPluginsInstalled": "No hay extensiones instaladas.",
-    "MessageNoTrailersFound": "No se han encontrado tráilers. Instala el canal de tráilers para mejorar su experiencia añadiendo una biblioteca de tráilers por internet.",
+    "MessageNoTrailersFound": "Instale el canal de tráilers para mejorar su experiencia cinematográfica agregando una biblioteca de tráilers de Internet.",
     "MessageNothingHere": "Nada aquí.",
     "MessagePasswordResetForUsers": "Se ha restablecido las contraseñas a los siguientes usuarios. Ahora pueden iniciar sesión con los códigos PIN que usaron para el restablecimiento.",
     "MessagePleaseEnsureInternetMetadata": "Asegúrate de que la descarga de etiquetas desde internet está activada.",
@@ -874,21 +874,21 @@
     "OptionAlbum": "Álbum",
     "OptionAlbumArtist": "Artista de álbum",
     "OptionAllUsers": "Todos los usuarios",
-    "OptionAllowAudioPlaybackTranscoding": "Permitir reproducción de audio que requiere transcodificación",
+    "OptionAllowAudioPlaybackTranscoding": "Activar la conversión del audio",
     "OptionAllowBrowsingLiveTv": "Permitir acceso a la televisión en directo",
     "OptionAllowContentDownloading": "Permitir la descarga de medios",
     "OptionAllowLinkSharing": "Permitir compartir los medios en redes sociales",
     "OptionAllowLinkSharingHelp": "Sólo se comparten las páginas web con información de medios. Los archivos nunca se comparten públicamente. Lo compartido expirará después de {0} días.",
     "OptionAllowManageLiveTv": "Habilitar la administración de grabación de la televisión en directo",
     "OptionAllowMediaPlayback": "Permitir la reproducción de medios",
-    "OptionAllowMediaPlaybackTranscodingHelp": "Restringir el acceso a la transcodificación puede causar fallos de reproducción en aplicaciones Jellyfin debido a formatos de medios no compatibles.",
+    "OptionAllowMediaPlaybackTranscodingHelp": "Con la conversión, el servidor se asegura que cualquier cliente es capaz de reproducir el contenido, sin importar su formato. Al desactivar la conversión de alguno de estos elementos, es posible que los vídeos no tengan audio o que, directamente, no se pueda reproducir el archivo por no ser compatible con el dispositivo. Para evitar problemas con la reproducción es mejor dejarlas todas por defecto.",
     "OptionAllowRemoteControlOthers": "Habilitar el control remoto de otros usuarios",
     "OptionAllowRemoteSharedDevices": "Habilitar el control remoto de otros equipos compartidos",
     "OptionAllowRemoteSharedDevicesHelp": "Los equipos DLNA son considerados compartidos hasta que un usuario empiece a controlarlos.",
-    "OptionAllowSyncTranscoding": "Permitir la descarga que requiera transcodificación",
+    "OptionAllowSyncTranscoding": "Permitir la conversión del contenido cuando se descargue o se sincronice",
     "OptionAllowUserToManageServer": "Permite a este usuario administrar el servidor",
-    "OptionAllowVideoPlaybackRemuxing": "Permitir la reproducción de vídeo que requiere conversión sin necesidad de volver a codificar",
-    "OptionAllowVideoPlaybackTranscoding": "Permitir reproducción de vídeo que requiere transcodificación",
+    "OptionAllowVideoPlaybackRemuxing": "Activar el cambio de contenedor para el contenido cuyo audio y vídeo es compatible, pero no lo es su contenedor",
+    "OptionAllowVideoPlaybackTranscoding": "Activar la conversión del vídeo",
     "OptionArtist": "Artista",
     "OptionAscending": "Ascendente",
     "OptionAutomaticallyGroupSeries": "Combinar automáticamente series que se distribuyen en varias carpetas",
@@ -935,7 +935,7 @@
     "OptionEnableM2tsModeHelp": "Activar modo M2TS cuando se codifique a MPEGTS.",
     "OptionEnded": "Finalizado",
     "OptionEquals": "Igual",
-    "OptionEstimateContentLength": "Estimar la longitud del contenido al transcodificar",
+    "OptionEstimateContentLength": "Estimar la longitud del contenido al convertirse",
     "OptionEveryday": "Todos los días",
     "OptionExternallyDownloaded": "Descarga externa",
     "OptionExtractChapterImage": "Habilitar la extracción de imágenes de los capítulos",
@@ -949,7 +949,7 @@
     "OptionHideUserFromLoginHelp": "Útil para privado o cuentas de administradores escondidos. El usuario tendrá que acceder entrando su nombre de usuario y contraseña manualmente.",
     "OptionHlsSegmentedSubtitles": "Subtítulos segmentados HLS",
     "OptionHomeVideos": "Fotos",
-    "OptionIgnoreTranscodeByteRangeRequests": "Ignorar las solicitudes de intervalo de bytes de transcodificación",
+    "OptionIgnoreTranscodeByteRangeRequests": "En las conversiones, ignorar las solicitudes de un intervalo específico de bytes",
     "OptionIgnoreTranscodeByteRangeRequestsHelp": "Si está activado, estas solicitudes serán atendidas pero ignorarán el encabezado de intervalo de bytes.",
     "OptionImdbRating": "Valoración IMDb",
     "OptionLikes": "Me gusta",
@@ -973,8 +973,8 @@
     "OptionProfileVideoAudio": "Vídeo y audio",
     "OptionProtocolHls": "Emisión HTTP en directo",
     "OptionReleaseDate": "Fecha de lanzamiento",
-    "OptionReportByteRangeSeekingWhenTranscoding": "Indicar que el servidor soporta la búsqueda de byte al transcodificar",
-    "OptionReportByteRangeSeekingWhenTranscodingHelp": "Esto es necesario para algunos dispositivos que no buscan el tiempo muy bien.",
+    "OptionReportByteRangeSeekingWhenTranscoding": "Indicar que el servidor soporta la búsqueda de byte al convertir",
+    "OptionReportByteRangeSeekingWhenTranscodingHelp": "Esto es necesario para los dispositivos que no cambian entre los diferentes puntos de tiempo del contenido correctamente.",
     "OptionRequirePerfectSubtitleMatch": "Sólo descargar subtítulos que son una combinación perfecta para mis archivos de vídeo",
     "OptionRequirePerfectSubtitleMatchHelp": "Requerir una coincidencia perfecta filtra los subtítulos para incluir sólo aquellos que coinciden con el archivo de vídeo. Desmarcando esta opción, aumentará la probabilidad de que los subtítulos se descarguen, pero puede que el texto del subtítulo no coincida con el vídeo.",
     "OptionResElement": "Elemento res",
@@ -1160,7 +1160,7 @@
     "TabSongs": "Canciones",
     "TabStreaming": "Transmisión",
     "TabSuggestions": "Sugerencias",
-    "TabTranscoding": "Transcodificación",
+    "TabTranscoding": "Conversión",
     "TabUpcoming": "Próximos",
     "TabUsers": "Usuarios",
     "Tags": "Etiquetas",
@@ -1173,7 +1173,7 @@
     "TitleHostingSettings": "Configuración del alojamiento",
     "TitlePlayback": "Reproducción",
     "TrackCount": "{0} pistas",
-    "Transcoding": "Transcodificación",
+    "Transcoding": "Conversión",
     "Tuesday": "Martes",
     "TvLibraryHelp": "Revisar la {0}guía de nombres de los programas de TV{1}.",
     "UninstallPluginConfirmation": "¿Esta seguro que desea desinstalar {0}?",
@@ -1205,7 +1205,7 @@
     "ValueTimeLimitSingleHour": "Tiempo límite: 1 hora",
     "ValueVideoCodec": "Códec de video: {0}",
     "ViewAlbum": "Ver album",
-    "ViewArtist": "Ver artista",
+    "ViewAlbumArtist": "Ver artista del álbum",
     "ViewPlaybackInfo": "Ver información de la reproducción",
     "Watched": "Visto",
     "Wednesday": "Miércoles",
@@ -1351,12 +1351,11 @@
     "HeaderFavoriteSongs": "Canciones favoritas",
     "HeaderFavoriteVideos": "Vídeos favoritos",
     "HeaderHome": "Inicio",
-    "HeaderRestartingServer": "Reiniciando servidor",
     "LabelAuthProvider": "Proveedor de autenticación:",
     "LabelPasswordResetProvider": "Proveedor de restablecimiento de contraseña:",
     "LabelServerName": "Nombre del servidor:",
-    "LabelTranscodePath": "Ruta de transcodificación:",
-    "LabelTranscodes": "Transcodificaciones:",
+    "LabelTranscodePath": "Ruta para los archivos temporales de las conversiones:",
+    "LabelTranscodes": "Archivos temporales de las conversiones:",
     "LabelUserLoginAttemptsBeforeLockout": "Intentos fallidos de inicio de sesión antes de que el usuario sea bloqueado:",
     "DashboardVersionNumber": "Versión: {0}",
     "DashboardServerName": "Servidor: {0}",
@@ -1397,7 +1396,6 @@
     "Premiere": "Estreno",
     "Raised": "Elevación",
     "RefreshDialogHelp": "Las etiquetas se actualizan basándose en las configuraciones y los servicios de internet activados desde el panel de control de Jellyfin.",
-    "RestartPleaseWaitMessage": "Por favor, espera mientras el servidor Jellyfin se reinicia. Esto puede tardar un minuto o dos.",
     "RunAtStartup": "Ejecutar al iniciar",
     "Series": "Series",
     "SeriesDisplayOrderHelp": "Ordena los episodios por fecha de emisión, orden de DVD o número absoluto.",
@@ -1432,8 +1430,8 @@
     "MoreMediaInfo": "Información del archivo",
     "LabelVideoCodec": "Codec de video:",
     "LabelVideoBitrate": "Bitrade de video:",
-    "LabelTranscodingProgress": "Progreso de la transcodificación:",
-    "LabelTranscodingFramerate": "Velocidad de fotogramas de la transcodificación:",
+    "LabelTranscodingProgress": "Progreso de la conversión:",
+    "LabelTranscodingFramerate": "Velocidad de la conversión:",
     "LabelSize": "Tamaño:",
     "LabelPleaseRestart": "Los cambios surtirán efecto tras recargar manualmente el cliente web.",
     "LabelPlayMethod": "Método de reproducción:",
@@ -1458,12 +1456,12 @@
     "ButtonSplit": "Dividir",
     "HeaderNavigation": "Navegación",
     "MessageConfirmAppExit": "¿Quieres salir?",
-    "EnableFastImageFadeInHelp": "Mostrar carteles y otras imágenes con difuminado rápido cuando termine la carga.",
-    "EnableFastImageFadeIn": "Difuminado rápido de imágenes",
+    "EnableFasterAnimationsHelp": "Las animaciones y transiciones durarán menos tiempo",
+    "EnableFasterAnimations": "Animaciones más rápidas",
     "CopyStreamURLError": "Ha habido un error copiando la dirección.",
-    "AllowFfmpegThrottlingHelp": "Cuando una transcodificación o un remux se adelanta lo suficiente desde la posición de reproducción actual, pause el proceso para que consuma menos recursos. Esto es más útil cuando se reproduce de forma linear, sin saltar de posición de reproducción a menudo. Desactívelo si experimenta problemas de reproducción.",
+    "AllowFfmpegThrottlingHelp": "Las conversiones se pausarán cuando se adelanten lo suficiente desde la posición en la que se encuentre el reproductor. Puede reducir la carga en el servidor y es útil cuando se reproduce de forma continua, sin saltar entre intervalos de tiempo, pero puede que tengas que desactivarlo si experimentas problemas en la reproducción o cambias de posición frecuentemente mientras reproduces contenido.",
     "PlaybackErrorNoCompatibleStream": "Este contenido no es compatible con este dispositivo y no se puede reproducir: No se puede obtener del servidor en un formato compatible.",
-    "OptionForceRemoteSourceTranscoding": "Forzar la transcodificación para fuentes remotas de medios (como LiveTV)",
+    "OptionForceRemoteSourceTranscoding": "Forzar la conversión para fuentes externas (como la televisión en directo)",
     "NoCreatedLibraries": "Parece que aún no se han creado librearías. {0}¿Quiere crear una ahora?{1}",
     "LabelVideoResolution": "Resolución de video:",
     "LabelStreamType": "Tipo de stream:",
@@ -1471,7 +1469,7 @@
     "LabelDroppedFrames": "Frames perdidos:",
     "LabelCorruptedFrames": "Frames corruptos:",
     "AskAdminToCreateLibrary": "Solo un administrador puede crear librerías.",
-    "AllowFfmpegThrottling": "Acelerar transcodificación",
+    "AllowFfmpegThrottling": "Pausar las conversiones",
     "ClientSettings": "Ajustes de cliente",
     "PreferEmbeddedEpisodeInfosOverFileNames": "Priorizar la información embebida sobre los nombres de archivos",
     "PreferEmbeddedEpisodeInfosOverFileNamesHelp": "Usar la información de episodio de los metadatos embebidos si está disponible.",
@@ -1499,7 +1497,7 @@
     "AlbumArtist": "Artista del álbum",
     "Album": "Álbum",
     "LabelDeinterlaceMethod": "Metodo de desentrelazar:",
-    "DeinterlaceMethodHelp": "Seleccione el método de desentrelazar para el transcodificar de contenido entrelazado.",
+    "DeinterlaceMethodHelp": "Seleccione el tipo de filtro que se aplicará para desentrelazar el contenido que esté entrelazado durante la conversión.",
     "LabelLibraryPageSize": "Tamaño de la página de la biblioteca:",
     "LabelLibraryPageSizeHelp": "Establece la cantidad de artículos a mostrar en una página de la biblioteca. Ponlo en 0 para desactivar la paginación.",
     "UnsupportedPlayback": "No es posible desencriptar contenido protegido mediante DRM; sin embargo se intentará su reproducción. Algunos archivos pueden aparecer completamente negros debido a encriptación u otras características no soportadas, como títulos interactivos.",
@@ -1524,8 +1522,10 @@
     "LabelEnableHttps": "Activar HTTPS",
     "TabDVR": "DVR",
     "SaveChanges": "Guardar cambios",
+    "EnableBlurhash": "Mostrar una representación de las imágenes mientras cargan",
+    "EnableBlurhashHelp": "Aparecerá una representación de los colores de las imágenes antes de que terminen de cargar",
     "HeaderDVR": "DVR",
-    "SyncPlayAccessHelp": "Selecciona los permisos de este usuario para utilizar SyncPlay. SyncPlay te permite sincroniza la reproducción entre varios dispositivos.",
+    "SyncPlayAccessHelp": "Selecciona el nivel de acceso de este usuario para utilizar SyncPlay. SyncPlay te permite sincronizar la reproducción entre varios dispositivos.",
     "MessageSyncPlayErrorMedia": "¡No se pudo activar SyncPlay! Error de medio.",
     "MessageSyncPlayErrorMissingSession": "¡No se pudo activar SyncPlay! Sesión desconectada.",
     "MessageSyncPlayErrorNoActivePlayer": "No hay reproductor activo. SyncPlay ha sido desactivado.",
@@ -1556,5 +1556,24 @@
     "HeaderSyncPlayEnabled": "Syncplay activo",
     "HeaderSyncPlaySelectGroup": "Unirse a un grupo",
     "EnableDetailsBannerHelp": "Mostrar imagen de banner en el tope de la página de detalles del elemento.",
-    "EnableDetailsBanner": "Barra de Detalles"
+    "EnableDetailsBanner": "Barra de Detalles",
+    "ShowMore": "Ver más",
+    "ShowLess": "Ver menos",
+    "ButtonSyncPlay": "SyncPlay",
+    "ButtonCast": "Enviar",
+    "MessageNoGenresAvailable": "Permitir a algunos proveedores de metadatos extraer géneros de Internet.",
+    "EnableDecodingColorDepth10Vp9": "Habilite la decodificación por hardware de 10 bits para VP9",
+    "EnableDecodingColorDepth10Hevc": "Habilite la decodificación por hardware de 10 bits para HEVC",
+    "ButtonPlayer": "Reproductor",
+    "TabRepositories": "Repositorios",
+    "MessageAddRepository": "Si desea agregar un repositorio, haga click en el botón cerca del encabezado y complete la información requerida.",
+    "LabelRepositoryNameHelp": "Un nombre personalizado para distinguir este repositorio de otros agregados a su servidor.",
+    "LabelRepositoryName": "Nombre del repositorio",
+    "LabelRepositoryUrlHelp": "La ubicación del repositorio que desea incluir.",
+    "LabelRepositoryUrl": "URL del repositorio",
+    "HeaderNewRepository": "Nuevo repositorio",
+    "MessageNoRepositories": "Sin repositorios.",
+    "Writers": "Escritores",
+    "StopPlayback": "Detener la reproducción",
+    "ClearQueue": "Borrar la cola"
 }
diff --git a/src/strings/es_419.json b/src/strings/es_419.json
new file mode 100644
index 0000000000..871f43a372
--- /dev/null
+++ b/src/strings/es_419.json
@@ -0,0 +1,1572 @@
+{
+    "ValueSpecialEpisodeName": "Especial - {0}",
+    "Sync": "Sincronizar",
+    "Songs": "Canciones",
+    "Shows": "Programas",
+    "Playlists": "Listas de reproducción",
+    "Photos": "Fotos",
+    "Movies": "Películas",
+    "HeaderNextUp": "A continuación",
+    "HeaderLiveTV": "TV en vivo",
+    "HeaderFavoriteSongs": "Canciones favoritas",
+    "HeaderFavoriteShows": "Programas favoritos",
+    "HeaderFavoriteEpisodes": "Episodios favoritos",
+    "HeaderFavoriteArtists": "Artistas favoritos",
+    "HeaderFavoriteAlbums": "Álbumes favoritos",
+    "HeaderContinueWatching": "Continuar viendo",
+    "HeaderAlbumArtists": "Artistas del álbum",
+    "Genres": "Géneros",
+    "Folders": "Carpetas",
+    "Favorites": "Favoritos",
+    "Collections": "Colecciones",
+    "Channels": "Canales",
+    "Books": "Libros",
+    "Artists": "Artistas",
+    "Albums": "Álbumes",
+    "TabLatest": "Recientes",
+    "HeaderUser": "Usuario",
+    "AlbumArtist": "Artista del álbum",
+    "Album": "Álbum",
+    "Aired": "Transmitido",
+    "AirDate": "Fecha de emisión",
+    "AdditionalNotificationServices": "Explora el catálogo de complementos para instalar servicios de notificaciones adicionales.",
+    "AddedOnValue": "Agregado {0}",
+    "AddToPlaylist": "Agregar a lista de reproducción",
+    "AddToPlayQueue": "Agregar a la cola de reproducción",
+    "AddToCollection": "Agregar a colección",
+    "AddItemToCollectionHelp": "Agrega elementos a las colecciones buscándolos y utilizando sus menúes al hacer clic derecho o al tocarlos para agregarlos a una colección.",
+    "Add": "Agregar",
+    "Actor": "Actor",
+    "AccessRestrictedTryAgainLater": "El acceso está restringido actualmente. Por favor, inténtalo más tarde.",
+    "Absolute": "Absoluto",
+    "YadifBob": "YADIF Bob",
+    "Trailers": "Trailers",
+    "TabTrailers": "Trailers",
+    "ReleaseGroup": "Grupo que lo estrenó",
+    "OptionThumbCard": "Miniatura de imagen",
+    "OptionResElement": "elemento reanudable",
+    "OptionCaptionInfoExSamsung": "CaptionInfoEx (Samsung)",
+    "OptionBluray": "Blu-ray",
+    "OptionBlockTrailers": "Trailers",
+    "LabelNightly": "Construcciones nocturnas",
+    "HeaderVideos": "Videos",
+    "Director": "Director",
+    "Depressed": "No presionado",
+    "BoxSet": "Caja",
+    "UnsupportedPlayback": "Jellyfin no puede desencriptar contenido protegido por DRM de todas formas todo el contenido será intentado, incluyendo los títulos protegidos. Algunos archivos pueden aparecer completamente en negro debido al encriptado o características no soportadas, como títulos interactivos.",
+    "OnApplicationStartup": "Cuando se inicia la aplicación",
+    "EveryXHours": "Cada {0} horas",
+    "EveryHour": "Cada hora",
+    "EveryXMinutes": "Cada {0} minutos",
+    "OnWakeFromSleep": "Al despertar de la suspensión",
+    "WeeklyAt": "{0}s a las {1}",
+    "DailyAt": "Diariamente a las {0}",
+    "LastSeen": "Ultima vez visto {0}",
+    "PersonRole": "como {0}",
+    "ListPaging": "{0}-{1} de {2}",
+    "WriteAccessRequired": "El servidor Jellyfin requiere permiso de escritura en esta carpeta. Por favor, asegúrate de tener acceso de escritura e inténtalo de nuevo.",
+    "PathNotFound": "No se pudo encontrar la ruta. Por favor, asegúrate de que la ruta es válida e inténtalo de nuevo.",
+    "Yesterday": "Ayer",
+    "Yes": "Sí",
+    "Yadif": "YADIF",
+    "XmlTvSportsCategoriesHelp": "Los programas con estas categorías serán mostrados como programas deportivos. Separa varios con un «|».",
+    "XmlTvPathHelp": "Una ruta a un archivo XMLTV. Jellyfin leerá este archivo y lo revisará periódicamente en busca de actualizaciones. Tú eres responsable de crear y actualizar el archivo.",
+    "XmlTvNewsCategoriesHelp": "Los programas con estas categorías serán mostrados como programas de noticias. Separa varios con un «|».",
+    "XmlTvMovieCategoriesHelp": "Los programas con estas categorías serán mostrados como películas. Separa varios con un «|».",
+    "XmlTvKidsCategoriesHelp": "Los programas con estas categorías serán mostrados como programas infantiles. Separa varios con un «|».",
+    "XmlDocumentAttributeListHelp": "Estos atributos se aplican al elemento raíz de cada respuesta XML.",
+    "Writer": "Escritor",
+    "WizardCompleted": "Eso es todo lo que necesitamos por ahora. Jellyfin ha comenzado a recolectar información sobre tu biblioteca de medios. Revisa alguna de nuestras aplicaciones, y luego haz clic en <b>Finalizar</b> para ver el <b>Panel de control</b>.",
+    "Whitelist": "Lista blanca",
+    "WelcomeToProject": "¡Bienvenido a Jellyfin!",
+    "Wednesday": "Miércoles",
+    "Watched": "Visto",
+    "ViewPlaybackInfo": "Ver información de reproducción",
+    "ViewArtist": "Ver artista",
+    "ViewAlbum": "Ver álbum",
+    "VideoRange": "Rango de video",
+    "Vertical": "Vertical",
+    "ValueVideoCodec": "Códec de video: {0}",
+    "ValueTimeLimitSingleHour": "Límite de tiempo: 1 hora",
+    "ValueTimeLimitMultiHour": "Límite de tiempo: {0} horas",
+    "ValueSongCount": "{0} canciones",
+    "ValueSeriesCount": "{0} series",
+    "ValueSeconds": "{0} segundos",
+    "ValueOneSong": "1 canción",
+    "ValueOneSeries": "1 serie",
+    "ValueOneMusicVideo": "1 video musical",
+    "ValueOneMovie": "1 película",
+    "ValueOneEpisode": "1 episodio",
+    "ValueOneAlbum": "1 álbum",
+    "ValueMusicVideoCount": "{0} videos musicales",
+    "ValueMovieCount": "{0} películas",
+    "ValueMinutes": "{0} min",
+    "ValueEpisodeCount": "{0} episodios",
+    "ValueDiscNumber": "Disco {0}",
+    "ValueContainer": "Contenedor: {0}",
+    "ValueConditions": "Condiciones: {0}",
+    "ValueCodec": "Códec: {0}",
+    "ValueAudioCodec": "Códec de audio: {0}",
+    "ValueAlbumCount": "{0} álbumes",
+    "UserProfilesIntro": "Jellyfin incluye soporte para perfiles de usuario con detalladas configuraciones de pantalla, estado de reproducción y controles parentales.",
+    "UserAgentHelp": "Proporciona un encabezado HTTP de agente de usuario personalizado.",
+    "Upload": "Subir",
+    "Up": "Arriba",
+    "Unrated": "Sin clasificar",
+    "Unplayed": "No reproducido",
+    "Unmute": "Activar sonido",
+    "UninstallPluginHeader": "Desinstalar complemento",
+    "UninstallPluginConfirmation": "¿Estás seguro de querer desinstalar {0}?",
+    "Uniform": "Uniforme",
+    "TvLibraryHelp": "Revisa la {0}guía de nombrado de series de TV{1}.",
+    "Tuesday": "Martes",
+    "Transcoding": "Transcodificando",
+    "TrackCount": "{0} pistas",
+    "Track": "Pista",
+    "TitlePlayback": "Reproducción",
+    "TitleHostingSettings": "Configuraciones de alojamiento",
+    "TitleHardwareAcceleration": "Aceleración por hardware",
+    "Thursday": "Jueves",
+    "Thumb": "Miniatura",
+    "ThisWizardWillGuideYou": "Este asistente te guiará a través del proceso de instalación. Para comenzar, por favor, selecciona tu idioma preferido.",
+    "TheseSettingsAffectSubtitlesOnThisDevice": "Estas configuraciones afectan a los subtítulos en este dispositivo",
+    "ThemeVideos": "Videos temáticos",
+    "ThemeSongs": "Canciones temáticas",
+    "TellUsAboutYourself": "Háblanos de ti",
+    "TagsValue": "Etiquetas: {0}",
+    "Tags": "Etiquetas",
+    "TabUsers": "Usuarios",
+    "TabUpcoming": "Próximamente",
+    "TabTranscoding": "Transcodificación",
+    "TabSuggestions": "Sugerencias",
+    "TabStreaming": "Transmisión",
+    "TabSongs": "Canciones",
+    "TabShows": "Programas",
+    "TabSettings": "Configuración",
+    "TabServer": "Servidor",
+    "TabSeries": "Series",
+    "TabScheduledTasks": "Tareas programadas",
+    "TabResumeSettings": "Reanudar",
+    "TabResponses": "Respuestas",
+    "TabRecordings": "Grabaciones",
+    "TabProfiles": "Perfiles",
+    "TabProfile": "Perfil",
+    "TabPlugins": "Complementos",
+    "TabPlaylists": "Listas de reproducción",
+    "TabPlaylist": "Lista de reproducción",
+    "TabPlayback": "Reproducción",
+    "TabPassword": "Contraseña",
+    "TabParentalControl": "Control parental",
+    "TabOther": "Otros",
+    "TabNotifications": "Notificaciones",
+    "TabNfoSettings": "Configuración de NFO",
+    "TabNetworking": "Redes",
+    "TabNetworks": "Cadenas",
+    "TabMyPlugins": "Mis complementos",
+    "TabMusicVideos": "Videos musicales",
+    "TabMusic": "Música",
+    "TabMovies": "Películas",
+    "TabMetadata": "Metadatos",
+    "TabLogs": "Registros",
+    "TabLiveTV": "TV en vivo",
+    "TabInfo": "Información",
+    "TabGuide": "Guía",
+    "TabGenres": "Géneros",
+    "TabFavorites": "Favoritos",
+    "TabEpisodes": "Episodios",
+    "TabDVR": "DVR",
+    "TabDisplay": "Mostrar",
+    "TabDirectPlay": "Reproducción directa",
+    "TabDevices": "Dispositivos",
+    "TabDashboard": "Panel de control",
+    "TabContainers": "Contenedores",
+    "TabCollections": "Colecciones",
+    "TabCodecs": "Códecs",
+    "TabChannels": "Canales",
+    "TabCatalog": "Catálogo",
+    "OptionPoster": "Póster",
+    "OptionPlayed": "Reproducido",
+    "OptionPlayCount": "Contador de reproducciones",
+    "OptionPlainVideoItemsHelp": "Si se habilita, todos los videos serán representados en DIDL como «object.item.videoItem» en lugar de un tipo más específico, como «object.item.videoItem.movie».",
+    "OptionPlainVideoItems": "Mostrar todos los videos como elementos de video simples",
+    "OptionPlainStorageFoldersHelp": "Si se habilita, todos las carpetas serán representadas en DIDL como «object.container.storageFolder» en lugar de un tipo más específico, como «object.container.person.musicArtist».",
+    "OptionPlainStorageFolders": "Mostrar todas las carpetas como carpetas de almacenamiento simples",
+    "OptionParentalRating": "Clasificación parental",
+    "OptionOnInterval": "En un intervalo",
+    "OptionOnAppStartup": "Al iniciar la aplicación",
+    "OptionNone": "Ninguno",
+    "OptionNew": "Nuevo…",
+    "OptionNameSort": "Nombre",
+    "OptionMonday": "Lunes",
+    "OptionMissingEpisode": "Episodios faltantes",
+    "OptionMax": "Máximo",
+    "OptionLoginAttemptsBeforeLockoutHelp": "Un valor de cero significa heredar el valor predeterminado de tres intentos para los usuarios normales y cinco para los administradores. Ajustar esto a -1 deshabilitará la función.",
+    "OptionLoginAttemptsBeforeLockout": "Determina cuantos intentos de inicio de sesión incorrectos se pueden hacer antes de que ocurra el bloqueo.",
+    "OptionList": "Lista",
+    "OptionLikes": "Me gusta",
+    "OptionIsSD": "SD",
+    "OptionIsHD": "HD",
+    "OptionImdbRating": "Calificación de IMDb",
+    "OptionIgnoreTranscodeByteRangeRequestsHelp": "Si se habilita, estas solicitudes serán honradas pero se ignorará el encabezado de rango de bytes.",
+    "OptionIgnoreTranscodeByteRangeRequests": "Ignorar solicitudes de transcodificación de rango de bytes",
+    "OptionHomeVideos": "Fotos",
+    "OptionHlsSegmentedSubtitles": "Subtítulos segmentados HLS",
+    "OptionHideUserFromLoginHelp": "Útil para cuentas privadas o de administrador ocultas. El usuario tendrá que iniciar sesión manualmente introduciendo su nombre de usuario y contraseña.",
+    "OptionHideUser": "Ocultar este usuario de las pantallas de inicio de sesión",
+    "OptionHasTrailer": "Trailer",
+    "OptionHasThemeVideo": "Video temático",
+    "OptionHasThemeSong": "Canción temática",
+    "OptionHasSubtitles": "Subtítulos",
+    "OptionHasSpecialFeatures": "Características especiales",
+    "OptionFriday": "Viernes",
+    "OptionFavorite": "Favoritos",
+    "OptionExtractChapterImage": "Habilitar la extracción de imágenes de los capítulos",
+    "OptionExternallyDownloaded": "Descarga externa",
+    "OptionEveryday": "Todos los días",
+    "OptionEstimateContentLength": "Estimar la duración del contenido cuando se transcodifica",
+    "OptionEquals": "Igual a",
+    "OptionEnded": "Finalizado",
+    "OptionEnableM2tsModeHelp": "Habilita el modo m2ts cuando se codifican mpegts.",
+    "OptionEnableM2tsMode": "Habilitar modo M2TS",
+    "OptionEnableForAllTuners": "Habilitar para todos los dispositivos sintonizadores",
+    "OptionEnableExternalContentInSuggestionsHelp": "Permitir que los trailers de Internet y los programas de televisión en vivo se incluyan en el contenido sugerido.",
+    "OptionEnableExternalContentInSuggestions": "Habilitar contenido externo en las sugerencias",
+    "OptionEnableAccessToAllLibraries": "Habilitar acceso a todas las bibliotecas",
+    "OptionEnableAccessToAllChannels": "Habilitar acceso a todos los canales",
+    "OptionEnableAccessFromAllDevices": "Habilitar acceso desde todos los dispositivos",
+    "OptionEmbedSubtitles": "Incrustar dentro del contenedor",
+    "OptionDvd": "DVD",
+    "OptionDownloadThumbImage": "Miniatura",
+    "OptionDownloadPrimaryImage": "Principal",
+    "OptionDownloadMenuImage": "Menú",
+    "OptionDownloadLogoImage": "Logo",
+    "OptionDownloadImagesInAdvanceHelp": "Por defecto, la mayoría de las imágenes solo son descargadas cuando son solicitadas por una aplicación Jellyfin. Habilita esta opción para descargar todas las imágenes por adelantado, a medida que se agreguen nuevos medios. Esto podría causar escaneos de bibliotecas significativamente más largos.",
+    "OptionDownloadImagesInAdvance": "Descargar las imágenes con antelación",
+    "OptionDownloadDiscImage": "Disco",
+    "OptionDownloadBoxImage": "Caja",
+    "OptionDownloadBannerImage": "Banner",
+    "OptionDownloadBackImage": "Parte trasera",
+    "OptionDownloadArtImage": "Arte",
+    "OptionDisplayFolderViewHelp": "Muestra las carpetas junto con sus otras bibliotecas de medios. Esto puede ser útil si deseas tener una vista simple de carpeta.",
+    "OptionDisplayFolderView": "Mostrar una vista de carpetas para mostrar las carpetas simples de los medios",
+    "OptionDislikes": "No me gusta",
+    "OptionDisableUserHelp": "Si se desactiva, el servidor no aceptará conexiones de este usuario. Las conexiones existentes serán finalizadas abruptamente.",
+    "OptionDisableUser": "Desactivar este usuario",
+    "OptionDescending": "Descendente",
+    "OptionDatePlayed": "Fecha de reproducción",
+    "OptionDateAddedImportTime": "Usar la fecha de escaneo en la biblioteca",
+    "OptionDateAddedFileTime": "Usar la fecha de creación del archivo",
+    "OptionDateAdded": "Fecha de adición",
+    "OptionDaily": "Diario",
+    "OptionCustomUsers": "Personalizado",
+    "OptionCriticRating": "Calificación de los críticos",
+    "OptionContinuing": "Continuando",
+    "OptionCommunityRating": "Calificación de la comunidad",
+    "OptionBlockTvShows": "Programas de TV",
+    "OptionBlockMusic": "Música",
+    "OptionBlockMovies": "Películas",
+    "OptionBlockLiveTvChannels": "Canales de TV en vivo",
+    "OptionBlockChannelContent": "Contenido de canales de Internet",
+    "OptionBlockBooks": "Libros",
+    "OptionBanner": "Banner",
+    "OptionAutomaticallyGroupSeriesHelp": "Si se habilita, las series que se reparten a través de múltiples carpetas dentro de esta biblioteca serán fusionadas en una sola serie.",
+    "OptionAutomaticallyGroupSeries": "Fusionar automáticamente series esparcidas a través de múltiples carpetas",
+    "OptionAutomatic": "Automático",
+    "OptionAuto": "Automático",
+    "OptionAscending": "Ascendente",
+    "OptionArtist": "Artista",
+    "OptionAllowVideoPlaybackTranscoding": "Permitir la reproducción de video que requiera de transcodificación",
+    "OptionAllowVideoPlaybackRemuxing": "Permitir reproducción de video que requiera conversión sin recodificar",
+    "OptionAllowUserToManageServer": "Permitir a este usuario administrar el servidor",
+    "OptionAllowSyncTranscoding": "Permitir descarga y sincronización de medios que requieran transcodificación",
+    "OptionAllowRemoteSharedDevicesHelp": "Los dispositivos DLNA se considerarán compartidos hasta que un usuario comience a controlarlos.",
+    "OptionAllowRemoteSharedDevices": "Permitir control remoto de dispositivos compartidos",
+    "OptionAllowRemoteControlOthers": "Permitir control remoto de otros usuarios",
+    "OptionAllowMediaPlaybackTranscodingHelp": "Restringir el acceso a la transcodificación podría causar fallas en la reproducción en las aplicaciones Jellyfin debido a los formatos de medios no soportados.",
+    "OptionAllowMediaPlayback": "Permitir reproducción de medios",
+    "OptionAllowManageLiveTv": "Permitir gestión de grabación de TV en vivo",
+    "OptionAllowLinkSharingHelp": "Solo son compartidas páginas web que contienen información sobre los medios. Los archivos de medios nunca son compartidos públicamente. Los compartidos tienen un límite de tiempo y expirarán después de {0} días.",
+    "OptionAllowLinkSharing": "Permitir compartir medios en redes sociales",
+    "OptionAllowContentDownloading": "Permitir descarga y sincronización de medios",
+    "OptionAllowBrowsingLiveTv": "Permitir acceso a TV en vivo",
+    "OptionForceRemoteSourceTranscoding": "Forzar transcodificación de fuentes remotas (como TV en vivo)",
+    "OptionAllowAudioPlaybackTranscoding": "Permitir la reproducción de audio que requiera transcodificación",
+    "OptionAllUsers": "Todos los usuarios",
+    "OptionAlbumArtist": "Artista del álbum",
+    "OptionAlbum": "Álbum",
+    "OptionAdminUsers": "Administradores",
+    "Option3D": "3D",
+    "OnlyImageFormats": "Solo formatos de imagen (VOBSUB, PGS, SUB)",
+    "OnlyForcedSubtitlesHelp": "Solo se cargarán subtítulos marcados como forzados.",
+    "OnlyForcedSubtitles": "Solo forzados",
+    "OneChannel": "Un canal",
+    "Off": "Apagar",
+    "NumLocationsValue": "{0} carpetas",
+    "Normal": "Normal",
+    "None": "Ninguno",
+    "NoSubtitlesHelp": "Los subtítulos no serán cargados por defecto. Pueden ser activados manualmente durante la reproducción.",
+    "NoSubtitles": "Ninguno",
+    "NoSubtitleSearchResultsFound": "No se encontraron resultados.",
+    "NoPluginConfigurationMessage": "Este complemento no tiene configuraciones disponibles.",
+    "NoNextUpItemsMessage": "No se encontró nada. ¡Comienza a ver tus programas!",
+    "NoNewDevicesFound": "No se encontraron nuevos dispositivos. Para agregar un sintonizador nuevo, cierra este diálogo e introduce la información del dispositivo manualmente.",
+    "NoCreatedLibraries": "Parece que no has creado ninguna biblioteca todavía. {0}¿Quisieras crear una ahora?{1}",
+    "No": "No",
+    "NextUp": "A continuación",
+    "Next": "Siguiente",
+    "News": "Noticias",
+    "NewEpisodesOnly": "Solo episodios nuevos",
+    "NewEpisodes": "Episodios nuevos",
+    "NewCollectionNameExample": "Ejemplo: Colección Guerra de las Galaxias",
+    "NewCollectionHelp": "Las colecciones te permiten disfrutar de agrupaciones personalizadas de películas y otros contenidos de la biblioteca.",
+    "NewCollection": "Nueva colección",
+    "Never": "Nunca",
+    "Name": "Nombre",
+    "MySubtitles": "Mis subtítulos",
+    "Mute": "Silenciar",
+    "MusicVideo": "Video musical",
+    "MusicLibraryHelp": "Revisar la {0}guía de nombrado de música{1}.",
+    "MusicArtist": "Artista musical",
+    "MusicAlbum": "Álbum de música",
+    "Movie": "Película",
+    "MovieLibraryHelp": "Revisar la {0}guía de nombrado de películas{1}.",
+    "MoveRight": "Mover a la derecha",
+    "MoveLeft": "Mover a la izquierda",
+    "MoreMediaInfo": "Información multimedia",
+    "MoreUsersCanBeAddedLater": "Más usuarios pueden ser añadidos más tarde desde el panel de control.",
+    "MoreFromValue": "Más de {0}",
+    "Monday": "Lunes",
+    "Mobile": "Móvil",
+    "MinutesBefore": "minutos antes",
+    "MinutesAfter": "minutos después",
+    "MetadataSettingChangeHelp": "Cambiar la configuración de los metadatos afectará al nuevo contenido que se añada en el futuro. Para actualizar el contenido existente, abre la pantalla de detalles y haz clic en el botón actualizar, o realiza actualizaciones masivas usando el administrador de metadatos.",
+    "MetadataManager": "Administrador de metadatos",
+    "Metadata": "Metadatos",
+    "MessageSyncPlayErrorMedia": "¡Fallo al activar SyncPlay! Error en el archivo de medios.",
+    "MessageSyncPlayErrorMissingSession": "¡Fallo al activar SyncPlay! Falta la sesión.",
+    "MessageSyncPlayErrorNoActivePlayer": "No se ha encontrado ningún reproductor activo. SyncPlay ha sido desactivado.",
+    "MessageSyncPlayErrorAccessingGroups": "Se produjo un error al acceder a la lista de grupos.",
+    "MessageSyncPlayLibraryAccessDenied": "El acceso a este contenido está restringido.",
+    "MessageSyncPlayJoinGroupDenied": "Permiso requerido para usar SyncPlay.",
+    "MessageSyncPlayCreateGroupDenied": "Permiso requerido para crear un grupo.",
+    "MessageSyncPlayGroupDoesNotExist": "Fallo al unirse al grupo porque éste no existe.",
+    "MessageSyncPlayPlaybackPermissionRequired": "Permiso de reproducción requerido.",
+    "MessageSyncPlayNoGroupsAvailable": "No hay grupos disponibles. Empieza a reproducir algo primero.",
+    "MessageSyncPlayGroupWait": "<b>{0}</b> está cargando...",
+    "MessageSyncPlayUserLeft": "<b>{0}</b> abandonó el grupo.",
+    "MessageSyncPlayUserJoined": "<b>{0}</b> se ha unido al grupo.",
+    "MessageSyncPlayDisabled": "SyncPlay deshabilitado.",
+    "MessageSyncPlayEnabled": "SyncPlay habilitado.",
+    "MessageYouHaveVersionInstalled": "Actualmente cuentas con la versión {0} instalada.",
+    "MessageUnsetContentHelp": "El contenido será mostrado como carpetas simples. Para mejores resultados utiliza el administrador de metadatos para establecer los tipos de contenido para las subcarpetas.",
+    "MessageUnableToConnectToServer": "No podemos conectarnos al servidor seleccionado en este momento. Por favor, asegúrate de que está funcionando e inténtalo de nuevo.",
+    "MessageTheFollowingLocationWillBeRemovedFromLibrary": "Las siguientes ubicaciones de medios se removerán de tu biblioteca:",
+    "MessageSettingsSaved": "Configuraciones guardadas.",
+    "MessageReenableUser": "Ver abajo para volver a habilitar",
+    "MessagePluginInstallDisclaimer": "Los complementos desarrollados por miembros de la comunidad Jellyfin son una gran forma de mejorar tu experiencia con Jellyfin con características y beneficios adicionales. Antes de instalar, por favor, conoce el impacto que pueden ocasionar en tu servidor Jellyfin, tales como escaneo más largo de bibliotecas, procesamiento en segundo plano adicional y reducción de la estabilidad del sistema.",
+    "MessagePluginConfigurationRequiresLocalAccess": "Para configurar este complemento por favor, inicia sesión en tu servidor local directamente.",
+    "MessagePleaseWait": "Por favor, espera. Esto podría tomar un minuto.",
+    "MessagePleaseEnsureInternetMetadata": "Por favor, asegúrate de que la descarga de metadatos de Internet está habilitada.",
+    "MessagePlayAccessRestricted": "La reproducción de este contenido está actualmente restringida. Por favor, contacta al administrador del servidor para obtener más información.",
+    "MessagePasswordResetForUsers": "Los siguientes usuarios han restablecido sus contraseñas. Ahora pueden iniciar sesión con los códigos PIN que se usaron para realizar el restablecimiento.",
+    "MessageNothingHere": "Nada aquí.",
+    "MessageNoTrailersFound": "Instale el canal de Avances para mejorar su experiencia cinematográfica agregando una biblioteca de Avances desde Internet.",
+    "MessageNoServersAvailable": "No se encontraron servidores utilizando el descubrimiento automático de servidores.",
+    "MessageNoPluginsInstalled": "No tienes complementos instalados.",
+    "MessageNoMovieSuggestionsAvailable": "No hay sugerencias de películas disponibles en este momento. Comienza a ver y a calificar tus películas, y luego regresa para ver tus recomendaciones.",
+    "MessageNoCollectionsAvailable": "Las colecciones te permiten disfrutar de agrupaciones personalizadas de películas, series y álbumes. Haz clic en el botón + para comenzar a crear colecciones.",
+    "MessageNoAvailablePlugins": "No hay complementos disponibles.",
+    "MessageLeaveEmptyToInherit": "Dejar vacío para heredar la configuración de un elemento superior o del valor predeterminado global.",
+    "MessageItemsAdded": "Elementos agregados.",
+    "MessageItemSaved": "Elemento guardado.",
+    "MessageUnauthorizedUser": "No estás autorizado para acceder al servidor en este momento. Por favor, contacta al administrador del servidor para más información.",
+    "MessageInvalidUser": "Nombre de usuario o contraseña inválidos. Por favor, intenta de nuevo.",
+    "MessageInvalidForgotPasswordPin": "Se ha introducido un código PIN inválido o expirado. Por favor, inténtalo de nuevo.",
+    "MessageInstallPluginFromApp": "Este complemento debe ser instalado desde dentro de la aplicación en la que deseas usarlo.",
+    "MessageImageTypeNotSelected": "Por favor, selecciona un tipo de imagen del menú desplegable.",
+    "MessageImageFileTypeAllowed": "Solo son soportados archivos JPEG y PNG.",
+    "MessageForgotPasswordInNetworkRequired": "Por favor, intenta de nuevo dentro de tu red local para iniciar el proceso de restablecimiento de contraseña.",
+    "MessageForgotPasswordFileCreated": "El siguiente archivo fue creado en tu servidor y contiene instrucciones de como proceder:",
+    "MessageFileReadError": "Hubo un error al leer el archivo. Por favor, intenta de nuevo.",
+    "MessageEnablingOptionLongerScans": "Habilitar esta opción podría resultar en escaneos de bibliotecas significativamente más largos.",
+    "MessageDownloadQueued": "Descarga puesta en la cola.",
+    "MessageDirectoryPickerLinuxInstruction": "Para Linux en Arch Linux, CentOS, Debian, Fedora, openSUSE o Ubuntu, debes conceder al usuario del servicio al menos permisos de lectura a tus ubicaciones de almacenamiento.",
+    "MessageDirectoryPickerBSDInstruction": "Para BSD, quizás necesites configurar el almacenamiento dentro de tu «FreeNAS Jail» de manera que permita a Jellyfin accederlo.",
+    "List": "Lista",
+    "LinksValue": "Enlaces: {0}",
+    "Like": "Me gusta",
+    "LibraryAccessHelp": "Selecciona las bibliotecas que deseas compartir con este usuario. Los administradores podrán editar todas las carpetas utilizando el gestor de metadatos.",
+    "LeaveBlankToNotSetAPassword": "Puedes dejar este campo en blanco para no establecer ninguna contraseña.",
+    "LearnHowYouCanContribute": "Aprende cómo puedes contribuir.",
+    "LaunchWebAppOnStartupHelp": "Abre el cliente web en su navegador web predeterminado cuando se inicia el servidor. Esto no ocurrirá cuando se utilice la función de reinicio del servidor.",
+    "LaunchWebAppOnStartup": "Iniciar la interfaz web al iniciar el servidor",
+    "LatestFromLibrary": "Últimas - {0}",
+    "Large": "Grande",
+    "LanNetworksHelp": "Lista separada por comas de direcciones IP o entradas de IP/máscara de red para las redes que se considerarán en la red local al aplicar las restricciones de ancho de banda. Si se establecen, todas las demás direcciones IP se considerarán como parte de la red externa y estarán sujetas a las restricciones de ancho de banda externa. Si se deja en blanco, solo se considera a la subred del servidor estar en la red local.",
+    "LabelffmpegPathHelp": "La ruta hacia el archivo de la aplicación ffmpeg, o la carpeta que contenga ffmpeg.",
+    "LabelffmpegPath": "Ruta del FFmpeg:",
+    "LabelZipCode": "Código postal:",
+    "LabelYoureDone": "¡Has terminado!",
+    "LabelYourFirstName": "Tu nombre:",
+    "LabelYear": "Año:",
+    "LabelXDlnaDocHelp": "Determina el contenido del elemento X_DLNADOC en el namespace urn:schemas-dlna-org:device-1-0.",
+    "LabelXDlnaDoc": "Documento X-DLNA:",
+    "LabelXDlnaCapHelp": "Determina el contenido del elemento X_DLNACAP en el namespace urn:schemas-dlna-org:device-1-0.",
+    "LabelXDlnaCap": "X-DLNA límite:",
+    "LabelWeb": "Web:",
+    "LabelVideoResolution": "Resolución de video:",
+    "LabelVideoCodec": "Códec de video:",
+    "LabelVideoBitrate": "Velocidad de bits de video:",
+    "LabelVideo": "Video",
+    "DashboardArchitecture": "Arquitectura: {0}",
+    "DashboardOperatingSystem": "Sistema operativo: {0}",
+    "DashboardServerName": "Servidor: {0}",
+    "DashboardVersionNumber": "Versión: {0}",
+    "LabelVersionInstalled": "{0} instalado",
+    "LabelVersion": "Versión:",
+    "LabelValue": "Valor:",
+    "LabelVaapiDeviceHelp": "Este es el nodo de renderizado que es usado para la aceleración por hardware.",
+    "LabelVaapiDevice": "Dispositivo VA API:",
+    "LabelUsername": "Nombre de usuario:",
+    "LabelUserRemoteClientBitrateLimitHelp": "Sobrescribe el valor global predeterminado establecido en la configuración de reproducción del servidor.",
+    "LabelUserLoginAttemptsBeforeLockout": "Intentos fallidos de inicio de sesión antes de que el usuario sea bloqueado:",
+    "LabelUserLibraryHelp": "Selecciona la biblioteca de usuario que se mostrará en el dispositivo. Déjalo vacío para heredar la configuración por defecto.",
+    "LabelUserLibrary": "Biblioteca de usuario:",
+    "LabelUserAgent": "Agente de usuario:",
+    "LabelUser": "Usuario:",
+    "LabelUseNotificationServices": "Usar los siguientes servicios:",
+    "LabelTypeText": "Texto",
+    "LabelTypeMetadataDownloaders": "Recolectores de metadatos para {0}:",
+    "LabelType": "Tipo:",
+    "LabelTunerType": "Tipo de sintonizador:",
+    "LabelTunerIpAddress": "Dirección IP del sintonizador:",
+    "LabelTriggerType": "Tipo de disparador:",
+    "LabelTranscodingVideoCodec": "Códec de video:",
+    "LabelTranscodingThreadCountHelp": "Selecciona el número máximo de hilos a utilizar al transcodificar. Reducir el número de hilos reducirá el uso de la CPU, pero es posible que no se convierta lo suficientemente rápido como para que la experiencia de reproducción sea fluida.",
+    "LabelTranscodingThreadCount": "Conteo de hilos de la transcodificación:",
+    "LabelTranscodingProgress": "Progreso de la transcodificación:",
+    "LabelTranscodingFramerate": "Velocidad de cuadros de la transcodificación:",
+    "LabelTranscodes": "Transcodificaciones:",
+    "LabelTranscodingTempPathHelp": "Especifica una ruta personalizada para los archivos de transcodificación servidos a los clientes. Deja en blanco para utilizar el predeterminado del servidor.",
+    "LabelTranscodePath": "Ruta de transcodificación:",
+    "LabelTranscodingContainer": "Contenedor:",
+    "LabelTranscodingAudioCodec": "Códec de audio:",
+    "LabelTrackNumber": "Número de pista:",
+    "LabelTitle": "Título:",
+    "LabelTimeLimitHours": "Límite de tiempo (horas):",
+    "LabelTime": "Hora:",
+    "LabelTheme": "Tema:",
+    "LabelTextSize": "Tamaño del texto:",
+    "LabelTextColor": "Color del texto:",
+    "LabelTextBackgroundColor": "Color de fondo para el texto:",
+    "LabelTagline": "Eslogan:",
+    "LabelTag": "Etiqueta:",
+    "LabelTVHomeScreen": "Modo de pantalla de TV:",
+    "LabelSyncPlayAccess": "Acceso a SyncPlay",
+    "LabelSyncPlayAccessNone": "Deshabilitado para este usuario",
+    "LabelSyncPlayAccessJoinGroups": "Permitir al usuario unirse a grupos",
+    "LabelSyncPlayAccessCreateAndJoinGroups": "Permitir al usuario crear y unirse a grupos",
+    "LabelSyncPlayLeaveGroupDescription": "Deshabilitar SyncPlay",
+    "LabelSyncPlayLeaveGroup": "Abandonar grupo",
+    "LabelSyncPlayNewGroupDescription": "Crear un nuevo grupo",
+    "LabelSyncPlayNewGroup": "Nuevo grupo",
+    "LabelSyncPlaySyncMethod": "Método de sincronización:",
+    "LabelSyncPlayPlaybackDiff": "Diferencia de tiempo de reproducción:",
+    "MillisecondsUnit": "ms",
+    "LabelSyncPlayTimeOffset": "Tiempo compensado respecto al servidor:",
+    "LabelSupportedMediaTypes": "Tipos de medios soportados:",
+    "LabelSubtitles": "Subtítulos",
+    "LabelSubtitlePlaybackMode": "Modo de subtítulo:",
+    "LabelSubtitleFormatHelp": "Ejemplo: srt",
+    "LabelSubtitleDownloaders": "Recolectores de subtítulos:",
+    "LabelStreamType": "Tipo de transmisión:",
+    "LabelStopping": "Deteniendo",
+    "LabelStopWhenPossible": "Detener cuando sea posible:",
+    "LabelStatus": "Estado:",
+    "LabelStartWhenPossible": "Iniciar cuando sea posible:",
+    "LabelSportsCategories": "Categorías de deportes:",
+    "LabelSpecialSeasonsDisplayName": "Nombre de la temporada de especiales:",
+    "LabelSource": "Fuente:",
+    "LabelSoundEffects": "Efectos de sonido:",
+    "LabelSortTitle": "Título para ordenar:",
+    "LabelSortOrder": "Clasificar ordenado:",
+    "LabelSortBy": "Ordenar por:",
+    "LabelSonyAggregationFlagsHelp": "Determina el contenido del elemento aggregationFlags en el namespace urn:schemas-sonycom:av.",
+    "LabelSonyAggregationFlags": "Marcas de agregación Sony:",
+    "LabelSkipIfGraphicalSubsPresentHelp": "Mantener versiones de texto de subtítulos resultará en una entrega más eficiente y disminuirá las posibilidades de que un video sea transcodificado.",
+    "LabelSkipIfGraphicalSubsPresent": "Omitir si el video ya contiene subtítulos incrustados",
+    "LabelSkipIfAudioTrackPresentHelp": "Desactiva esto para asegurarte de que todos los videos tengan subtítulos, independientemente del idioma del audio.",
+    "LabelSkipIfAudioTrackPresent": "Omitir si la pista de audio por defecto coincide con el idioma de descarga",
+    "LabelSkipForwardLength": "Longitud de salto hacia adelante:",
+    "LabelSkipBackLength": "Longitud de salto hacia atrás:",
+    "Sunday": "Domingo",
+    "Suggestions": "Sugerencias",
+    "Subtitles": "Subtítulos",
+    "SubtitleOffset": "Desplazamiento de subtítulos",
+    "SubtitleDownloadersHelp": "Habilita y prioriza tus recolectores de subtítulos en orden de prioridad.",
+    "SubtitleAppearanceSettingsDisclaimer": "Estos ajustes no se aplicarán a los subtítulos gráficos (PGS, DVD, etc.) o a los subtítulos ASS/SSA que incorporen sus propios estilos.",
+    "SubtitleAppearanceSettingsAlsoPassedToCastDevices": "Estos ajustes también aplican a cualquier reproducción en Chromecast iniciada por este dispositivo.",
+    "Studios": "Estudios",
+    "StopRecording": "Detener grabación",
+    "Sports": "Deportes",
+    "SortName": "Nombre para ordenar",
+    "SortChannelsBy": "Ordenar canales por:",
+    "SortByValue": "Ordenar por {0}",
+    "Sort": "Ordenar",
+    "SmartSubtitlesHelp": "Los subtítulos que coincidan con el idioma preferido serán cargados cuando el audio se encuentre en un idioma extranjero.",
+    "Smart": "Inteligente",
+    "Smaller": "Más pequeño",
+    "SmallCaps": "Mayúsculas pequeñas",
+    "Small": "Pequeño",
+    "SkipEpisodesAlreadyInMyLibraryHelp": "Los episodios serán comparados usando el numero de temporada y de episodio, cuando estén disponibles.",
+    "SkipEpisodesAlreadyInMyLibrary": "No grabar episodios que ya se encuentran en mi biblioteca",
+    "SimultaneousConnectionLimitHelp": "El numero máximo de transmisiones simultáneas permitidas. Ingresa 0 para sin límite.",
+    "Filter": "Filtro",
+    "New": "Nuevo",
+    "Shuffle": "Aleatorio",
+    "ShowYear": "Mostrar año",
+    "ShowTitle": "Mostrar título",
+    "ShowIndicatorsFor": "Mostrar indicadores para:",
+    "ShowAdvancedSettings": "Mostrar configuraciones avanzadas",
+    "Share": "Compartir",
+    "SettingsWarning": "Cambiar estos valores podría causar inestabilidad o fallas de conexión. Si experimentas cualquier problema, recomendamos volver a los valores por defecto.",
+    "SettingsSaved": "Configuración guardada.",
+    "Settings": "Configuración",
+    "ServerUpdateNeeded": "Este servidor Jellyfin necesita ser actualizado. Para descargar la última versión, por favor, visita {0}",
+    "ServerRestartNeededAfterPluginInstall": "El servidor Jellyfin necesitará reiniciarse después de instalar un complemento.",
+    "ServerNameIsShuttingDown": "El servidor Jellyfin - {0} se está apagando.",
+    "ServerNameIsRestarting": "El servidor Jellyfin - {0} se está reiniciando.",
+    "SeriesYearToPresent": "{0} - Actualidad",
+    "SeriesSettings": "Configuración de la serie",
+    "SeriesRecordingScheduled": "Grabación de series programadas.",
+    "SeriesDisplayOrderHelp": "Ordenar los episodios por fecha de emisión, orden del DVD o numeración absoluta.",
+    "SeriesCancelled": "Serie cancelada.",
+    "Series": "Series",
+    "SendMessage": "Enviar mensaje",
+    "SelectAdminUsername": "Por favor, selecciona un nombre de usuario para la cuenta de administrador.",
+    "Season": "Temporada",
+    "SearchResults": "Resultados de la búsqueda",
+    "SearchForSubtitles": "Buscar subtítulos",
+    "SearchForMissingMetadata": "Buscar metadatos faltantes",
+    "SearchForCollectionInternetMetadata": "Buscar en Internet por ilustraciones y metadatos",
+    "Search": "Buscar",
+    "Screenshots": "Capturas de pantalla",
+    "Screenshot": "Captura de pantalla",
+    "Schedule": "Programación",
+    "ScanLibrary": "Escanear biblioteca",
+    "ScanForNewAndUpdatedFiles": "Escanear por archivos nuevos y actualizados",
+    "SaveSubtitlesIntoMediaFoldersHelp": "Almacenar los subtítulos junto a los archivos de video permitirá administrarlos con más facilidad.",
+    "SaveSubtitlesIntoMediaFolders": "Guardar subtítulos en las carpetas de los medios",
+    "SaveChanges": "Guardar cambios",
+    "Save": "Guardar",
+    "Saturday": "Sábado",
+    "Runtime": "Duración",
+    "RunAtStartup": "Ejecutar al iniciar",
+    "Rewind": "Rebobinar",
+    "ResumeAt": "Reanudar desde {0}",
+    "ReplaceExistingImages": "Reemplazar imágenes existentes",
+    "ReplaceAllMetadata": "Reemplazar todos los metadatos",
+    "RepeatOne": "Repetir uno",
+    "RepeatMode": "Modo de repetición",
+    "RepeatEpisodes": "Repetir episodios",
+    "RepeatAll": "Repetir todos",
+    "Repeat": "Repetir",
+    "RemoveFromPlaylist": "Remover de la lista de reproducción",
+    "RemoveFromCollection": "Remover de la colección",
+    "RememberMe": "Recuérdame",
+    "ReleaseDate": "Fecha de estreno",
+    "RefreshQueued": "Actualización puesta en la cola.",
+    "RefreshMetadata": "Actualizar metadatos",
+    "RefreshDialogHelp": "Los metadatos son actualizados basándose en las configuraciones y servicios de Internet que estén activados en el panel de control de tu servidor Jellyfin.",
+    "Refresh": "Actualizar",
+    "Recordings": "Grabaciones",
+    "RecordingScheduled": "Grabación programada.",
+    "RecordingPathChangeMessage": "Cambiar la carpeta de grabaciones no moverá las grabaciones existentes de la antigua ubicación a la nueva. Necesitan moverse manualmente si se desea.",
+    "RecordingCancelled": "Grabación cancelada.",
+    "RecordSeries": "Grabar series",
+    "Record": "Grabar",
+    "RecommendationStarring": "Protagonizado por {0}",
+    "RecommendationDirectedBy": "Dirigido por {0}",
+    "RecommendationBecauseYouWatched": "Porque viste {0}",
+    "RecommendationBecauseYouLike": "Porque te gusta {0}",
+    "RecentlyWatched": "Visto recientemente",
+    "Rate": "Calificación",
+    "Raised": "Elevado",
+    "QueueAllFromHere": "Encolar todos desde aquí",
+    "Quality": "Calidad",
+    "Programs": "Programas",
+    "ProductionLocations": "Lugares de producción",
+    "Producer": "Productor",
+    "Primary": "Principal",
+    "Previous": "Anterior",
+    "Premieres": "Estrenos",
+    "Premiere": "Estreno",
+    "PreferEmbeddedEpisodeInfosOverFileNames": "Preferir información del episodio incrustada a los nombres de archivo",
+    "PreferEmbeddedEpisodeInfosOverFileNamesHelp": "Esto utiliza la información del episodio desde los metadatos incrustados si están disponibles.",
+    "PreferEmbeddedTitlesOverFileNamesHelp": "Esto determina el título mostrado por defecto cuando no hay disponibles metadatos en Internet o localmente.",
+    "PreferEmbeddedTitlesOverFileNames": "Preferir títulos incrustados a los nombres de archivo",
+    "PluginInstalledMessage": "El complemento ha sido instalado con éxito. El servidor Jellyfin necesitará ser reiniciado para que los cambios surtan efecto.",
+    "PleaseSelectTwoItems": "Por favor, selecciona al menos dos elementos.",
+    "PleaseRestartServerName": "Por favor, reinicia el servidor Jellyfin - {0}.",
+    "PleaseEnterNameOrId": "Por favor, introduce un nombre o ID externo.",
+    "PleaseConfirmPluginInstallation": "Por favor, haz clic en OK para confirmar que has leído lo que se encuentra arriba y que deseas proceder con la instalación del complemento.",
+    "PleaseAddAtLeastOneFolder": "Por favor, agrega al menos una carpeta a esta biblioteca dando clic al botón Agregar.",
+    "Played": "Reproducido",
+    "PlaybackErrorNoCompatibleStream": "Este cliente no es compatible con los medios y el servidor no está enviando un formato de medios compatible.",
+    "PlayNextEpisodeAutomatically": "Reproducir el siguiente episodio automáticamente",
+    "PlayNext": "Reproducir siguiente",
+    "PlayFromBeginning": "Reproducir desde el inicio",
+    "PlayCount": "Cantidad de reproducciones",
+    "PlaybackData": "Datos de reproducción",
+    "PlayAllFromHere": "Reproducir todos desde aquí",
+    "Play": "Reproducir",
+    "PlaceFavoriteChannelsAtBeginning": "Colocar canales favoritos al inicio",
+    "PinCodeResetConfirmation": "¿Estás seguro de que quieres restablecer el código PIN?",
+    "PinCodeResetComplete": "El código PIN ha sido restablecido.",
+    "PictureInPicture": "Pantalla en pantalla",
+    "Person": "Persona",
+    "PerfectMatch": "Coincidencia perfecta",
+    "People": "Personas",
+    "PasswordSaved": "Contraseña guardada.",
+    "PasswordResetProviderHelp": "Elige un proveedor de restablecimiento de contraseña para usar cuando este usuario solicite un restablecimiento de contraseña",
+    "PasswordResetHeader": "Restablecer contraseña",
+    "PasswordResetConfirmation": "¿Estás seguro de querer restablecer la contraseña?",
+    "PasswordResetComplete": "La contraseña ha sido restablecida.",
+    "PasswordMatchError": "La contraseña y la confirmación de la contraseña deben coincidir.",
+    "ParentalRating": "Clasificación parental",
+    "PackageInstallFailed": "Instalación fallida de {0} (versión {1}).",
+    "PackageInstallCompleted": "Instalación completada de {0} (versión {1}).",
+    "PackageInstallCancelled": "Instalación cancelada de {0} (versión {1}).",
+    "Overview": "Resumen",
+    "OtherArtist": "Otro artista",
+    "OriginalAirDateValue": "Fecha de emisión original: {0}",
+    "OptionWeekly": "Semanal",
+    "OptionWeekends": "Fines de semana",
+    "OptionWeekdays": "Días de semana",
+    "OptionWednesday": "Miércoles",
+    "OptionWakeFromSleep": "Despertar de la suspensión",
+    "OptionUnplayed": "No reproducido",
+    "OptionUnairedEpisode": "Episodios no emitidos",
+    "OptionTvdbRating": "Calificación de TVDB",
+    "OptionTuesday": "Martes",
+    "OptionTrackName": "Nombre de la pista",
+    "OptionThumb": "Miniatura",
+    "OptionThursday": "Jueves",
+    "OptionSunday": "Domingo",
+    "OptionSubstring": "Subcadena",
+    "OptionSpecialEpisode": "Especiales",
+    "OptionSaveMetadataAsHiddenHelp": "Cambiar esto se aplicará a los nuevos metadatos guardados en el futuro. Los archivos de metadatos existentes serán actualizados la próxima vez que sean guardados por el servidor Jellyfin.",
+    "OptionSaveMetadataAsHidden": "Guardar metadatos e imágenes como archivos ocultos",
+    "OptionSaturday": "Sábado",
+    "OptionRuntime": "Duración",
+    "OptionResumable": "Reanudable",
+    "OptionRequirePerfectSubtitleMatchHelp": "Solicitar una coincidencia perfecta filtrará los subtítulos para incluir solo aquellos que han sido probados y verificados exactamente con tu archivo de video. Desmarcar esta opción incrementará las probabilidades de que se descarguen subtítulos, pero incrementará las posibilidades de obtener subtítulos mal sincronizados o con texto incorrecto.",
+    "OptionRequirePerfectSubtitleMatch": "Solo descargar subtítulos que coincidan perfectamente con mis archivos de video",
+    "OptionReportByteRangeSeekingWhenTranscodingHelp": "Esto es requerido para algunos dispositivos que no pueden hacer búsquedas de tiempo muy bien.",
+    "OptionReportByteRangeSeekingWhenTranscoding": "Reportar que el servidor soporta la búsqueda de bytes cuando se transcodifica",
+    "OptionReleaseDate": "Fecha de estreno",
+    "OptionRegex": "Expresión regular",
+    "OptionRandom": "Aleatorio",
+    "OptionProtocolHttp": "HTTP",
+    "OptionProtocolHls": "Transmisión en vivo por HTTP",
+    "OptionProfileVideoAudio": "Audio del video",
+    "OptionProfileVideo": "Video",
+    "OptionProfilePhoto": "Foto",
+    "OptionProfileAudio": "Audio",
+    "OptionPremiereDate": "Fecha de estreno",
+    "OptionPosterCard": "Ficha de póster",
+    "LabelSkin": "Apariencia:",
+    "LabelSize": "Tamaño:",
+    "LabelSimultaneousConnectionLimit": "Límite de transmisiones simultáneas:",
+    "LabelServerName": "Nombre del servidor:",
+    "LabelServerHostHelp": "192.168.1.100:8096 o https://miservidor.com",
+    "LabelServerHost": "Servidor:",
+    "LabelSeriesRecordingPath": "Ruta para las grabaciones de series (opcional):",
+    "LabelSerialNumber": "Número de serie",
+    "LabelSendNotificationToUsers": "Enviar la notificación a:",
+    "LabelSelectVersionToInstall": "Seleccionar versión a instalar:",
+    "LabelSelectUsers": "Seleccionar usuarios:",
+    "LabelSelectFolderGroupsHelp": "Las carpetas sin marcar serán mostradas individualmente en su propia vista.",
+    "LabelSelectFolderGroups": "Agrupar automáticamente el contenido de las siguientes carpetas a vistas como Películas, Música y TV:",
+    "LabelSeasonNumber": "Temporada número:",
+    "EnableFastImageFadeInHelp": "Habilita una animación más rápida de desvanecimiento para las imágenes cargadas.",
+    "EnableFastImageFadeIn": "Desvanecimiento rápido de animaciones",
+    "LabelScreensaver": "Protector de pantalla:",
+    "LabelScheduledTaskLastRan": "Última ejecución {0}, tomando {1}.",
+    "LabelSaveLocalMetadataHelp": "Guardar ilustraciones en las carpetas de los medios los colocará en un lugar donde se pueden editar fácilmente.",
+    "LabelSaveLocalMetadata": "Guardar las ilustraciones en las carpetas de los medios",
+    "LabelRuntimeMinutes": "Duración (minutos):",
+    "LabelRequireHttpsHelp": "Si se marca, el servidor redirigirá automáticamente todas las solicitudes a través de HTTP a HTTPS. Esto no tiene efecto si el servidor no está escuchando en HTTPS.",
+    "LabelRequireHttps": "Requerir HTTPS",
+    "LabelRemoteClientBitrateLimitHelp": "Un límite opcional de velocidad de bits por transmisión para todos los dispositivos fuera de la red. Esto es útil para evitar que los dispositivos soliciten una tasa de bits más alta de la que puede manejar tu conexión a Internet. Esto puede provocar un aumento de la carga de la CPU en el servidor para transcodificar los videos sobre la marcha a una velocidad de bits inferior.",
+    "LabelRemoteClientBitrateLimit": "Limite de velocidad de bits para la transmisión por Internet (Mbps):",
+    "LabelReleaseDate": "Fecha de estreno:",
+    "LabelRefreshMode": "Modo de actualización:",
+    "LabelRecordingPathHelp": "Especifica la ubicación por defecto para guardar las grabaciones. Si se deja en blanco, se usará la carpeta de datos de programa del servidor.",
+    "LabelRecordingPath": "Ruta por defecto para las grabaciones:",
+    "LabelRecord": "Grabar:",
+    "LabelReasonForTranscoding": "Motivo para transcodificar:",
+    "LabelReadHowYouCanContribute": "Aprende cómo puedes contribuir.",
+    "LabelPublicHttpsPortHelp": "El número de puerto público que debe asignarse al puerto HTTPS local.",
+    "LabelPublicHttpsPort": "Número de puerto HTTPS público:",
+    "LabelPublicHttpPortHelp": "El número de puerto público que debe asignarse al puerto HTTP local.",
+    "LabelPublicHttpPort": "Número de puerto HTTP público:",
+    "LabelProtocolInfoHelp": "El valor que será utilizado cuando se responda a solicitudes GetProtocolInfo desde el dispositivo.",
+    "LabelProtocolInfo": "Información del protocolo:",
+    "LabelProtocol": "Protocolo:",
+    "LabelProfileVideoCodecs": "Códecs de video:",
+    "LabelProfileContainersHelp": "Separados por comas. Puede dejarse vacío para aplicarlo a todos los contenedores.",
+    "LabelProfileContainer": "Contenedor:",
+    "LabelProfileCodecsHelp": "Separados por comas. Puede dejarse vacío para aplicarlo a todos los códecs.",
+    "LabelProfileCodecs": "Códecs:",
+    "LabelProfileAudioCodecs": "Códecs de audio:",
+    "LabelPrevious": "Anterior",
+    "LabelPreferredSubtitleLanguage": "Idioma preferido para los subtítulos:",
+    "LabelPreferredDisplayLanguageHelp": "La traducción de Jellyfin es un proyecto en curso.",
+    "LabelPreferredDisplayLanguage": "Idioma de pantalla preferido:",
+    "LabelPostProcessorArgumentsHelp": "Usar {path} como la ruta del archivo grabado.",
+    "LabelPostProcessorArguments": "Argumentos de la línea de comandos del post-procesador:",
+    "LabelPostProcessor": "Aplicación de postprocesamiento:",
+    "LabelPleaseRestart": "Los cambios tendrán efecto después de recargar manualmente el cliente web.",
+    "LabelPlayMethod": "Método de reproducción:",
+    "LabelPlaylist": "Lista de reproducción:",
+    "LabelPlayerDimensions": "Dimensiones del reproductor:",
+    "LabelPlayer": "Reproductor:",
+    "LabelPlayDefaultAudioTrack": "Reproducir la pista de audio por defecto independientemente del idioma",
+    "LabelPlaceOfBirth": "Lugar de nacimiento:",
+    "LabelPersonRoleHelp": "Ejemplo: Conductor de camión de helados",
+    "LabelPersonRole": "Rol:",
+    "LabelPath": "Ruta:",
+    "LabelPasswordRecoveryPinCode": "Código PIN:",
+    "LabelPasswordResetProvider": "Proveedor de restablecimiento de contraseña:",
+    "LabelPasswordConfirm": "Contraseña (confirmar):",
+    "LabelPassword": "Contraseña:",
+    "LabelParentalRating": "Clasificación parental:",
+    "LabelParentNumber": "Número antecesor:",
+    "LabelOverview": "Resumen:",
+    "LabelOriginalTitle": "Título original:",
+    "LabelOriginalAspectRatio": "Relación de aspecto original:",
+    "LabelOptionalNetworkPathHelp": "Si esta carpeta es compartida en su red, proveer la ruta del recurso compartido de red puede permitir a las aplicaciones Jellyfin en otros dispositivos acceder a los archivos de medios directamente. Por ejemplo, {0} o {1}.",
+    "LabelOptionalNetworkPath": "(Opcional) Carpeta de red compartida:",
+    "LabelNumberOfGuideDaysHelp": "Descargar más días de datos de programación permite programar con mayor anticipación y ver más listados, pero tomará más tiempo en descargar. Auto hará la selección basada en el número de canales.",
+    "LabelNumberOfGuideDays": "Número de días de datos de la programación a descargar:",
+    "LabelNumber": "Número:",
+    "LabelNotificationEnabled": "Habilitar esta notificación",
+    "LabelNext": "Siguiente",
+    "LabelNewsCategories": "Categorías de noticias:",
+    "LabelNewPasswordConfirm": "Confirmación de contraseña nueva:",
+    "LabelNewPassword": "Contraseña nueva:",
+    "LabelNewName": "Nuevo nombre:",
+    "LabelStable": "Estable",
+    "LabelChromecastVersion": "Versión de Chromecast",
+    "LabelName": "Nombre:",
+    "LabelMusicStreamingTranscodingBitrateHelp": "Especifica la velocidad de bits máxima al transmitir música.",
+    "LabelMusicStreamingTranscodingBitrate": "Velocidad de bits de transcodificación de música:",
+    "LabelMovieRecordingPath": "Ruta para las grabaciones de películas (opcional):",
+    "LabelMoviePrefixHelp": "Si un prefijo es aplicado al título de las películas, introdúcelo aquí para que el servidor pueda manejarlo correctamente.",
+    "LabelMoviePrefix": "Prefijo de la película:",
+    "LabelMovieCategories": "Categorías de películas:",
+    "LabelMonitorUsers": "Monitorear actividad desde:",
+    "LabelModelUrl": "URL del modelo",
+    "LabelModelNumber": "Número del modelo",
+    "LabelModelName": "Nombre del modelo",
+    "LabelModelDescription": "Descripción del modelo",
+    "LabelMinScreenshotDownloadWidth": "Anchura mínima de descarga de capturas de pantalla:",
+    "LabelMinResumePercentageHelp": "Los medios se asumen como no reproducidos si se detienen antes de este tiempo.",
+    "LabelMinResumePercentage": "Porcentaje mínimo para reanudar:",
+    "LabelMinResumeDurationHelp": "La duración de video más corta en segundos que guardará la ubicación de reproducción y te permitirá reanudarla.",
+    "LabelMinResumeDuration": "Duración mínima para la reanudación:",
+    "LabelMinBackdropDownloadWidth": "Anchura mínima de descarga de imágenes de fondo:",
+    "LabelMethod": "Método:",
+    "LabelMetadataSaversHelp": "Selecciona los formatos de archivo con los que se guardarán tus metadatos.",
+    "LabelMetadataSavers": "Grabadores de metadatos:",
+    "LabelMetadataReadersHelp": "Ordena tus fuentes de metadatos locales por prioridad. El primer archivo encontrado será leído.",
+    "LabelMetadataReaders": "Lectores de metadatos:",
+    "LabelMetadataPathHelp": "Especifique una ubicación personalizada para las ilustraciones y los metadatos descargados.",
+    "LabelKidsCategories": "Categorías infantiles:",
+    "LabelKeepUpTo": "Mantener hasta:",
+    "LabelInternetQuality": "Calidad en Internet:",
+    "LabelInNetworkSignInWithEasyPasswordHelp": "Utiliza el código PIN sencillo para acceder a los clientes en tu red local. Tu contraseña regular solo se necesitará fuera de casa. Si el código PIN se deja en blanco, no necesitarás una contraseña dentro de tu red local.",
+    "LabelInNetworkSignInWithEasyPassword": "Habilitar inicio de sesión con mi código PIN sencillo para conexiones dentro de la red",
+    "LabelImportOnlyFavoriteChannels": "Restringir a canales marcados como favoritos",
+    "LabelImageType": "Tipo de imagen:",
+    "LabelImageFetchersHelp": "Habilita y prioriza tus recolectores de imágenes preferidos.",
+    "LabelIdentificationFieldHelp": "Una subcadena indiferente a las mayúsculas y minúsculas o una expresión regular (regex).",
+    "LabelIconMaxWidthHelp": "Resolución máxima de los íconos expuestos vía upnp:icon.",
+    "LabelIconMaxWidth": "Ancho máximo del ícono:",
+    "LabelIconMaxHeightHelp": "Resolución máxima de los íconos expuestos vía upnp:icon.",
+    "LabelIconMaxHeight": "Altura máxima del ícono:",
+    "LabelHttpsPortHelp": "El número de puerto TCP al que el servidor HTTPS de Jellyfin debería enlazar.",
+    "LabelHttpsPort": "Número de puerto local HTTPS:",
+    "LabelHomeScreenSectionValue": "Sección {0} de la pantalla de inicio:",
+    "LabelHomeNetworkQuality": "Calidad en red local:",
+    "LabelHardwareAccelerationTypeHelp": "La aceleración por hardware requiere configuración adicional.",
+    "LabelHardwareAccelerationType": "Aceleración por hardware:",
+    "LabelEncoderPreset": "Codificación H264 y H265 preestablecida:",
+    "LabelH264Crf": "CRF de codificación H264:",
+    "LabelGroupMoviesIntoCollectionsHelp": "Cuando se muestran listados de películas, las películas que pertenecen a una colección serán mostradas agrupadas en un solo artículo.",
+    "LabelGroupMoviesIntoCollections": "Agrupar películas en colecciones",
+    "LabelServerNameHelp": "Este nombre se usará para identificar el servidor y se predeterminará al nombre de la computadora del servidor.",
+    "LabelFriendlyName": "Nombre amistoso:",
+    "LabelFormat": "Formato:",
+    "LabelForgotPasswordUsernameHelp": "Introduce tu nombre de usuario, si lo recuerdas.",
+    "LabelFont": "Fuente:",
+    "LabelFolder": "Carpeta:",
+    "LabelFinish": "Terminar",
+    "LabelFileOrUrl": "Archivo o URL:",
+    "LabelFailed": "Fallido",
+    "LabelExtractChaptersDuringLibraryScanHelp": "Genera imágenes de los capítulos cuando se importan videos durante el escaneo de la biblioteca. De lo contrario, se extraerán durante la tarea programada imágenes de capítulos, lo que permitirá que el escaneado normal de la biblioteca se complete más rápidamente.",
+    "LabelExtractChaptersDuringLibraryScan": "Extraer las imágenes de los capítulos durante el escaneo de la biblioteca",
+    "LabelBaseUrlHelp": "Añade un subdirectorio personalizado a la URL del servidor. Por ejemplo: <code>http://ejemplo.com/<b>&lt;urlbase&gt;</b></code>",
+    "LabelBaseUrl": "URL base:",
+    "LabelEveryXMinutes": "Cada:",
+    "LabelEvent": "Evento:",
+    "LabelEpisodeNumber": "Episodio número:",
+    "LabelEndDate": "Fecha de fin:",
+    "LabelEnableSingleImageInDidlLimitHelp": "Algunos dispositivos no se renderizarán correctamente si se incrustan varias imágenes en DIDL.",
+    "LabelEnableSingleImageInDidlLimit": "Limitar a una sola imagen incrustada",
+    "LabelEnableRealtimeMonitorHelp": "Los cambios en los archivos serán procesados inmediatamente, en los sistemas de archivo soportados.",
+    "LabelEnableRealtimeMonitor": "Activar monitoreo en tiempo real",
+    "LabelEnableHttpsHelp": "Permite que el servidor escuche en el puerto HTTPS configurado. También se debe configurar un certificado válido para que esto surta efecto.",
+    "LabelEnableHttps": "Habilitar HTTPS",
+    "LabelEnableHardwareDecodingFor": "Habilitar decodificación por hardware para:",
+    "LabelEnableDlnaServerHelp": "Permite a dispositivos UPnP en tu red explorar y reproducir contenido.",
+    "LabelEnableDlnaServer": "Habilitar servidor DLNA",
+    "LabelEnableDlnaPlayToHelp": "Detecta dispositivos dentro de tu red y ofrece la capacidad de controlarlos remotamente.",
+    "LabelEnableDlnaPlayTo": "Habilitar Reproducir En mediante DLNA",
+    "LabelEnableDlnaDebugLoggingHelp": "Crea grandes archivos de registro y solo se debe usar cuando se requiera para solucionar problemas.",
+    "LabelEnableDlnaDebugLogging": "Habilitar el registro de depuración de DLNA",
+    "LabelEnableDlnaClientDiscoveryIntervalHelp": "Determina la duración en segundos entre búsquedas SSDP realizadas por Jellyfin.",
+    "LabelEnableDlnaClientDiscoveryInterval": "Intervalo de descubrimiento de clientes (segundos)",
+    "LabelEnableBlastAliveMessagesHelp": "Habilita esto si el servidor no es detectado de manera confiable por otros dispositivos UPnP en tu red.",
+    "LabelEnableBlastAliveMessages": "Bombardeo de mensajes de vida",
+    "LabelEnableAutomaticPortMapHelp": "Redirecciona automáticamente los puertos públicos de tu router a los puertos locales de tu servidor a través de UPnP. Esto puede no funcionar con algunos modelos de routers o configuraciones de red. Los cambios no se aplicarán hasta después de reiniciar el servidor.",
+    "LabelEnableAutomaticPortMap": "Habilitar mapeo automático de puertos",
+    "LabelEmbedAlbumArtDidlHelp": "Algunos dispositivos prefieren este método para obtener arte de álbumes. Otros podrían fallar al reproducir con esta opción habilitada.",
+    "LabelEmbedAlbumArtDidl": "Incrustar arte del álbum en DIDL",
+    "LabelEasyPinCode": "Código PIN sencillo:",
+    "LabelDynamicExternalId": "{0} Id:",
+    "LabelDropShadow": "Mostrar sombra:",
+    "LabelDroppedFrames": "Cuadros saltados:",
+    "LabelDropImageHere": "Arrastre la imagen aquí o haz para explorar.",
+    "LabelDownloadLanguages": "Descargar idiomas:",
+    "LabelDownMixAudioScaleHelp": "Incrementa el audio cuando se hace downmix. Un valor de 1 preservará el volumen original.",
+    "LabelDownMixAudioScale": "Incremento del audio cuando se hace downmix:",
+    "LabelDisplaySpecialsWithinSeasons": "Mostrar especiales dentro de las temporadas en las que fueron transmitidas",
+    "LabelDisplayOrder": "Orden para mostrar:",
+    "LabelDisplayName": "Nombre a mostrar:",
+    "LabelDisplayMode": "Modo de pantalla:",
+    "LabelDisplayMissingEpisodesWithinSeasons": "Mostrar episodios faltantes en las temporadas",
+    "LabelDisplayLanguageHelp": "La traducción de Jellyfin es un proyecto en curso.",
+    "LabelDisplayLanguage": "Idioma de pantalla:",
+    "LabelDiscNumber": "Número de disco:",
+    "LabelDidlMode": "Modo DIDL:",
+    "LabelDeviceDescription": "Descripción del dispositivo",
+    "LabelDeinterlaceMethod": "Método de desentrelazado:",
+    "LabelDefaultUserHelp": "Determina qué biblioteca de usuario será mostrada en los dispositivos conectados. Esto puede ser reemplazado para cada dispositivo empleando perfiles.",
+    "LabelDefaultUser": "Usuario por defecto:",
+    "LabelDefaultScreen": "Pantalla por defecto:",
+    "LabelDeathDate": "Fecha de defunción:",
+    "LabelDay": "Día:",
+    "LabelDateTimeLocale": "Configuración regional de fecha y hora:",
+    "LabelDateAddedBehaviorHelp": "Si un valor de metadatos está presente, siempre se utilizará antes de cualquiera de estas opciones.",
+    "LabelDateAddedBehavior": "Comportamiento de la fecha de adición para nuevo contenido:",
+    "LabelDateAdded": "Fecha de adición:",
+    "LabelDashboardTheme": "Tema del panel de control del servidor:",
+    "LabelCustomRating": "Calificación personalizada:",
+    "LabelCustomDeviceDisplayNameHelp": "Proporcione un nombre personalizado para mostrar o déjalo vacío para usar el nombre reportado por el dispositivo.",
+    "LabelCustomDeviceDisplayName": "Nombre a mostrar:",
+    "LabelCustomCssHelp": "Aplica tu propio estilo personalizado a la interfaz web.",
+    "LabelCustomCss": "CSS personalizado:",
+    "LabelCustomCertificatePathHelp": "Ruta a un archivo PKCS #12 que contiene un certificado y una clave privada para habilitar el soporte TLS en un dominio personalizado.",
+    "LabelCustomCertificatePath": "Ruta del certificado SSL personalizado:",
+    "LabelCurrentPassword": "Contraseña actual:",
+    "LabelCriticRating": "Calificación de los críticos:",
+    "LabelCountry": "País:",
+    "LabelCorruptedFrames": "Cuadros corruptos:",
+    "LabelContentType": "Tipo de contenido:",
+    "LabelCommunityRating": "Calificación de la comunidad:",
+    "LabelCollection": "Colección:",
+    "LabelChannels": "Canales:",
+    "LabelCertificatePasswordHelp": "Si tu certificado requiere una contraseña, por favor, introdúcela aquí.",
+    "LabelCertificatePassword": "Contraseña del certificado:",
+    "TabArtists": "Artistas",
+    "TabAlbums": "Álbumes",
+    "TabAlbumArtists": "Artistas del álbum",
+    "TabAdvanced": "Avanzado",
+    "TabAccess": "Acceso",
+    "TV": "TV",
+    "SystemDlnaProfilesHelp": "Los perfiles del sistema son de solo lectura. Los cambios a un perfil del sistema serán guardados en un nuevo perfil personalizado.",
+    "SyncPlayAccessHelp": "Selecciona el nivel de acceso que este usuario tiene a la función SyncPlay. SyncPlay permite sincronizar la reproducción con otros dispositivos.",
+    "MessageDeleteTaskTrigger": "¿Estás seguro de querer eliminar este disparador de tarea?",
+    "MessageCreateAccountAt": "Crear una cuenta en {0}",
+    "MessageContactAdminToResetPassword": "Por favor, contacta a tu administrador para restablecer tu contraseña.",
+    "MessageConfirmShutdown": "¿Estás seguro de que deseas apagar el servidor?",
+    "MessageConfirmRevokeApiKey": "¿Estás seguro de querer revocar esta clave API? La conexión de la aplicación con el servidor Jellyfin será terminada abruptamente.",
+    "MessageConfirmRestart": "¿Estás seguro de que deseas reiniciar el servidor Jellyfin?",
+    "MessageConfirmRemoveMediaLocation": "¿Estás seguro de querer remover esta ubicación?",
+    "MessageConfirmRecordingCancellation": "¿Cancelar grabación?",
+    "MessageConfirmProfileDeletion": "¿Estás seguro de querer eliminar este perfil?",
+    "MessageConfirmDeleteTunerDevice": "¿Estás seguro de querer eliminar este dispositivo?",
+    "MessageConfirmDeleteGuideProvider": "¿Estás seguro de querer eliminar este proveedor de guía?",
+    "MessageConfirmAppExit": "¿Deseas salir?",
+    "MessageAreYouSureYouWishToRemoveMediaFolder": "¿Estás seguro de querer remover esta carpeta de medios?",
+    "MessageAreYouSureDeleteSubtitles": "¿Estás seguro de querer eliminar este subtítulo?",
+    "MessageAlreadyInstalled": "Esta versión ya se encuentra instalada.",
+    "Menu": "Menú",
+    "MediaIsBeingConverted": "Los medios están siendo convertidos a un formato compatible con el dispositivo que está reproduciendo el medio.",
+    "MediaInfoStreamTypeVideo": "Video",
+    "MediaInfoStreamTypeSubtitle": "Subtítulo",
+    "MediaInfoStreamTypeEmbeddedImage": "Imagen incrustada",
+    "MediaInfoStreamTypeData": "Dato",
+    "MediaInfoStreamTypeAudio": "Audio",
+    "MediaInfoSoftware": "Software",
+    "MediaInfoTimestamp": "Fecha y hora",
+    "MediaInfoSize": "Tamaño",
+    "MediaInfoSampleRate": "Tasa de muestreo",
+    "MediaInfoResolution": "Resolución",
+    "MediaInfoRefFrames": "Tramas de referencia",
+    "MediaInfoProfile": "Perfil",
+    "MediaInfoPixelFormat": "Formato de pixel",
+    "MediaInfoPath": "Ruta",
+    "MediaInfoLevel": "Nivel",
+    "MediaInfoLayout": "Esquema",
+    "MediaInfoLanguage": "Idioma",
+    "MediaInfoInterlaced": "Entrelazado",
+    "MediaInfoFramerate": "Velocidad de cuadros",
+    "MediaInfoForced": "Forzado",
+    "MediaInfoExternal": "Externo",
+    "MediaInfoDefault": "Por defecto",
+    "MediaInfoContainer": "Contenedor",
+    "MediaInfoCodecTag": "Etiqueta de códec",
+    "MediaInfoCodec": "Códec",
+    "MediaInfoChannels": "Canales",
+    "MediaInfoBitrate": "Velocidad de bits",
+    "MediaInfoBitDepth": "Profundidad de bit",
+    "MediaInfoAspectRatio": "Relación de aspecto",
+    "MediaInfoAnamorphic": "Anamórfico",
+    "MaxParentalRatingHelp": "El contenido con una calificación más alta será ocultado a este usuario.",
+    "MarkUnplayed": "Marcar como no reproducido",
+    "MarkPlayed": "Marcar como reproducido",
+    "MapChannels": "Mapear canales",
+    "ManageRecording": "Administrar grabación",
+    "ManageLibrary": "Administrar biblioteca",
+    "Logo": "Logo",
+    "LiveTV": "TV en vivo",
+    "LiveBroadcasts": "Emisiones en vivo",
+    "Live": "En vivo",
+    "LabelCancelled": "Cancelado",
+    "LabelCachePathHelp": "Especifica una ubicación personalizada para los archivos caché del servidor como las imágenes. Dejar en blanco para utilizar la configuración por defecto del servidor.",
+    "LabelCachePath": "Ruta de la caché:",
+    "LabelCache": "Caché:",
+    "LabelBurnSubtitles": "Quemar subtítulos:",
+    "LabelBlockContentWithTags": "Bloquear elementos con las etiquetas:",
+    "LabelBlastMessageIntervalHelp": "Determina la duración en segundos del intervalo entre mensajes de vida.",
+    "LabelBlastMessageInterval": "Intervalo de mensajes de vida (segundos)",
+    "LabelBitrate": "Velocidad de bits:",
+    "LabelBirthYear": "Año de nacimiento:",
+    "LabelBirthDate": "Fecha de nacimiento:",
+    "LabelBindToLocalNetworkAddressHelp": "Opcional. Sobrescribe la dirección IP local a la que se vincula el servidor http. Si se deja vacío, el servidor se vinculará a todas las direcciones disponibles. Cambiar este valor requiere reiniciar el servidor Jellyfin.",
+    "LabelBindToLocalNetworkAddress": "Vincular a la dirección de red local:",
+    "LabelAutomaticallyRefreshInternetMetadataEvery": "Actualizar automáticamente los metadatos desde Internet:",
+    "LabelAuthProvider": "Proveedor de autenticación:",
+    "LabelAudioSampleRate": "Frecuencia de muestreo de audio:",
+    "LabelAudioLanguagePreference": "Idioma preferido de audio:",
+    "LabelAudioCodec": "Códec de audio:",
+    "LabelAudioChannels": "Canales de audio:",
+    "LabelAudioBitrate": "Velocidad de bits de audio:",
+    "LabelAudioBitDepth": "Profundidad de bits de audio:",
+    "LabelAudio": "Audio",
+    "LabelArtistsHelp": "Separar múltiples empleando ;",
+    "LabelArtists": "Artistas:",
+    "LabelAppNameExample": "Ejemplo: Sickbeard, Sonarr",
+    "LabelAppName": "Nombre de la aplicación",
+    "LabelAllowedRemoteAddressesMode": "Modo de filtrado de direcciones IP remotas:",
+    "LabelAllowedRemoteAddresses": "Filtro de direcciones IP remotas:",
+    "LabelAllowServerAutoRestartHelp": "El servidor solo se reiniciará durante los períodos de inactividad cuando no haya usuarios activos.",
+    "LabelAllowServerAutoRestart": "Permite al servidor reiniciarse automáticamente para aplicar actualizaciones",
+    "LabelAllowHWTranscoding": "Permitir transcodificación por hardware",
+    "LabelAll": "Todos",
+    "LabelAlbumArtists": "Artistas del álbum:",
+    "LabelAlbumArtPN": "PN del arte del álbum:",
+    "LabelAlbumArtMaxWidthHelp": "Resolución máxima del arte del álbum expuesta vía upnp:albumArtURI.",
+    "LabelAlbumArtMaxWidth": "Ancho máximo del arte del álbum:",
+    "LabelAlbumArtMaxHeightHelp": "Resolución máxima del arte del álbum expuesta vía upnp:albumArtURI.",
+    "LabelAlbumArtMaxHeight": "Altura máxima del arte del álbum:",
+    "LabelAlbumArtHelp": "PN usado para el arte del álbum, dentro del atributo dlna:profileID en upnp:albumArtURI. Algunos dispositivos requieren valores específicos, independientemente del tamaño de la imagen.",
+    "LabelAlbum": "Álbum:",
+    "LabelAirsBeforeSeason": "Transmisión antes de la temporada:",
+    "LabelAirsBeforeEpisode": "Transmisión antes del episodio:",
+    "LabelAirsAfterSeason": "Transmisión después de la temporada:",
+    "LabelAirTime": "Duración:",
+    "LabelAirDays": "Se emite los días:",
+    "LabelAccessStart": "Hora de inicio:",
+    "LabelAccessEnd": "Hora de finalización:",
+    "LabelAccessDay": "Día de la semana:",
+    "LabelAbortedByServerShutdown": "(Abortado por apagado del servidor)",
+    "Label3DFormat": "Formato 3D:",
+    "Kids": "Niños",
+    "Items": "Elementos",
+    "ItemCount": "{0} elementos",
+    "InstantMix": "Mix instantáneo",
+    "InstallingPackage": "Instalando {0} (versión {1})",
+    "ImportMissingEpisodesHelp": "Si se habilita, la información sobre los episodios faltantes se importará a la base de datos de Jellyfin y se mostrarán dentro de las temporadas y series. Esto puede causar escaneos de biblioteca significativamente más largos.",
+    "ImportFavoriteChannelsHelp": "Si se habilita, solo los canales marcados como favoritos en el dispositivo sintonizador serán importados.",
+    "Images": "Imágenes",
+    "Identify": "Identificar",
+    "HttpsRequiresCert": "Para habilitar las conexiones seguras, necesitarás proporcionar un certificado SSL de confianza, como el de Let's Encrypt. Por favor, proporciona un certificado o desactiva las conexiones seguras.",
+    "Horizontal": "Horizontal",
+    "Home": "Inicio",
+    "HideWatchedContentFromLatestMedia": "Ocultar contenido ya visto de últimos medios",
+    "Hide": "Ocultar",
+    "Help": "Ayuda",
+    "HeadersFolders": "Carpetas",
+    "HeaderYears": "Años",
+    "HeaderXmlSettings": "Configuración XML",
+    "HeaderXmlDocumentAttributes": "Atributos del documento XML",
+    "HeaderXmlDocumentAttribute": "Atributo del documento XML",
+    "HeaderVideoTypes": "Tipos de video",
+    "HeaderVideoType": "Tipo de video",
+    "HeaderVideoQuality": "Calidad de video",
+    "HeaderUsers": "Usuarios",
+    "HeaderUploadImage": "Subir imagen",
+    "HeaderUpcomingOnTV": "Próximamente en TV",
+    "HeaderTypeText": "Introducir texto",
+    "HeaderTypeImageFetchers": "Recolectores de imágenes para {0}",
+    "HeaderTuners": "Sintonizador",
+    "HeaderTunerDevices": "Sintonizadores",
+    "HeaderTranscodingProfileHelp": "Agrega perfiles de transcodificación para indicar qué formatos deben ser usados cuando se requiere transcodificar.",
+    "HeaderTranscodingProfile": "Perfil de transcodificación",
+    "HeaderTracks": "Pistas",
+    "HeaderThisUserIsCurrentlyDisabled": "Este usuario se encuentra actualmente deshabilitado",
+    "HeaderTaskTriggers": "Disparadores de tarea",
+    "HeaderTags": "Etiquetas",
+    "HeaderSystemDlnaProfiles": "Perfiles del sistema",
+    "HeaderSyncPlayEnabled": "SyncPlay habilitado",
+    "HeaderSyncPlaySelectGroup": "Unirse a un grupo",
+    "HeaderSubtitleProfilesHelp": "Los perfiles de subtítulo describen los formatos de subtítulo soportados por el dispositivo.",
+    "HeaderSubtitleProfiles": "Perfiles de subtítulo",
+    "HeaderSubtitleProfile": "Perfil de subtítulo",
+    "HeaderSubtitleDownloads": "Descarga de subtítulos",
+    "HeaderSubtitleAppearance": "Apariencia de subtítulos",
+    "HeaderStopRecording": "Detener grabación",
+    "HeaderStatus": "Estado",
+    "HeaderStartNow": "Iniciar ahora",
+    "HeaderSpecialFeatures": "Características especiales",
+    "HeaderSpecialEpisodeInfo": "Información del episodio especial",
+    "HeaderSortOrder": "Clasificar ordenado",
+    "HeaderSortBy": "Ordenar por",
+    "HeaderShutdown": "Apagar",
+    "HeaderSetupLibrary": "Configura tus bibliotecas de medios",
+    "HeaderSettings": "Configuración",
+    "HeaderServerSettings": "Configuración del servidor",
+    "HeaderSelectServerCachePathHelp": "Explora o introduce la ruta a utilizar para los archivos caché del servidor. Se debe tener permisos de escritura en dicha carpeta.",
+    "HeaderSelectServerCachePath": "Seleccionar ruta para la caché del servidor",
+    "HeaderSelectServer": "Seleccionar servidor",
+    "HeaderSelectPath": "Seleccionar ruta",
+    "HeaderSelectMetadataPathHelp": "Explora o introduce la ruta donde deseas almacenar los metadatos. Se debe tener permisos de escritura en dicha carpeta.",
+    "HeaderSelectMetadataPath": "Selecciona la ruta para los metadatos",
+    "HeaderSelectCertificatePath": "Selecciona la ruta del certificado",
+    "HeaderSecondsValue": "{0} segundos",
+    "HeaderSeasons": "Temporadas",
+    "HeaderSchedule": "Programación",
+    "HeaderScenes": "Escenas",
+    "HeaderRunningTasks": "Tareas en ejecución",
+    "HeaderRevisionHistory": "Historial de versiones",
+    "HeaderRestart": "Reiniciar",
+    "HeaderResponseProfileHelp": "Los perfiles de respuesta proporcionan un medio para personalizar la información enviada al dispositivo cuando se reproducen ciertos tipos de medios.",
+    "HeaderResponseProfile": "Perfil de respuesta",
+    "HeaderRemoveMediaLocation": "Remover ubicación de medios",
+    "HeaderRemoveMediaFolder": "Remover carpeta de medios",
+    "HeaderRemoteControl": "Control remoto",
+    "HeaderRemoteAccessSettings": "Opciones de acceso remoto",
+    "HeaderRecordingPostProcessing": "Post procesado de las grabaciones",
+    "HeaderRecordingOptions": "Opciones de grabación",
+    "HeaderRecentlyPlayed": "Reproducido recientemente",
+    "HeaderProfileServerSettingsHelp": "Estos valores controlan como el servidor Jellyfin se presentará al dispositivo.",
+    "HeaderProfileInformation": "Información del perfil",
+    "HeaderProfile": "Perfil",
+    "HeaderPreferredMetadataLanguage": "Idioma preferido para los metadatos",
+    "HeaderPluginInstallation": "Instalación de complemento",
+    "HeaderPleaseSignIn": "Por favor, inicia sesión",
+    "HeaderPlaybackError": "Error de reproducción",
+    "HeaderPlayback": "Reproducción de medios",
+    "HeaderPlayOn": "Reproducir en",
+    "HeaderPlayAll": "Reproducir todo",
+    "HeaderPinCodeReset": "Restablecer código PIN",
+    "HeaderPhotoAlbums": "Álbumes de fotos",
+    "HeaderPeople": "Personas",
+    "HeaderPendingInvitations": "Invitaciones pendientes",
+    "HeaderPaths": "Rutas",
+    "HeaderPasswordReset": "Restablecer contraseña",
+    "HeaderPassword": "Contraseña",
+    "HeaderParentalRatings": "Clasificación parental",
+    "HeaderOtherItems": "Otros elementos",
+    "HeaderOnNow": "Transmitiendo ahora",
+    "HeaderNextVideoPlayingInValue": "El siguiente video se reproducirá en {0}",
+    "HeaderNextEpisodePlayingInValue": "El siguiente episodio se reproducirá en {0}",
+    "HeaderNewDevices": "Nuevos dispositivos",
+    "HeaderNewApiKey": "Nueva clave API",
+    "HeaderNavigation": "Navegación",
+    "HeaderMyMediaSmall": "Mis medios (pequeño)",
+    "HeaderMyMedia": "Mis medios",
+    "HeaderMyDevice": "Mi dispositivo",
+    "HeaderMusicVideos": "Videos musicales",
+    "HeaderMusicQuality": "Calidad de la música",
+    "HeaderMovies": "Películas",
+    "HeaderMoreLikeThis": "Más como esto",
+    "HeaderMetadataSettings": "Configuración de metadatos",
+    "HeaderMediaInfo": "Info del medio",
+    "HeaderMediaFolders": "Carpetas de medios",
+    "HeaderMedia": "Medios",
+    "HeaderLoginFailure": "Falló el inicio de sesión",
+    "HeaderLiveTvTunerSetup": "Configuración del sintonizador de TV",
+    "HeaderLiveTv": "TV en vivo",
+    "HeaderLibrarySettings": "Configuraciones de biblioteca",
+    "HeaderLibraryOrder": "Orden de las bibliotecas",
+    "HeaderLibraryFolders": "Carpetas de bibliotecas",
+    "HeaderLibraryAccess": "Acceso a bibliotecas",
+    "HeaderLibraries": "Bibliotecas",
+    "HeaderLatestRecordings": "Últimas grabaciones",
+    "HeaderLatestMusic": "Última música",
+    "HeaderLatestMovies": "Últimas películas",
+    "HeaderLatestMedia": "Últimos medios",
+    "HeaderLatestEpisodes": "Últimos episodios",
+    "HeaderKodiMetadataHelp": "Para habilitar o deshabilitar los metadatos NFO, edite una biblioteca en la configuración de bibliotecas de Jellyfin y ubica la sección grabadores de metadatos.",
+    "HeaderKeepSeries": "Conservar serie",
+    "HeaderKeepRecording": "Conservar grabación",
+    "HeaderItems": "Elementos",
+    "HeaderInstantMix": "Mix instantáneo",
+    "HeaderInstall": "Instalar",
+    "HeaderImageSettings": "Configuración de imagen",
+    "HeaderImageOptions": "Opciones de imagen",
+    "HeaderIdentifyItemHelp": "Introduce uno o más criterios de búsqueda. Elimina criterios para expandir los resultados.",
+    "HeaderIdentificationHeader": "Encabezado de identificación",
+    "HeaderIdentificationCriteriaHelp": "Introduzca, al menos, un criterio de identificación.",
+    "HeaderIdentification": "Identificación",
+    "HeaderHttpsSettings": "Opciones HTTPS",
+    "HeaderHttpHeaders": "Encabezados HTTP",
+    "HeaderHome": "Inicio",
+    "HeaderGuideProviders": "Proveedores de Guías de TV",
+    "HeaderGenres": "Géneros",
+    "HeaderFrequentlyPlayed": "Reproducido frecuentemente",
+    "HeaderForgotPassword": "Olvidé mi contraseña",
+    "HeaderForKids": "Para niños",
+    "HeaderFilters": "Filtros",
+    "HeaderFetcherSettings": "Configuración del recolector",
+    "HeaderFetchImages": "Obtener imágenes:",
+    "HeaderFeatures": "Características",
+    "HeaderFeatureAccess": "Acceso a características",
+    "HeaderFavoritePlaylists": "Listas de reproducción favoritas",
+    "HeaderFavoriteVideos": "Videos favoritos",
+    "LabelMetadataPath": "Ruta para los metadatos:",
+    "LabelMetadataDownloadersHelp": "Habilita y prioriza tus recolectores de metadatos preferidos. Los recolectores de metadatos de menor prioridad solo serán utilizados para llenar información faltante.",
+    "LabelMetadataDownloadLanguage": "Idioma preferido para las descargas:",
+    "LabelMetadata": "Metadatos:",
+    "LabelMessageTitle": "Título del mensaje:",
+    "LabelMessageText": "Texto del mensaje:",
+    "LabelMaxStreamingBitrateHelp": "Especifique una velocidad de bits máxima cuando se transmite.",
+    "LabelMaxStreamingBitrate": "Calidad máxima de transmisión:",
+    "LabelMaxScreenshotsPerItem": "Número máximo de capturas de pantalla por elemento:",
+    "LabelMaxResumePercentageHelp": "Los medios se consideran totalmente reproducidos si se detienen después de este tiempo.",
+    "LabelMaxResumePercentage": "Porcentaje máximo para la reanudación:",
+    "LabelMaxParentalRating": "Máxima clasificación parental permitida:",
+    "LabelMaxChromecastBitrate": "Calidad de transmisión de Chromecast:",
+    "LabelMaxBackdropsPerItem": "Número máximo de imágenes de fondo por elemento:",
+    "LabelMatchType": "Tipo de coincidencia:",
+    "LabelManufacturerUrl": "URL del fabricante",
+    "LabelManufacturer": "Fabricante:",
+    "LabelLogs": "Registros:",
+    "LabelLoginDisclaimerHelp": "Un mensaje que se mostrará en la parte inferior de la página de inicio de sesión.",
+    "LabelLoginDisclaimer": "Aviso legal:",
+    "LabelLockItemToPreventChanges": "Bloquear este elemento para evitar cambios futuros",
+    "LabelLocalHttpServerPortNumberHelp": "El número de puerto TCP al que el servidor HTTP de Jellyfin debería enlazar.",
+    "LabelLocalHttpServerPortNumber": "Número de puerto local HTTP:",
+    "LabelLineup": "Programación:",
+    "LabelLibraryPageSizeHelp": "Establece el número de elementos a mostrar en una página de biblioteca. Establece en 0 para deshabilitar el paginado.",
+    "LabelLibraryPageSize": "Tamaño de las páginas de las bibliotecas:",
+    "LabelLanguage": "Idioma:",
+    "LabelLanNetworks": "Redes LAN:",
+    "LabelKodiMetadataUserHelp": "Guarda los datos de visto en archivos NFO para que otras aplicaciones los utilicen.",
+    "LabelKodiMetadataUser": "Guardar los datos de visto del usuario en archivos NFO para:",
+    "LabelKodiMetadataSaveImagePathsHelp": "Esto se recomienda si tienes nombres de imágenes que no se ajustan a los lineamientos de Kodi.",
+    "LabelKodiMetadataSaveImagePaths": "Guardar las rutas de las imágenes en los archivos NFO",
+    "LabelKodiMetadataEnablePathSubstitutionHelp": "Habilita la sustitución de rutas de imágenes usando la configuración de sustitución de rutas del servidor.",
+    "LabelKodiMetadataEnablePathSubstitution": "Habilitar sustitución de ruta",
+    "LabelKodiMetadataEnableExtraThumbsHelp": "Cuando se descargan imágenes estas pueden ser almacenadas tanto en extrafanart como extrathumb para maximizar la compatibilidad con las pieles de Kodi.",
+    "LabelKodiMetadataEnableExtraThumbs": "Copiar extrafanart al campo extrathumbs",
+    "LabelKodiMetadataDateFormatHelp": "Todas las fechas dentro de los archivos NFO serán analizadas usando este formato.",
+    "LabelKodiMetadataDateFormat": "Formato de fecha de estreno:",
+    "HeaderFavoritePeople": "Personas favoritas",
+    "HeaderFavoriteMovies": "Películas favoritas",
+    "HeaderFavoriteBooks": "Libros favoritos",
+    "HeaderExternalIds": "IDs externos:",
+    "HeaderError": "Error",
+    "HeaderEpisodes": "Episodios",
+    "HeaderEnabledFieldsHelp": "Desmarca un campo para bloquearlo y prevenir que sus datos sean cambiados.",
+    "HeaderEnabledFields": "Campos habilitados",
+    "HeaderEditImages": "Editar imágenes",
+    "HeaderEasyPinCode": "Código PIN sencillo",
+    "HeaderDVR": "DVR",
+    "HeaderDownloadSync": "Descargar y sincronizar",
+    "HeaderDisplay": "Pantalla",
+    "HeaderDirectPlayProfileHelp": "Agrega perfiles de reproducción directa para indicar qué formatos puede manejar el dispositivo de forma nativa.",
+    "HeaderDirectPlayProfile": "Perfil de reproducción directa",
+    "HeaderDevices": "Dispositivos",
+    "HeaderDeviceAccess": "Acceso a dispositivos",
+    "HeaderDeveloperInfo": "Info del desarrollador",
+    "HeaderDetectMyDevices": "Detectar mis dispositivos",
+    "HeaderDeleteTaskTrigger": "Borrar disparador de tarea",
+    "HeaderDeleteProvider": "Eliminar proveedor",
+    "HeaderDeleteItems": "Eliminar elementos",
+    "HeaderDeleteItem": "Eliminar elemento",
+    "HeaderDeleteDevice": "Eliminar dispositivo",
+    "HeaderDefaultRecordingSettings": "Configuración predeterminada de grabaciones",
+    "HeaderDateIssued": "Fecha de emisión",
+    "HeaderCustomDlnaProfiles": "Perfiles personalizados",
+    "HeaderContinueListening": "Continuar escuchando",
+    "HeaderContainerProfileHelp": "Los perfiles de contenedor indican las limitaciones de un dispositivo al reproducir formatos específicos. Si una limitación se aplica entonces el medio será transcodificado, incluso si el formato ha sido configurado para reproducción directa.",
+    "HeaderContainerProfile": "Perfil del contenedor",
+    "HeaderConnectionFailure": "Falla de conexión",
+    "HeaderConnectToServer": "Conectarse al servidor",
+    "HeaderConfirmRevokeApiKey": "Revocar clave API",
+    "HeaderConfirmProfileDeletion": "Confirmar eliminación de perfil",
+    "HeaderConfirmPluginInstallation": "Confirmar instalación de complemento",
+    "HeaderConfigureRemoteAccess": "Configurar acceso remoto",
+    "HeaderCodecProfileHelp": "Los perfiles de códecs indican las limitaciones de un dispositivo al reproducir códecs específicos. Si una limitación se aplica entonces el medio será transcodificado, incluso si el códec ha sido configurado para reproducción directa.",
+    "HeaderCodecProfile": "Perfil de códec",
+    "HeaderChapterImages": "Imágenes de los capítulos",
+    "HeaderChannels": "Canales",
+    "HeaderChannelAccess": "Acceso a los canales",
+    "HeaderCastCrew": "Reparto y equipo",
+    "HeaderCastAndCrew": "Reparto y equipo",
+    "HeaderCancelSeries": "Cancelar serie",
+    "HeaderCancelRecording": "Cancelar grabación",
+    "HeaderBranding": "Establecer marca",
+    "HeaderBooks": "Libros",
+    "HeaderBlockItemsWithNoRating": "Bloquear elementos sin clasificación o con información de clasificación desconocida:",
+    "HeaderAutomaticUpdates": "Actualizaciones automáticas",
+    "HeaderAudioSettings": "Configuración de audio",
+    "HeaderAudioBooks": "Audiolibros",
+    "HeaderAppearsOn": "Aparece en",
+    "HeaderApp": "Aplicación",
+    "ApiKeysCaption": "Lista de claves API actualmente habilitadas",
+    "HeaderApiKeysHelp": "Las aplicaciones externas deben tener una clave API para poder comunicarse con el servidor Jellyfin. Las claves se emiten al iniciar sesión con una cuenta Jellyfin, o al otorgar manualmente una clave a la aplicación.",
+    "HeaderApiKeys": "Claves API",
+    "HeaderApiKey": "Clave API",
+    "HeaderAllowMediaDeletionFrom": "Permitir eliminación de medios de",
+    "HeaderAlert": "Alerta",
+    "HeaderAlbums": "Álbumes",
+    "HeaderAdmin": "Administrador",
+    "HeaderAdditionalParts": "Partes adicionales",
+    "HeaderAddUser": "Agregar usuario",
+    "HeaderAddUpdateImage": "Agregar/Actualizar Imagen",
+    "HeaderAddToPlaylist": "Agregar a lista de reproducción",
+    "HeaderAddToCollection": "Agregar a colección",
+    "HeaderAddScheduledTaskTrigger": "Agregar disparador",
+    "HeaderActivity": "Actividad",
+    "HeaderActiveRecordings": "Grabaciones activas",
+    "HeaderActiveDevices": "Dispositivos activos",
+    "HeaderAccessScheduleHelp": "Crea una programación de acceso para limitar el acceso a ciertos horarios.",
+    "HeaderAccessSchedule": "Programación de acceso",
+    "HardwareAccelerationWarning": "Habilitar la aceleración por hardware podría causar inestabilidad en algunos entornos. Asegúrate de que tu sistema operativo y controladores de video están actualizados. Si tienes dificultades reproduciendo videos después de habilitar esto, necesitarás volver a cambiar la configuración a Ninguno.",
+    "HDPrograms": "Programas en HD",
+    "EncoderPresetHelp": "Elige un valor más rápido para mejorar el rendimiento, o uno más lento para mejorar la calidad.",
+    "H264CrfHelp": "El «Factor de transferencia constante» (CRF) es la configuración de calidad por defecto para el codificador x264. Puedes establecer valores entre 0 y 51, donde los valores más bajos dan como resultado mejor calidad (a expensas de archivos más grandes). Los valores comunes son entre 18 y 28. El valor por defecto para x264 es 23, así que puedes usar este valor como punto de referencia.",
+    "GuideProviderSelectListings": "Elegir listados",
+    "GuideProviderLogin": "Iniciar sesión",
+    "Guide": "Guía",
+    "GuestStar": "Estrella invitada",
+    "GroupVersions": "Agrupar versiones",
+    "GroupBySeries": "Agrupar por series",
+    "Genre": "Género",
+    "General": "General",
+    "Fullscreen": "Pantalla completa",
+    "Friday": "Viernes",
+    "FormatValue": "Formato: {0}",
+    "FolderTypeUnset": "Contenido variado",
+    "FolderTypeTvShows": "Series de TV",
+    "FolderTypeMusicVideos": "Videos musicales",
+    "FolderTypeMusic": "Música",
+    "FolderTypeMovies": "Películas",
+    "FolderTypeBooks": "Libros",
+    "Filters": "Filtros",
+    "FileReadError": "Ha ocurrido un error al leer el archivo.",
+    "FileReadCancelled": "La lectura del archivo ha sido cancelada.",
+    "FileNotFound": "Archivo no encontrado.",
+    "File": "Archivo",
+    "FetchingData": "Obteniendo datos adicionales",
+    "Features": "Características",
+    "Favorite": "Favorito",
+    "FastForward": "Avance rápido",
+    "FFmpegSavePathNotFound": "No fue posible localizar FFmpeg usando la ruta que has introducido. FFprobe también es requerido y debe de estar en la misma carpeta. Estos componentes normalmente están empaquetados en la misma descarga. Por favor, verifica la ruta e inténtalo de nuevo.",
+    "Extras": "Extras",
+    "ExtractChapterImagesHelp": "La extracción de imágenes de capítulos permitirá a los clientes mostrar menús gráficos de selección de escenas. El proceso puede ser lento, intensivo en recursos y puede requerir varios gigabytes de espacio. Se ejecuta cuando se descubren los videos y también como una tarea programada cada noche. La programación es configurable en el área de tareas programadas. No se recomienda ejecutar esta tarea durante las horas de mayor uso.",
+    "ExtraLarge": "Extra grande",
+    "ExitFullscreen": "Salir de la pantalla completa",
+    "EveryNDays": "Cada {0} días",
+    "ErrorSavingTvProvider": "Hubo un error al guardar el proveedor de TV. Por favor, asegúrate de que sea accesible e inténtalo de nuevo.",
+    "ErrorPleaseSelectLineup": "Por favor, selecciona una programación e inténtalo de nuevo. Si no hay disponible ninguna, entonces, por favor, verifica que tu nombre de usuario, contraseña, y código postal sean correctos.",
+    "ErrorMessageStartHourGreaterThanEnd": "La hora de finalización debe ser mayor que la hora de inicio.",
+    "ErrorGettingTvLineups": "Hubo un error al descargar la programación de TV. Por favor, asegúrate de que tu información sea correcta e inténtalo de nuevo.",
+    "ErrorDeletingItem": "Hubo un error eliminando el elemento del servidor Jellyfin. Por favor, verifica que el servidor Jellyfin tiene permisos de escritura en la carpeta del medio e inténtalo de nuevo.",
+    "ErrorAddingXmlTvFile": "Hubo un error accediendo al archivo XMLTV. Por favor, asegúrate de que el archivo existe e inténtalo de nuevo.",
+    "ErrorAddingTunerDevice": "Hubo un error al agregar el dispositivo sintonizador. Por favor, asegúrate de que esté disponible e inténtalo de nuevo.",
+    "ErrorAddingMediaPathToVirtualFolder": "Hubo un error agregando la ruta de medios. Por favor, asegúrate de que la ruta es válida y que el proceso del servidor Jellyfin tiene acceso a ese destino.",
+    "ErrorAddingListingsToSchedulesDirect": "Hubo un error agregando la programación de tu cuenta de Schedules Direct. Schedules Direct solo permite un numero limitado de programaciones por cuenta. Tal vez necesites acceder al sitio web de Schedules Direct y eliminar otras programaciones de tu cuenta antes de continuar.",
+    "Episodes": "Episodios",
+    "Episode": "Episodio",
+    "EndsAtValue": "Termina a las {0}",
+    "Ended": "Finalizado",
+    "EnableDetailsBannerHelp": "Mostrar una imagen banner en la parte superior de la página de detalles del elemento.",
+    "EnableDetailsBanner": "Banner de detalles",
+    "EnableThemeVideosHelp": "Reproducir videos temáticos en el fondo mientras se navega por la biblioteca.",
+    "EnableThemeVideos": "Videos temáticos",
+    "EnableThemeSongsHelp": "Reproducir canciones temáticas en el fondo mientras se navega por la biblioteca.",
+    "EnableThemeSongs": "Canciones temáticas",
+    "EnableStreamLoopingHelp": "Habilita esta opción si las transmisiones en vivo contienen solo unos pocos segundos de datos y necesitan ser solicitadas continuamente. Habilitar esto cuando no es requerido puede causar problemas.",
+    "EnableStreamLooping": "Repetir automáticamente las transmisiones en vivo",
+    "EnablePhotosHelp": "Las imágenes serán detectadas y mostradas junto con otros archivos multimedia.",
+    "EnablePhotos": "Mostrar fotografías",
+    "EnableNextVideoInfoOverlayHelp": "Al finalizar un video, mostrar información sobre el siguiente video a reproducir en la lista de reproducción actual.",
+    "EnableNextVideoInfoOverlay": "Mostrar la información del siguiente video durante la reproducción",
+    "EnableHardwareEncoding": "Habilitar codificación por hardware",
+    "EnableExternalVideoPlayersHelp": "Un menú de reproductor externo se mostrara cuando inicie la reproducción de un video.",
+    "EnableExternalVideoPlayers": "Reproductores de video externos",
+    "EnableDisplayMirroring": "Duplicado de pantalla",
+    "EnableColorCodedBackgrounds": "Fondos de colores codificados",
+    "EnableCinemaMode": "Modo cine",
+    "EnableBackdropsHelp": "Muestra imágenes de fondo en el fondo de algunas páginas mientras se navega por la biblioteca.",
+    "EnableBackdrops": "Imágenes de fondo",
+    "EditSubtitles": "Editar subtítulos",
+    "EditMetadata": "Editar metadatos",
+    "EditImages": "Editar imágenes",
+    "Edit": "Editar",
+    "EasyPasswordHelp": "Tu código PIN fácil se utiliza para el acceso sin conexión en los clientes soportados y también puede utilizarse para acceder fácilmente cuando se está en la misma red.",
+    "DropShadow": "Sombra paralela",
+    "DrmChannelsNotImported": "Los canales con DRM no serán importados.",
+    "DownloadsValue": "{0} descargas",
+    "Download": "Descargar",
+    "Down": "Abajo",
+    "DoNotRecord": "No grabar",
+    "DisplayModeHelp": "Selecciona el estilo de diseño que desea para la interfaz.",
+    "DisplayMissingEpisodesWithinSeasonsHelp": "Esto también debe estar habilitado para las bibliotecas de TV en la configuración del servidor.",
+    "DisplayMissingEpisodesWithinSeasons": "Mostrar episodios faltantes en las temporadas",
+    "DisplayInOtherHomeScreenSections": "Mostrar en las secciones de la pantalla de inicio como recientes o continuar viendo",
+    "DisplayInMyMedia": "Mostrar en la pantalla de inicio",
+    "Display": "Pantalla",
+    "Dislike": "No me gusta",
+    "Disconnect": "Desconectar",
+    "Disc": "DIsco",
+    "Disabled": "Desactivado",
+    "Directors": "Directores",
+    "DirectStreaming": "Transmisión directa",
+    "DirectStreamHelp2": "Transmitir directamente un archivo usa muy poco poder de procesamiento sin ninguna perdida en la calidad de video.",
+    "DirectStreamHelp1": "El medio es compatible con el dispositivo en cuanto a la resolución y tipo de medio (H.264, AC3, etc.), pero está en un contenedor de archivo incompatible (mkv, avi, wmv, etc.). El video será reempaquetado sobre la marcha antes de transmitirlo al dispositivo.",
+    "DirectPlaying": "Reproducción directa",
+    "DeviceAccessHelp": "Esto solo se aplica a los dispositivos que pueden ser identificados de manera única y no impedirá el acceso desde navegadores. Filtrar el acceso a los dispositivos de los usuarios les impedirá usar nuevos dispositivos hasta que hayan sido aprobados aquí.",
+    "DetectingDevices": "Detectando dispositivos",
+    "Desktop": "Escritorio",
+    "Descending": "Descendente",
+    "DeleteUserConfirmation": "¿Estás seguro de querer eliminar este usuario?",
+    "DeleteUser": "Eliminar usuario",
+    "DeleteMedia": "Eliminar medios",
+    "DeleteImageConfirmation": "¿Estás seguro de querer eliminar esta imagen?",
+    "DeleteImage": "Eliminar imagen",
+    "DeleteDeviceConfirmation": "¿Estás seguro de querer eliminar este dispositivo? Volverá a aparecer la siguiente vez que un usuario inicie sesión con él.",
+    "Delete": "Eliminar",
+    "DeinterlaceMethodHelp": "Seleccione el método de desentrelazado que se usará al transcodificar contenido entrelazado.",
+    "DefaultSubtitlesHelp": "Los subtítulos se cargan basados en los indicadores «por defecto» y «forzado» incluidos en los metadatos. Las preferencias de idioma son consideradas cuando hay múltiples opciones disponibles.",
+    "DefaultMetadataLangaugeDescription": "Estos son sus valores por defecto y pueden ser personalizados en cada biblioteca.",
+    "DefaultErrorMessage": "Ha ocurrido un error al procesar la solicitud. Por favor, inténtalo de nuevo más tarde.",
+    "Default": "Por defecto",
+    "DeathDateValue": "Falleció: {0}",
+    "DatePlayed": "Fecha de reproducción",
+    "DateAdded": "Fecha de adición",
+    "CustomDlnaProfilesHelp": "Crear un perfil personalizado para un nuevo dispositivo o reemplazar un perfil del sistema.",
+    "CriticRating": "Calificación de los críticos",
+    "CopyStreamURLError": "Hubo un error al copiar la URL.",
+    "CopyStreamURLSuccess": "URL copiada con éxito.",
+    "CopyStreamURL": "Copiar la URL de la transmisión",
+    "Continuing": "Continuando",
+    "ContinueWatching": "Continuar viendo",
+    "Connect": "Conectar",
+    "ConfirmEndPlayerSession": "¿Deseas apagar Jellyfin en {0}?",
+    "ConfirmDeletion": "Confirmar eliminación",
+    "HeaderServerAddressSettings": "Configuración de la dirección del servidor",
+    "HeaderSeriesStatus": "Estado de la serie",
+    "HeaderSeriesOptions": "Opciones de serie",
+    "HeaderSeries": "Series",
+    "HeaderSendMessage": "Enviar mensaje",
+    "HeaderSelectTranscodingPathHelp": "Explora o introduce la ruta a utilizar para los archivos temporales de transcodificación. Se debe tener permisos de escritura en dicha carpeta.",
+    "HeaderSelectTranscodingPath": "Selecciona la ruta para los archivos temporales de transcodificación",
+    "ConfirmDeleteItems": "Eliminar estos elementos los eliminará tanto del sistema como de tu biblioteca de medios. ¿Estás seguro de querer continuar?",
+    "ConfirmDeleteItem": "Eliminar este elemento lo eliminará tanto del sistema como de tu biblioteca de medios. ¿Estás seguro de querer continuar?",
+    "ConfirmDeleteImage": "¿Eliminar imagen?",
+    "ConfigureDateAdded": "Configura cómo se determina la fecha de adición en el panel de control del servidor Jellyfin en la configuración de la biblioteca",
+    "Composer": "Compositor",
+    "CommunityRating": "Calificación de la comunidad",
+    "ColorTransfer": "Transferencia de color",
+    "ColorSpace": "Espacio de color",
+    "ColorPrimaries": "Colores primarios",
+    "ClientSettings": "Configuración del cliente",
+    "CinemaModeConfigurationHelp": "El modo cine lleva la experiencia del cine directamente a tu sala de estar con la capacidad de reproducir trailers e introducciones personalizadas antes de la función principal.",
+    "ChannelNumber": "Número de canal",
+    "ChannelNameOnly": "Canal {0} solamente",
+    "ChannelAccessHelp": "Selecciona los canales a compartir con este usuario. Los administradores podrán editar todos los canales empleando el administrador de metadatos.",
+    "ChangingMetadataImageSettingsNewContent": "Cambios en las configuraciones de descarga de metadatos o arte solo se aplicarán a contenido nuevo agregado a tu biblioteca. Para aplicar los cambios a los títulos existentes, necesitarás actualizar sus metadatos manualmente.",
+    "Categories": "Categorías",
+    "CancelSeries": "Cancelar serie",
+    "CancelRecording": "Cancelar grabación",
+    "ButtonWebsite": "Sitio web",
+    "ButtonViewWebsite": "Ver sitio web",
+    "ButtonUp": "Arriba",
+    "ButtonUninstall": "Desinstalar",
+    "ButtonTrailer": "Trailer",
+    "ButtonTogglePlaylist": "Lista de reproducción",
+    "ButtonToggleContextMenu": "Más",
+    "ButtonSubtitles": "Subtítulos",
+    "ButtonSubmit": "Enviar",
+    "ButtonSplit": "Dividir",
+    "ButtonStop": "Detener",
+    "ButtonStart": "Iniciar",
+    "ButtonSort": "Ordenar",
+    "ButtonSignOut": "Cerrar sesión",
+    "ButtonSignIn": "Iniciar sesión",
+    "ButtonShutdown": "Apagar",
+    "ButtonShuffle": "Aleatorio",
+    "ButtonSettings": "Configuración",
+    "ButtonSend": "Enviar",
+    "ButtonSelectView": "Seleccionar vista",
+    "ButtonSelectServer": "Seleccionar servidor",
+    "ButtonSelectDirectory": "Seleccionar directorio",
+    "ButtonSearch": "Búsqueda",
+    "ButtonScanAllLibraries": "Escanear todas las bibliotecas",
+    "ButtonSave": "Guardar",
+    "ButtonRevoke": "Revocar",
+    "ButtonResume": "Continuar",
+    "ButtonRestart": "Reiniciar",
+    "ButtonResetPassword": "Restablecer contraseña",
+    "ButtonResetEasyPassword": "Restablecer código PIN sencillo",
+    "ButtonRepeat": "Repetir",
+    "ButtonRename": "Renombrar",
+    "ButtonRemove": "Remover",
+    "ButtonRefreshGuideData": "Actualizar datos de la guía",
+    "ButtonRefresh": "Actualizar",
+    "ButtonQuickStartGuide": "Guía de inicio rápido",
+    "ButtonProfile": "Perfil",
+    "ButtonPreviousTrack": "Pista anterior",
+    "ButtonPlay": "Reproducir",
+    "ButtonPause": "Pausar",
+    "ButtonParentalControl": "Control parental",
+    "ButtonOpen": "Abrir",
+    "ButtonOk": "OK",
+    "ButtonOff": "Apagar",
+    "ButtonNextTrack": "Pista siguiente",
+    "ButtonNew": "Nuevo",
+    "ButtonNetwork": "Red",
+    "ButtonMore": "Más",
+    "ButtonManualLogin": "Inicio de sesión manual",
+    "ButtonLibraryAccess": "Acceso a biblioteca(s)",
+    "ButtonLearnMore": "Aprender más",
+    "ButtonInfo": "Info",
+    "ButtonHome": "Inicio",
+    "ButtonHelp": "Ayuda",
+    "ButtonGuide": "Guía",
+    "ButtonGotIt": "Hecho",
+    "ButtonFullscreen": "Pantalla completa",
+    "ButtonForgotPassword": "Olvidé mi contraseña",
+    "ButtonFilter": "Filtro",
+    "ButtonEditOtherUserPreferences": "Editar el perfil, la imagen y las preferencias personales de este usuario.",
+    "ButtonEditImages": "Editar imágenes",
+    "ButtonEdit": "Editar",
+    "ButtonDownload": "Descargar",
+    "ButtonDown": "Abajo",
+    "ButtonDeleteImage": "Eliminar imagen",
+    "ButtonDelete": "Eliminar",
+    "ButtonConnect": "Conectar",
+    "ButtonChangeServer": "Cambiar servidor",
+    "ButtonCancel": "Cancelar",
+    "ButtonBack": "Atrás",
+    "ButtonAudioTracks": "Pistas de audio",
+    "ButtonArrowUp": "Arriba",
+    "ButtonArrowRight": "Derecha",
+    "ButtonArrowLeft": "Izquierda",
+    "ButtonArrowDown": "Abajo",
+    "ButtonAddUser": "Agregar usuario",
+    "ButtonAddServer": "Agregar servidor",
+    "ButtonAddScheduledTaskTrigger": "Agregar disparador",
+    "ButtonAddMediaLibrary": "Agregar biblioteca de medios",
+    "ButtonAddImage": "Agregar imagen",
+    "ButtonAdd": "Agregar",
+    "BurnSubtitlesHelp": "Determina si el servidor debería quemar los subtítulos al transcodificar videos. Evitar esto mejorará altamente el rendimiento del servidor. Seleccione Auto para grabar formatos basados en imágenes (VOBSUB, PGS, SUB, IDX...) y ciertos subtítulos ASS o SSA.",
+    "BrowsePluginCatalogMessage": "Explora nuestro catálogo de complementos para ver los complementos disponibles.",
+    "Browse": "Explorar",
+    "BoxRear": "Caja (parte trasera)",
+    "Box": "Caja",
+    "BookLibraryHelp": "Los libros de texto y audiolibros están soportados. Revisa la {0} guía de nombrado de libros {1}.",
+    "Blacklist": "Lista negra",
+    "BirthPlaceValue": "Lugar de nacimiento: {0}",
+    "BirthLocation": "Lugar de nacimiento",
+    "BirthDateValue": "Nacimiento: {0}",
+    "Banner": "Banner",
+    "Backdrops": "Imágenes de fondo",
+    "Backdrop": "Imagen de fondo",
+    "AutoBasedOnLanguageSetting": "Auto (basado en la configuración del idioma)",
+    "Auto": "Auto",
+    "AuthProviderHelp": "Selecciona un proveedor de autenticación que se utilizará para autenticar la contraseña de este usuario.",
+    "Audio": "Audio",
+    "AttributeNew": "Nuevo",
+    "AspectRatio": "Relación de aspecto",
+    "AskAdminToCreateLibrary": "Pide a un administrador crear una biblioteca.",
+    "Ascending": "Ascendente",
+    "AsManyAsPossible": "Tantos como sea posible",
+    "Artist": "Artista",
+    "Art": "Arte",
+    "AroundTime": "Alrededor de",
+    "Anytime": "En cualquier momento",
+    "AnyLanguage": "Cualquier idioma",
+    "AlwaysPlaySubtitlesHelp": "Los subtítulos que coincidan con el idioma preferido serán cargados independientemente del idioma del audio.",
+    "AlwaysPlaySubtitles": "Siempre reproducir",
+    "AllowedRemoteAddressesHelp": "Lista separada por comas de direcciones IP/máscaras de red para las redes a las que se les permitirá conectarse remotamente. Si se deja en blanco, se les permitirá a todas las direcciones remotas.",
+    "AllowRemoteAccessHelp": "Si no se marca, se bloquearán todas las conexiones remotas.",
+    "AllowRemoteAccess": "Permitir conexiones remotas a este servidor Jellyfin.",
+    "AllowFfmpegThrottlingHelp": "Cuando una transcodificación o remuxeado se adelanta lo suficiente de la posición de reproducción actual, se pausa el proceso para que consuma menos recursos. Esto es más útil cuando se mira sin buscar con frecuencia. Apaga esto si experimentas problemas de reproducción.",
+    "AllowFfmpegThrottling": "Regular transcodificaciones",
+    "AllowOnTheFlySubtitleExtractionHelp": "Los subtítulos incrustados pueden extraerse de los videos y entregarse a los clientes en texto plano para ayudar a evitar la transcodificación de video. En algunos sistemas, esto puede tardar mucho tiempo y provocar que la reproducción de video se detenga durante el proceso de extracción. Deshabilite esta opción para que los subtítulos incrustados se graben con transcodificación de video cuando no estén soportados de forma nativa por el dispositivo cliente.",
+    "AllowOnTheFlySubtitleExtraction": "Permitir la extracción de subtítulos sobre la marcha",
+    "AllowMediaConversionHelp": "Permitir o denegar acceso a la función de convertir medios.",
+    "AllowMediaConversion": "Permitir conversión de medios",
+    "AllowHWTranscodingHelp": "Permite al sintonizador transcodificar las transmisiones sobre la marcha. Esto puede ayudar a reducir la transcodificación requerida por el servidor.",
+    "AllLibraries": "Todas las bibliotecas",
+    "AllLanguages": "Todos los idiomas",
+    "AllEpisodes": "Todos los episodios",
+    "AllComplexFormats": "Todos los formatos complejos (ASS, SSA, VOBSUB, PGS, SUB, IDX...)",
+    "AllChannels": "Todos los canales",
+    "All": "Todo",
+    "Alerts": "Alertas",
+    "EnableBlurhash": "Habilitar marcadores de posición borrosos para imágenes",
+    "ShowMore": "Mostrar más",
+    "ShowLess": "Mostrar menos",
+    "EnableBlurhashHelp": "Las imágenes que aún se están cargando se mostrarán con un marcador de posición borroso",
+    "ButtonSyncPlay": "SyncPlay",
+    "MessageNoGenresAvailable": "Permitir a algunos proveedores de metadatos obtener géneros desde Internet.",
+    "MessageAddRepository": "Si desea agregar un repositorio, haga clic en el botón al lado del encabezado y complete la información solicitada.",
+    "LabelRepositoryNameHelp": "Un nombre personalizado para distinguir este repositorio de cualquier otro agregado a su servidor.",
+    "LabelRepositoryName": "Nombre del repositorio",
+    "LabelRepositoryUrlHelp": "La ubicación del manifiesto del repositorio que desea incluir.",
+    "LabelRepositoryUrl": "URL del repositorio",
+    "HeaderNewRepository": "Nuevo repositorio",
+    "MessageNoRepositories": "Sin repositorios.",
+    "EnableFasterAnimationsHelp": "Usar animaciones y transiciones más rápidas",
+    "EnableFasterAnimations": "Animaciones más rápidas",
+    "EnableDecodingColorDepth10Vp9": "Habilitar la decodificación de hardware de 10-Bit para VP9",
+    "EnableDecodingColorDepth10Hevc": "Habilitar la decodificación de hardware de 10-Bit para HEVC",
+    "ClearQueue": "Limpiar cola",
+    "StopPlayback": "Detener reproducción",
+    "ButtonPlayer": "Reproducir",
+    "ButtonCast": "Emitir",
+    "Writers": "Escritores",
+    "ViewAlbumArtist": "Ver Álbum de Artista",
+    "TabRepositories": "Repositorios"
+}
diff --git a/src/strings/es_DO.json b/src/strings/es_DO.json
index 7c42778a1c..9f5d299631 100644
--- a/src/strings/es_DO.json
+++ b/src/strings/es_DO.json
@@ -12,5 +12,6 @@
     "Books": "Libros",
     "Albums": "Álbumes",
     "Artists": "Artistas",
-    "Channels": "Canales"
+    "Channels": "Canales",
+    "ButtonSyncPlay": "SyncPlay"
 }
diff --git a/src/strings/fa.json b/src/strings/fa.json
index b91a2c82f1..877c0af490 100644
--- a/src/strings/fa.json
+++ b/src/strings/fa.json
@@ -612,7 +612,7 @@
     "ConfirmDeleteItem": "حذف این مورد، آن را هم از فایل سیستمی و هم از کتابخانه رسانه شما حذف می کند. آیا اطمینان دارید که می‌خواهید ادامه دهید؟",
     "AlwaysPlaySubtitlesHelp": "زیرنویس‌های متناسب با توجه به اولویت زبان بدون در نظر گرفتن زبان صوتی ویدیو پخش می شوند.",
     "AllowedRemoteAddressesHelp": "لیستی از آدرس های IP یا ورودی‌های IP/‌netmask برای شبکه هایی که به آنها امکان ارتباط از راه دور داده می‌شود ، با کاما از هم جدا شدند. در صورت خالی ماندن ، تمام آدرسهای راه دور مجاز خواهند بود.",
-    "AllowOnTheFlySubtitleExtractionHelp": "زیرنویس های جاسازی شده را می‌توان از فیلم‌ها استخراج کرد و به منظور جلوگیری از کدگذاری فیلم ، به صورت متن ساده به بازدید کننده ارسال کرد. در بعضی از سیستم‌ها این می‌تواند مدت زیادی طول بکشد و باعث شود پخش فیلم در طول فرآیند استخراج متوقف شود. این گزینه را غیرفعال کنید تا زیرنویس‌های جاسازی شده با استفاده از رمزگذاری ویدیو در حالی که به طور محلی توسط دستگاه بازدیدکننده پشتیبانی نمی‌شوند ارسال شود.",
+    "AllowOnTheFlySubtitleExtractionHelp": "زیرنویس های جاسازی شده را می‌توان از ویدئو ها استخراج کرد و به منظور جلوگیری از کدگذاری فیلم ، به صورت متن ساده به بازدید کننده ارسال کرد. در بعضی از سیستم‌ها این می‌تواند مدت زیادی طول بکشد و باعث شود پخش فیلم در طول فرآیند استخراج متوقف شود. این گزینه را غیرفعال کنید تا زیرنویس‌های جاسازی شده با استفاده از رمزگذاری ویدیو در حالی که به طور محلی توسط دستگاه بازدیدکننده پشتیبانی نمی‌شوند ارسال شود.",
     "AdditionalNotificationServices": "برای نصب سرویس‌های اعلان اضافی، در فروشگاه افزونه‌ها جستجو کنید.",
     "OptionThumbCard": "کارت بندانگشتی",
     "OptionThumb": "بندانگشتی",
@@ -702,5 +702,857 @@
     "MessageUnauthorizedUser": "در حال حاضر مجاز به دسترسی به سرور نیستید. لطفا برای اطلاعات بیشتر با مدیر سرور خود تماس بگیرید.",
     "MessageInvalidUser": "نام کاربری یا گذرواژه نامعتبر است. لطفا دوباره تلاش کنید.",
     "MessageInvalidForgotPasswordPin": "کد پین نامعتبر یا منقضی شده وارد شد. لطفا دوباره تلاش کنید.",
-    "MessageInstallPluginFromApp": "این افزونه باید از داخل برنامه‌ای که قصد استفاده از آن را دارید نصب شود."
+    "MessageInstallPluginFromApp": "این افزونه باید از داخل برنامه‌ای که قصد استفاده از آن را دارید نصب شود.",
+    "PasswordResetHeader": "بازنشانی گذرواژه",
+    "PasswordResetConfirmation": "آیا واقعا تمایل به بازنشانی گذرواژه دارید؟",
+    "PasswordResetComplete": "گذرواژه بازنشانی شد.",
+    "PasswordMatchError": "گذرواژه و تکرار گذرواژه باید یکسان باشند.",
+    "PackageInstallFailed": "{0} (نسخه {1}) نصب به مشکل برخورد.",
+    "PackageInstallCompleted": "{0} (نسخه {1})نصب به پایان رسید.",
+    "PackageInstallCancelled": "{0} ( نسخه {1})نصب لغو شد.",
+    "Overview": "بررسی اجمالی",
+    "OtherArtist": "هنرمند دیگر",
+    "OriginalAirDateValue": "زمان پخش اصلی : {0}",
+    "OptionWeekly": "هفتگی",
+    "OptionWeekends": "آخر هفته ها",
+    "OptionWeekdays": "روز های هفته",
+    "OptionWednesday": "چهارشنبه",
+    "OptionWakeFromSleep": "از خواب بیدار شدن",
+    "OptionUnairedEpisode": "قسمت های پخش نشده",
+    "OptionTvdbRating": "نمره TVDB",
+    "OptionTuesday": "سه شنبه",
+    "OptionTrackName": "نام ترک",
+    "OptionRequirePerfectSubtitleMatchHelp": "نتیجه کامل زیرنویس ها را به صورتی فیلتر می کند که فقط مواردی را که دقیقا با فایل تصویری شما آزمایش و تأیید شده اند ،شامل شود. حذف این گزینه احتمال بارگیری زیرنویس ها را افزایش می دهد ، اما شانس متن زیرنویس ناهماهنگ یا غلط نیز افزایش می یابد.",
+    "ServerNameIsShuttingDown": "سرور جلی فین - {0} در حال خاموش شدن می باشد.",
+    "ServerNameIsRestarting": "سرور جلی فین - {0} در حال راه اندازی مجدد می باشد.",
+    "SeriesYearToPresent": "{0}- در حال حاضر",
+    "SeriesSettings": "تنظیمات سریال",
+    "SeriesRecordingScheduled": "ضبط کردن سریال زمانبندی شد.",
+    "SeriesDisplayOrderHelp": "قسمت ها را بر اساس تاریخ پخش شدن، ترتیب دی وی دی یا فقط شماره مرتب کنید.",
+    "SeriesCancelled": "سریال متوقف شده است.",
+    "Series": "سریال ها",
+    "SelectAdminUsername": "لطفا یک نام کاربری برای حساب مدیر انتخاب کنید.",
+    "Season": "فصل",
+    "SearchResults": "نتایج جستجو",
+    "SearchForSubtitles": "زیرنویس ها را جستجو کنید",
+    "SearchForMissingMetadata": "فراداده های گم شده را جستجو کنید",
+    "SearchForCollectionInternetMetadata": "در اینترنت برای پیدا کردن فراداده و عکس جستجو کنید",
+    "Search": "جستجو کردن",
+    "Screenshots": "نماگرفت ها",
+    "Screenshot": "نماگرفت",
+    "Schedule": "برنامه زمانی",
+    "ScanLibrary": "کتابخانه را اسکن کنید",
+    "ScanForNewAndUpdatedFiles": "فایل های جدید و به روز رسانی شده را اسکن کنید",
+    "ChannelAccessHelp": "کانال هایی که قصد اشتراک گذاری با این کاربر را دارید انتخاب کنید. مدیران توانایی ویرایش همه ی کانال ها را با استفاده از مدیریت فراداده دارند.",
+    "ChangingMetadataImageSettingsNewContent": "تغییر تنظیمات دانلود فراداده ها و عکس ها فقط بر روی محتواهای جدیدی که به کتابخانه اضافه می شوند، اعمال می شوند. برای اعمال تغییرات بر روی محتوای موجود، شما باید فراداده را به صورت دستی به روزرسانی کنید.",
+    "Refresh": "به‌روز‌رسانی",
+    "Recordings": "ضبط شده ها",
+    "RecordingScheduled": "ضبط برنامه ریزی شد.",
+    "RecordingPathChangeMessage": "با تغییر محل ذخیره فایل های ضبط شده، فایل های موجود به صورت خودکار منتقل نمی شوند. در صورت نیاز، شما باید خودتان این کار را انجام دهید.",
+    "RecordingCancelled": "ضبط شدن لغو شد.",
+    "RecordSeries": "ضبط کردن سریال ها",
+    "Record": "ضبط کردن",
+    "RecommendationStarring": "با هنرمندی {0}",
+    "RecommendationDirectedBy": "کارگردانی شده توسط {0}",
+    "RecommendationBecauseYouWatched": "برای اینکه تو {0} مشاهده کردی",
+    "RecommendationBecauseYouLike": "برای اینکه تو {0} را نیز دوست داری",
+    "RecentlyWatched": "اخیرا مشاهده شده",
+    "Rate": "ارزیابی کن",
+    "Raised": "مطرح شده",
+    "QueueAllFromHere": "همه را از اینجا در صف قرار بده",
+    "Quality": "کیفیت",
+    "Programs": "برنامه ها",
+    "ProductionLocations": "محل تولید",
+    "Producer": "تولید کننده",
+    "Primary": "اصلی",
+    "Previous": "قبلی",
+    "Premieres": "برتر ها",
+    "Premiere": "برتر",
+    "PreferEmbeddedEpisodeInfosOverFileNames": "اطلاعات تعبیه شده در فراداده را به اسم فایل ترجیح بده",
+    "PreferEmbeddedEpisodeInfosOverFileNamesHelp": "این از اطلاعات قسمت در فراداده های تعبیه شده در صورت موجود استفاده می کند.",
+    "PreferEmbeddedTitlesOverFileNamesHelp": "این عنوان نمایش را به صورت پیش فرض تعیین می کند، زمانی که فراداده اینترنتی یا محلی موجود نباشند.",
+    "PreferEmbeddedTitlesOverFileNames": "عنوان های تعبیه شده را به نام فایل ترجیح بده",
+    "PluginInstalledMessage": "افزونه با موفقیت نصب شد. برای اعمال تغییرات سرور جلیفین نیاز به بارگذاری مجدد دارد.",
+    "PleaseSelectTwoItems": "لطفا حداقل دو مورد را انتخاب کنید.",
+    "PleaseRestartServerName": "لطفا سرور جلیفین را دوباره بارگذاری کنید - {0}.",
+    "PleaseEnterNameOrId": "لطفا یک نام یا شناسه خارجی را وارد کنید.",
+    "PleaseConfirmPluginInstallation": "لطفا با کلیک بر روی OK تایید کنید که شما متن بالا را خوانده اید و می خواهید که افزونه را نصب کنید.",
+    "PleaseAddAtLeastOneFolder": "لطفا حداقل یک پوشه به این کتابخانه با کلیک بر روی \"افزودن\" اضافه کنید.",
+    "Played": "اجرا شده",
+    "PlaybackErrorNoCompatibleStream": "سرویس گیرنده با مدیا سازگاری ندارد و سرور یک فرمت سازگار را ارسال نمی کند.",
+    "PlayNextEpisodeAutomatically": "قسمت بعدی را به صورت خودکار اجرا کن",
+    "PlayNext": "بعدی را اجرا کن",
+    "PlayFromBeginning": "از ابتدا اجرا کن",
+    "PlaybackData": "اجرای مجدد داده",
+    "PlayAllFromHere": "همه را از اینجا اجرا کن",
+    "Play": "اجرا کردن",
+    "PinCodeResetConfirmation": "آیا مطمئن هستید که می خواهید کد پین را باز نشانی کنید؟",
+    "PinCodeResetComplete": "کد پین بازنشانی شد.",
+    "PictureInPicture": "تصویر در تصویر",
+    "Person": "فرد",
+    "PerfectMatch": "همتای کامل",
+    "People": "افراد",
+    "MillisecondsUnit": "میلی‌ثانیه",
+    "LabelSyncPlayTimeOffset": "اختلاف زمانی با سرور:",
+    "LabelSeriesRecordingPath": "مسیر ضبط سریال‌ها (اختیاری):",
+    "LabelSelectFolderGroups": "به طور خودکار محتواهای پوشه‌های زیر را به فیلم ، موسیقی و تلویزیون گروه بندی شود:",
+    "LabelSeasonNumber": "شماره فصل:",
+    "ConfigureDateAdded": "تنظیم کنید که چگونه تاریخ اضافه شده در داشبورد سرور Jellyfin تحت تنظیمات کتابخانه تعیین می‌شود",
+    "CinemaModeConfigurationHelp": "حالت سینما تجربه تئاتر گونه را مستقیم به اتاق نشیمن شما می‌آورد با قابلیت پخش تریلرها و پیش نمایش‌ها قبل از سایر ویژگی‌های اصلی.",
+    "LaunchWebAppOnStartup": "نمای وب هنگامی که سرور آغاز به کار می‌کند باز بشود",
+    "NoSubtitles": "خالی",
+    "NoSubtitleSearchResultsFound": "نتیجه‌ای یافت نشد.",
+    "NoPluginConfigurationMessage": "این افزونه هیچ تنظیماتی برای پیکربندی ندارد.",
+    "No": "خیر",
+    "Next": "بعدی",
+    "News": "اخبار",
+    "NewEpisodesOnly": "فقط قسمت‌های جدید",
+    "NewEpisodes": "قسمت‌های جدید",
+    "NewCollectionNameExample": "مثال: مجموعه‌ی جنگ ستارگان",
+    "NewCollection": "مجموعه جدید",
+    "Never": "هرگز",
+    "Name": "نام",
+    "MySubtitles": "زیرنویس‌های من",
+    "Mute": "سکوت",
+    "MusicVideo": "موزیک ویدیو",
+    "MusicArtist": "هنرمند موسیقی",
+    "MusicAlbum": "آلبوم موسیقی",
+    "Movie": "فیلم",
+    "AddItemToCollectionHelp": "افزودن موارد به مجموعه ها با جستجوی آنها و استفاده از منوهای راست کلیک یا ضربه بزنید تا آنها را به مجموعه اضافه کنید.",
+    "AllowFfmpegThrottlingHelp": "هنگامی که یک transcode یا remux به اندازه کافی پیش از موقعیت پخش فعلی می شود ، روند را متوقف می کند تا منابع کمتری مصرف کند. این بیشتر مفید است در هنگام تماشای بدون به دنبال اغلب. اگر مسائل مربوط به پخش را تجربه کنید ، این را خاموش کنید.",
+    "DefaultSubtitlesHelp": "زیرنویس ها بر اساس پرچم های پیش فرض و اجباری در ابرداده تعبیه شده بارگذاری می شوند. تنظیمات زبان در نظر گرفته می شوند زمانی که گزینه های متعدد در دسترس هستند.",
+    "DeinterlaceMethodHelp": "روش deinterlacing برای استفاده از زمانی که transcoding محتوای هم آمیختن را انتخاب کنید.",
+    "DeviceAccessHelp": "این فقط برای دستگاههایی است که می توانند به صورت منحصر به فرد شناسایی شوند و از دسترسی مرورگر جلوگیری نکنند. فیلتر کردن دسترسی دستگاه کاربر مانع از استفاده از دستگاه های جدید می شود تا اینکه در اینجا تایید شده باشند.",
+    "DirectStreamHelp1": "رسانه ها با دستگاه مربوط به رزولوشن و نوع رسانه (H. 264 ، AC3 و غیره) سازگار است ، اما در یک ظرف فایل ناسازگار (mkv ، avi ، wmv و غیره) است. ویدیو قبل از پخش آن به دستگاه دوباره بسته بندی می شود.",
+    "EasyPasswordHelp": "کد pin آسان شما برای دسترسی آفلاین در مشتریان پشتیبانی شده استفاده می شود و همچنین برای ورود به سیستم در شبکه آسان است.",
+    "EnableBackdropsHelp": "Display backdrops in the background of some pages while browsing the library.",
+    "EnableNextVideoInfoOverlayHelp": "At the end of a video, display info about the next video coming up in the current playlist.",
+    "EnablePhotosHelp": "Images will be detected and displayed alongside other media files.",
+    "EnableStreamLoopingHelp": "Enable this if live streams only contain a few seconds of data and need to be continuously requested. Enabling this when not needed may cause problems.",
+    "EnableThemeSongsHelp": "Play theme songs in the background while browsing the library.",
+    "EnableThemeVideosHelp": "Play theme videos in the background while browsing the library.",
+    "BurnSubtitlesHelp": "Determines if the server should burn in subtitles when transcoding videos. Avoiding this will greatly improve performance. Select Auto to burn image based formats (VOBSUB, PGS, SUB, IDX, …) and certain ASS or SSA subtitles.",
+    "Episode": "Episode",
+    "ErrorAddingListingsToSchedulesDirect": "There was an error adding the lineup to your Schedules Direct account. Schedules Direct only allows a limited number of lineups per account. You may need to log into the Schedules Direct website and remove others listings from your account before proceeding.",
+    "ErrorAddingMediaPathToVirtualFolder": "There was an error adding the media path. Please ensure the path is valid and the Jellyfin Server process has access to that location.",
+    "ErrorAddingTunerDevice": "There was an error adding the tuner device. Please ensure it is accessible and try again.",
+    "ErrorAddingXmlTvFile": "There was an error accessing the XMLTV file. Please ensure the file exists and try again.",
+    "ErrorDeletingItem": "There was an error deleting the item from Jellyfin Server. Please check that Jellyfin Server has write access to the media folder and try again.",
+    "ErrorGettingTvLineups": "There was an error downloading TV lineups. Please ensure your information is correct and try again.",
+    "ErrorPleaseSelectLineup": "Please select a lineup and try again. If no lineups are available, then please check that your username, password, and postal code is correct.",
+    "ErrorSavingTvProvider": "There was an error saving the TV provider. Please ensure it is accessible and try again.",
+    "LabelExtractChaptersDuringLibraryScanHelp": "Generate chapter images when videos are imported during the library scan. Otherwise, they will be extracted during the chapter images scheduled task, allowing the regular library scan to complete faster.",
+    "LabelFailed": "Failed",
+    "LabelFileOrUrl": "File or URL:",
+    "HeaderSelectServerCachePath": "Select Server Cache Path",
+    "HeaderSelectServerCachePathHelp": "Browse or enter the path to use for server cache files. The folder must be writeable.",
+    "HeaderSelectTranscodingPath": "Select Transcoding Temporary Path",
+    "HeaderSelectTranscodingPathHelp": "Browse or enter the path to use for transcoding temporary files. The folder must be writeable.",
+    "LabelArtistsHelp": "Separate multiple using ;",
+    "LabelAudio": "Audio",
+    "LabelAudioBitDepth": "Audio bit depth:",
+    "LabelAudioBitrate": "Audio bitrate:",
+    "LabelAudioChannels": "Audio channels:",
+    "LabelAudioCodec": "Audio codec:",
+    "LabelAudioSampleRate": "Audio sample rate:",
+    "LabelAuthProvider": "Authentication Provider:",
+    "LabelAutomaticallyRefreshInternetMetadataEvery": "Automatically refresh metadata from the internet:",
+    "LabelBindToLocalNetworkAddress": "Bind to local network address:",
+    "LabelBindToLocalNetworkAddressHelp": "Optional. Override the local IP address to bind the http server to. If left empty, the server will bind to all availabile addresses. Changing this value requires restarting Jellyfin Server.",
+    "LabelBirthDate": "Birth date:",
+    "LabelBirthYear": "Birth year:",
+    "LabelBitrate": "Bitrate:",
+    "LabelBlastMessageInterval": "Alive message interval (seconds)",
+    "LabelBlastMessageIntervalHelp": "Determines the duration in seconds between blast alive messages.",
+    "LabelBlockContentWithTags": "Block items with tags:",
+    "LabelBurnSubtitles": "Burn subtitles:",
+    "LabelCache": "Cache:",
+    "LabelCachePath": "Cache path:",
+    "LabelCachePathHelp": "Specify a custom location for server cache files such as images. Leave blank to use the server default.",
+    "LabelCancelled": "Cancelled",
+    "LabelCertificatePassword": "Certificate password:",
+    "LabelCertificatePasswordHelp": "If your certificate requires a password, please enter it here.",
+    "LabelChannels": "Channels:",
+    "LabelCollection": "Collection:",
+    "LabelCommunityRating": "Community rating:",
+    "LabelCustomDeviceDisplayNameHelp": "Supply a custom display name or leave empty to use the name reported by the device.",
+    "LabelDateAddedBehavior": "Date added behavior for new content:",
+    "LabelDateAddedBehaviorHelp": "If a metadata value is present it will always be used before either of these options.",
+    "LabelDateTimeLocale": "Date time locale:",
+    "LabelDay": "Day:",
+    "LabelDeathDate": "Death date:",
+    "LabelDefaultScreen": "Default screen:",
+    "LabelDefaultUser": "Default user:",
+    "LabelDefaultUserHelp": "Determines which user library should be displayed on connected devices. This can be overridden for each device using profiles.",
+    "LabelDeinterlaceMethod": "Deinterlacing method:",
+    "LabelDeviceDescription": "Device description",
+    "LabelDidlMode": "DIDL mode:",
+    "LabelDiscNumber": "Disc number:",
+    "LabelDisplayLanguage": "Display language:",
+    "LabelDisplayLanguageHelp": "Translating Jellyfin is an ongoing project.",
+    "LabelDisplayMode": "Display mode:",
+    "LabelDisplayName": "Display name:",
+    "LabelDisplayOrder": "Display order:",
+    "LabelDisplaySpecialsWithinSeasons": "Display specials within seasons they aired in",
+    "LabelDownMixAudioScale": "Audio boost when downmixing:",
+    "LabelDownMixAudioScaleHelp": "Boost audio when downmixing. A value of one will preserve the original volume.",
+    "LabelDownloadLanguages": "Download languages:",
+    "LabelDropImageHere": "Drop image here, or click to browse.",
+    "LabelDroppedFrames": "Dropped frames:",
+    "LabelDropShadow": "Drop shadow:",
+    "LabelDynamicExternalId": "{0} Id:",
+    "LabelEasyPinCode": "Easy pin code:",
+    "LabelEmbedAlbumArtDidl": "Embed album art in Didl",
+    "LabelEmbedAlbumArtDidlHelp": "Some devices prefer this method for obtaining album art. Others may fail to play with this option enabled.",
+    "LabelEnableAutomaticPortMap": "Enable automatic port mapping",
+    "LabelEnableAutomaticPortMapHelp": "Automatically forward public ports on your router to local ports on your server via UPnP. This may not work with some router models or network configurations. Changes will not apply until after a server restart.",
+    "LabelEnableBlastAliveMessages": "Blast alive messages",
+    "LabelEnableBlastAliveMessagesHelp": "Enable this if the server is not detected reliably by other UPnP devices on your network.",
+    "LabelEnableDlnaClientDiscoveryInterval": "Client discovery interval (seconds)",
+    "LabelEnableDlnaClientDiscoveryIntervalHelp": "Determines the duration in seconds between SSDP searches performed by Jellyfin.",
+    "LabelEnableDlnaDebugLogging": "Enable DLNA debug logging",
+    "LabelEnableDlnaDebugLoggingHelp": "Create large log files and should only be used as needed for troubleshooting purposes.",
+    "LabelEnableDlnaPlayTo": "Enable DLNA Play To",
+    "LabelEnableDlnaPlayToHelp": "Detect devices within your network and offer the ability to remote control them.",
+    "LabelEnableDlnaServer": "Enable DLNA server",
+    "LabelEnableDlnaServerHelp": "Allows UPnP devices on your network to browse and play content.",
+    "LabelEnableHardwareDecodingFor": "Enable hardware decoding for:",
+    "LabelEnableHttps": "Enable HTTPS",
+    "LabelEnableHttpsHelp": "Enables the server to listen on the configured HTTPS port. A valid certificate must also be configured in order for this to take effect.",
+    "LabelEnableRealtimeMonitor": "Enable real time monitoring",
+    "LabelEnableRealtimeMonitorHelp": "Changes to files will be processed immediately, on supported file systems.",
+    "LabelEnableSingleImageInDidlLimit": "Limit to single embedded image",
+    "LabelEnableSingleImageInDidlLimitHelp": "Some devices will not render properly if multiple images are embedded within Didl.",
+    "LabelEndDate": "End date:",
+    "LabelEpisodeNumber": "Episode number:",
+    "LabelEvent": "Event:",
+    "LabelEveryXMinutes": "Every:",
+    "LabelBaseUrl": "Base URL:",
+    "LabelBaseUrlHelp": "Adds a custom subdirectory to the server URL. For example: <code>http://example.com/<b>&lt;baseurl&gt;</b></code>",
+    "LabelExtractChaptersDuringLibraryScan": "Extract chapter images during the library scan",
+    "EnableDetailsBanner": "Details Banner",
+    "EnableDetailsBannerHelp": "Display a banner image at the top of the item details page.",
+    "ExtractChapterImagesHelp": "Extracting chapter images will allow clients to display graphical scene selection menus. The process can be slow, resource intensive, and may require several gigabytes of space. It runs when videos are discovered, and also as a nightly scheduled task. The schedule is configurable in the scheduled tasks area. It is not recommended to run this task during peak usage hours.",
+    "FFmpegSavePathNotFound": "We're unable to locate FFmpeg using the path you've entered. FFprobe is also required and must exist in the same folder. These components are normally bundled together in the same download. Please check the path and try again.",
+    "LabelTagline": "Tagline:",
+    "RefreshDialogHelp": "Metadata is refreshed based on settings and internet services that are enabled in the Jellyfin Server dashboard.",
+    "RefreshMetadata": "Refresh metadata",
+    "RefreshQueued": "Refresh queued.",
+    "ReleaseDate": "Release date",
+    "ReleaseGroup": "Release Group",
+    "RememberMe": "Remember Me",
+    "RemoveFromCollection": "Remove from collection",
+    "RemoveFromPlaylist": "Remove from playlist",
+    "Repeat": "Repeat",
+    "RepeatAll": "Repeat all",
+    "RepeatEpisodes": "Repeat episodes",
+    "RepeatMode": "Repeat Mode",
+    "RepeatOne": "Repeat one",
+    "GuideProviderSelectListings": "Select Listings",
+    "H264CrfHelp": "The Constant Rate Factor (CRF) is the default quality setting for the x264 encoder. You can set the values between 0 and 51, where lower values would result in better quality (at the expense of higher file sizes). Sane values are between 18 and 28. The default for x264 is 23, so you can use this as a starting point.",
+    "HardwareAccelerationWarning": "Enabling hardware acceleration may cause instability in some environments. Ensure that your operating system and video drivers are fully up to date. If you have difficulty playing video after enabling this, you'll need to change the setting back to None.",
+    "HeaderAddToCollection": "Add to Collection",
+    "HeaderAddToPlaylist": "Add to Playlist",
+    "HeaderAddUpdateImage": "Add/Update Image",
+    "HeaderAdditionalParts": "Additional Parts",
+    "HeaderAdmin": "Admin",
+    "HeaderAlbums": "Albums",
+    "HeaderAlert": "Alert",
+    "HeaderAllowMediaDeletionFrom": "Allow Media Deletion From",
+    "HeaderApiKey": "API Key",
+    "HeaderApiKeys": "API Keys",
+    "HeaderApiKeysHelp": "External applications are required to have an API key in order to communicate with Jellyfin Server. Keys are issued by logging in with a Jellyfin account, or by manually granting the application a key.",
+    "ApiKeysCaption": "List of the currently enabled API keys",
+    "HeaderApp": "App",
+    "LabelFont": "Font:",
+    "LabelForgotPasswordUsernameHelp": "Enter your username, if you remember it.",
+    "LabelFormat": "Format:",
+    "LabelFriendlyName": "Friendly name:",
+    "LabelServerNameHelp": "This name will be used to identify the server and will default to the server's computer name.",
+    "LabelGroupMoviesIntoCollections": "Group movies into collections",
+    "LabelGroupMoviesIntoCollectionsHelp": "When displaying movie lists, movies belonging to a collection will be displayed as one grouped item.",
+    "LabelH264Crf": "H264 encoding CRF:",
+    "LabelEncoderPreset": "H264 and H265 encoding preset:",
+    "LabelHardwareAccelerationType": "Hardware acceleration:",
+    "LabelHomeScreenSectionValue": "Home screen section {0}:",
+    "LabelHttpsPortHelp": "The TCP port number that Jellyfin's HTTPS server should bind to.",
+    "LabelIconMaxHeightHelp": "Maximum resolution of icons exposed via upnp:icon.",
+    "LabelIconMaxWidthHelp": "Maximum resolution of icons exposed via upnp:icon.",
+    "LabelIdentificationFieldHelp": "A case-insensitive substring or regex expression.",
+    "LabelImageFetchersHelp": "Enable and rank your preferred image fetchers in order of priority.",
+    "LabelInNetworkSignInWithEasyPassword": "Enable in-network sign in with my easy pin code",
+    "Off": "Off",
+    "OneChannel": "One channel",
+    "OnlyForcedSubtitles": "Only Forced",
+    "OnlyForcedSubtitlesHelp": "Only subtitles marked as forced will be loaded.",
+    "OnlyImageFormats": "Only Image Formats (VOBSUB, PGS, SUB)",
+    "Option3D": "3D",
+    "OptionAdminUsers": "Administrators",
+    "OptionAlbum": "Album",
+    "OptionAlbumArtist": "Album Artist",
+    "OptionAllUsers": "All users",
+    "OptionAllowAudioPlaybackTranscoding": "Allow audio playback that requires transcoding",
+    "OptionForceRemoteSourceTranscoding": "Force transcoding of remote media sources (like LiveTV)",
+    "OptionAllowBrowsingLiveTv": "Allow Live TV access",
+    "OptionAllowContentDownloading": "Allow media downloading and syncing",
+    "OptionAllowLinkSharing": "Allow social media sharing",
+    "OptionAllowLinkSharingHelp": "Only web pages containing media information are shared. Media files are never shared publicly. Shares are time-limited and will expire after {0} days.",
+    "OptionAllowManageLiveTv": "Allow Live TV recording management",
+    "OptionAllowMediaPlayback": "Allow media playback",
+    "OptionAllowMediaPlaybackTranscodingHelp": "Restricting access to transcoding may cause playback failures in Jellyfin apps due to unsupported media formats.",
+    "OptionAllowRemoteControlOthers": "Allow remote control of other users",
+    "OptionAllowRemoteSharedDevices": "Allow remote control of shared devices",
+    "OptionAllowRemoteSharedDevicesHelp": "DLNA devices are considered shared until a user begins controlling them.",
+    "OptionAllowSyncTranscoding": "Allow media downloading and syncing that requires transcoding",
+    "OptionAllowUserToManageServer": "Allow this user to manage the server",
+    "OptionAllowVideoPlaybackRemuxing": "Allow video playback that requires conversion without re-encoding",
+    "OptionAllowVideoPlaybackTranscoding": "Allow video playback that requires transcoding",
+    "OptionArtist": "Artist",
+    "OptionAuto": "Auto",
+    "OptionAutomatic": "Auto",
+    "OptionAutomaticallyGroupSeries": "Automatically merge series that are spread across multiple folders",
+    "OptionAutomaticallyGroupSeriesHelp": "If enabled, series that are spread across multiple folders within this library will be automatically merged into a single series.",
+    "OptionBanner": "Banner",
+    "OptionBlockBooks": "Books",
+    "OptionBlockChannelContent": "Internet Channel Content",
+    "OptionBlockLiveTvChannels": "Live TV Channels",
+    "OptionBlockMovies": "Movies",
+    "OptionBlockMusic": "Music",
+    "OptionBlockTrailers": "Trailers",
+    "OptionBlockTvShows": "TV Shows",
+    "OptionBluray": "Blu-ray",
+    "OptionCaptionInfoExSamsung": "CaptionInfoEx (Samsung)",
+    "OptionCommunityRating": "Community Rating",
+    "OptionContinuing": "Continuing",
+    "OptionCriticRating": "Critic Rating",
+    "OptionCustomUsers": "Custom",
+    "OptionDaily": "Daily",
+    "OptionDateAdded": "Date Added",
+    "OptionDateAddedFileTime": "Use file creation date",
+    "OptionDateAddedImportTime": "Use date scanned into the library",
+    "OptionDatePlayed": "Date Played",
+    "OptionDisableUser": "Disable this user",
+    "OptionDisableUserHelp": "If disabled the server will not allow any connections from this user. Existing connections will be abruptly terminated.",
+    "OptionDisplayFolderView": "Display a folder view to show plain media folders",
+    "OptionDisplayFolderViewHelp": "Display folders alongside your other media libraries. This can be useful if you'd like to have a plain folder view.",
+    "OptionDownloadArtImage": "Art",
+    "OptionDownloadBackImage": "Back",
+    "OptionDownloadBannerImage": "Banner",
+    "OptionDownloadBoxImage": "Box",
+    "OptionDownloadDiscImage": "Disc",
+    "OptionDownloadImagesInAdvance": "Download images in advance",
+    "OptionDownloadImagesInAdvanceHelp": "By default, most images are only downloaded when requested by a Jellyfin app. Enable this option to download all images in advance, as new media is imported. This may cause significantly longer library scans.",
+    "OptionDownloadLogoImage": "Logo",
+    "OptionDownloadMenuImage": "Menu",
+    "OptionDownloadPrimaryImage": "Primary",
+    "OptionDownloadThumbImage": "Thumb",
+    "OptionDvd": "DVD",
+    "OptionEmbedSubtitles": "Embed within container",
+    "OptionEnableExternalContentInSuggestions": "Enable external content in suggestions",
+    "OptionEnableExternalContentInSuggestionsHelp": "Allow internet trailers and live TV programs to be included within suggested content.",
+    "OptionEnableForAllTuners": "Enable for all tuner devices",
+    "OptionEnableM2tsMode": "Enable M2ts mode",
+    "OptionEnableM2tsModeHelp": "Enable m2ts mode when encoding to mpegts.",
+    "OptionEnded": "Ended",
+    "OptionEquals": "Equals",
+    "OptionEstimateContentLength": "Estimate content length when transcoding",
+    "OptionEveryday": "Every day",
+    "OptionExternallyDownloaded": "External download",
+    "OptionExtractChapterImage": "Enable chapter image extraction",
+    "OptionFriday": "Friday",
+    "OptionHasSpecialFeatures": "Special Features",
+    "OptionHasSubtitles": "Subtitles",
+    "OptionHasThemeSong": "Theme Song",
+    "OptionHasThemeVideo": "Theme Video",
+    "OptionHasTrailer": "Trailer",
+    "OptionHideUser": "Hide this user from login screens",
+    "OptionHideUserFromLoginHelp": "Useful for private or hidden administrator accounts. The user will need to sign in manually by entering their username and password.",
+    "HeaderSendMessage": "Send Message",
+    "HeaderSeries": "Series",
+    "HeaderSeriesOptions": "Series Options",
+    "HeaderSeriesStatus": "Series Status",
+    "HeaderServerAddressSettings": "Server Address Settings",
+    "HeaderServerSettings": "Server Settings",
+    "HeaderSettings": "Settings",
+    "HeaderShutdown": "Shutdown",
+    "HeaderSortBy": "Sort By",
+    "HeaderSortOrder": "Sort Order",
+    "HeaderSpecialEpisodeInfo": "Special Episode Info",
+    "HeaderSpecialFeatures": "Special Features",
+    "HeaderStartNow": "Start Now",
+    "HeaderStatus": "Status",
+    "HeaderStopRecording": "Stop Recording",
+    "HeaderSubtitleAppearance": "Subtitle Appearance",
+    "HeaderSubtitleDownloads": "Subtitle Downloads",
+    "HeaderSubtitleProfile": "Subtitle Profile",
+    "HeaderSubtitleProfiles": "Subtitle Profiles",
+    "HeaderSubtitleProfilesHelp": "Subtitle profiles describe the subtitle formats supported by the device.",
+    "HeaderSyncPlaySelectGroup": "Join a group",
+    "HeaderSyncPlayEnabled": "SyncPlay enabled",
+    "HeaderTags": "Tags",
+    "HeaderThisUserIsCurrentlyDisabled": "This user is currently disabled",
+    "HeaderTracks": "Tracks",
+    "HeaderTranscodingProfile": "Transcoding Profile",
+    "HeaderTranscodingProfileHelp": "Add transcoding profiles to indicate which formats should be used when transcoding is required.",
+    "HeaderTunerDevices": "Tuner Devices",
+    "HeaderTuners": "Tuners",
+    "HeaderTypeText": "Enter Text",
+    "HeaderUpcomingOnTV": "Upcoming On TV",
+    "HeaderUploadImage": "Upload Image",
+    "HeaderUser": "User",
+    "HeaderVideoQuality": "Video Quality",
+    "HeaderVideoType": "Video Type",
+    "HeaderVideoTypes": "Video Types",
+    "HeaderVideos": "Videos",
+    "HeaderXmlDocumentAttribute": "Xml Document Attribute",
+    "HeaderXmlDocumentAttributes": "Xml Document Attributes",
+    "HeaderXmlSettings": "Xml Settings",
+    "HeaderYears": "Years",
+    "HeadersFolders": "Folders",
+    "Help": "Help",
+    "Hide": "Hide",
+    "HideWatchedContentFromLatestMedia": "Hide watched content from latest media",
+    "Home": "Home",
+    "Horizontal": "Horizontal",
+    "HttpsRequiresCert": "To enable secure connections, you will need to supply a trusted SSL certificate, such as Let's Encrypt. Please either supply a certificate, or disable secure connections.",
+    "Identify": "Identify",
+    "Images": "Images",
+    "ImportFavoriteChannelsHelp": "If enabled, only channels that are marked as favorite on the tuner device will be imported.",
+    "ImportMissingEpisodesHelp": "If enabled, information about missing episodes will be imported into your Jellyfin database and displayed within seasons and series. This may cause significantly longer library scans.",
+    "InstallingPackage": "Installing {0} (version {1})",
+    "InstantMix": "Instant mix",
+    "ItemCount": "{0} items",
+    "Items": "Items",
+    "Kids": "Kids",
+    "Label3DFormat": "3D format:",
+    "LabelAbortedByServerShutdown": "(Aborted by server shutdown)",
+    "LabelAccessDay": "Day of week:",
+    "LabelAccessEnd": "End time:",
+    "LabelAccessStart": "Start time:",
+    "LabelAirDays": "Air days:",
+    "LabelAirTime": "Air time:",
+    "LabelAirsAfterSeason": "Airs after season:",
+    "LabelAirsBeforeEpisode": "Airs before episode:",
+    "LabelAirsBeforeSeason": "Airs before season:",
+    "LabelAlbum": "Album:",
+    "LabelAlbumArtHelp": "PN used for album art, within the dlna:profileID attribute on upnp:albumArtURI. Some devices require a specific value, regardless of the size of the image.",
+    "LabelAlbumArtMaxHeight": "Album art max height:",
+    "LabelAlbumArtMaxHeightHelp": "Max resolution of album art exposed via upnp:albumArtURI.",
+    "LabelAlbumArtMaxWidth": "Album art max width:",
+    "LabelAlbumArtMaxWidthHelp": "Max resolution of album art exposed via upnp:albumArtURI.",
+    "LabelAlbumArtPN": "Album art PN:",
+    "LabelAlbumArtists": "Album artists:",
+    "LabelAll": "All",
+    "LabelAllowHWTranscoding": "Allow hardware transcoding",
+    "LabelAllowServerAutoRestart": "Allow the server to restart automatically to apply updates",
+    "LabelAllowServerAutoRestartHelp": "The server will only restart during idle periods when no users are active.",
+    "LabelAllowedRemoteAddresses": "Remote IP address filter:",
+    "LabelAllowedRemoteAddressesMode": "Remote IP address filter mode:",
+    "LabelAppName": "App name",
+    "LabelAppNameExample": "Example: Sickbeard, Sonarr",
+    "LabelArtists": "Artists:",
+    "OptionHlsSegmentedSubtitles": "HLS segmented subtitles",
+    "OptionHomeVideos": "Photos",
+    "OptionIgnoreTranscodeByteRangeRequests": "Ignore transcode byte range requests",
+    "OptionIgnoreTranscodeByteRangeRequestsHelp": "If enabled, these requests will be honored but will ignore the byte range header.",
+    "OptionImdbRating": "IMDb Rating",
+    "OptionIsHD": "HD",
+    "OptionIsSD": "SD",
+    "OptionList": "List",
+    "OptionLoginAttemptsBeforeLockout": "Determines how many incorrect login attempts can be made before lockout occurs.",
+    "OptionLoginAttemptsBeforeLockoutHelp": "A value of zero means inheriting the default of three attempts for normal users and five for administrators. Setting this to -1 will disable the feature.",
+    "OptionMax": "Max",
+    "OptionMissingEpisode": "Missing Episodes",
+    "OptionMonday": "Monday",
+    "OptionNameSort": "Name",
+    "OptionNew": "New…",
+    "OptionNone": "None",
+    "OptionOnAppStartup": "On application startup",
+    "LabelMaxResumePercentageHelp": "Titles are assumed fully played if stopped after this time.",
+    "LabelMaxScreenshotsPerItem": "Maximum number of screenshots per item:",
+    "LabelMaxStreamingBitrate": "Maximum streaming quality:",
+    "LabelMaxStreamingBitrateHelp": "Specify a maximum bitrate when streaming.",
+    "LabelMessageText": "Message text:",
+    "LabelMessageTitle": "Message title:",
+    "LabelMetadata": "Metadata:",
+    "LabelMetadataDownloadLanguage": "Preferred download language:",
+    "LabelMetadataDownloadersHelp": "Enable and rank your preferred metadata downloaders in order of priority. Lower priority downloaders will only be used to fill in missing information.",
+    "LabelMetadataPath": "Metadata path:",
+    "LabelMetadataPathHelp": "Specify a custom location for downloaded artwork and metadata.",
+    "LabelMetadataReaders": "Metadata readers:",
+    "LabelMetadataReadersHelp": "Rank your preferred local metadata sources in order of priority. The first file found will be read.",
+    "LabelMetadataSavers": "Metadata savers:",
+    "LabelMetadataSaversHelp": "Choose the file formats to save your metadata to.",
+    "LabelMethod": "Method:",
+    "LabelMinBackdropDownloadWidth": "Minimum backdrop download width:",
+    "LabelMinResumeDuration": "Minimum resume duration:",
+    "LabelMinResumeDurationHelp": "The shortest video length in seconds that will save playback location and let you resume.",
+    "LabelMinResumePercentage": "Minimum resume percentage:",
+    "LabelMinResumePercentageHelp": "Titles are assumed unplayed if stopped before this time.",
+    "LabelMinScreenshotDownloadWidth": "Minimum screenshot download width:",
+    "LabelModelDescription": "Model description",
+    "LabelModelName": "Model name",
+    "LabelModelNumber": "Model number",
+    "LabelModelUrl": "Model URL",
+    "LabelMonitorUsers": "Monitor activity from:",
+    "LabelMovieCategories": "Movie categories:",
+    "LabelMoviePrefix": "Movie prefix:",
+    "LabelMoviePrefixHelp": "If a prefix is applied to movie titles, enter it here so the server can handle it properly.",
+    "LabelMovieRecordingPath": "Movie recording path (optional):",
+    "LabelMusicStreamingTranscodingBitrate": "Music transcoding bitrate:",
+    "LabelMusicStreamingTranscodingBitrateHelp": "Specify a max bitrate when streaming music.",
+    "LabelName": "Name:",
+    "LabelChromecastVersion": "Chromecast Version",
+    "LabelStable": "Stable",
+    "LabelNightly": "Nightly",
+    "LabelNewName": "New name:",
+    "LabelNewsCategories": "News categories:",
+    "LabelNotificationEnabled": "Enable this notification",
+    "LabelNumber": "Number:",
+    "LabelNumberOfGuideDays": "Number of days of guide data to download:",
+    "LabelNumberOfGuideDaysHelp": "Downloading more days worth of guide data provides the ability to schedule out further in advance and view more listings, but it will also take longer to download. Auto will choose based on the number of channels.",
+    "LabelOptionalNetworkPath": "(Optional) Shared network folder:",
+    "LabelOptionalNetworkPathHelp": "If this folder is shared on your network, supplying the network share path can allow Jellyfin apps on other devices to access media files directly. For example, {0} or {1}.",
+    "LabelOriginalAspectRatio": "Original aspect ratio:",
+    "LabelOriginalTitle": "Original title:",
+    "LabelOverview": "Overview:",
+    "LabelParentNumber": "Parent number:",
+    "LabelParentalRating": "Parental rating:",
+    "LabelPassword": "Password:",
+    "LabelPasswordConfirm": "Password (confirm):",
+    "LabelPasswordResetProvider": "Password Reset Provider:",
+    "LabelPasswordRecoveryPinCode": "Pin code:",
+    "LabelPath": "Path:",
+    "LabelPersonRole": "Role:",
+    "LabelPersonRoleHelp": "Example: Ice cream truck driver",
+    "LabelPlaceOfBirth": "Place of birth:",
+    "LabelPlayDefaultAudioTrack": "Play default audio track regardless of language",
+    "LabelPlayer": "Player:",
+    "LabelPlayerDimensions": "Player dimensions:",
+    "LabelPlaylist": "Playlist:",
+    "LabelPlayMethod": "Play method:",
+    "LabelPleaseRestart": "Changes will take effect after manually reloading the web client.",
+    "LabelPostProcessor": "Post-processing application:",
+    "LabelPostProcessorArguments": "Post-processor command line arguments:",
+    "LabelPostProcessorArgumentsHelp": "Use {path} as the path to the recording file.",
+    "LabelPreferredDisplayLanguage": "Preferred display language:",
+    "LabelPreferredDisplayLanguageHelp": "Translating Jellyfin is an ongoing project.",
+    "LabelPreferredSubtitleLanguage": "Preferred subtitle language:",
+    "LabelProfileAudioCodecs": "Audio codecs:",
+    "LabelProfileCodecs": "Codecs:",
+    "LabelProfileContainer": "Container:",
+    "LabelProfileContainersHelp": "Separated by comma. This can be left empty to apply to all containers.",
+    "LabelProfileVideoCodecs": "Video codecs:",
+    "LabelProtocol": "Protocol:",
+    "LabelProtocolInfo": "Protocol info:",
+    "LabelProtocolInfoHelp": "The value that will be used when responding to GetProtocolInfo requests from the device.",
+    "LabelPublicHttpPort": "Public HTTP port number:",
+    "LabelPublicHttpPortHelp": "The public port number that should be mapped to the local HTTP port.",
+    "LabelPublicHttpsPort": "Public HTTPS port number:",
+    "LabelPublicHttpsPortHelp": "The public port number that should be mapped to the local HTTPS port.",
+    "LabelReadHowYouCanContribute": "Learn how you can contribute.",
+    "LabelReasonForTranscoding": "Reason for transcoding:",
+    "LabelRecord": "Record:",
+    "LabelRecordingPath": "Default recording path:",
+    "LabelRecordingPathHelp": "Specify the default location to save recordings. If left empty, the server's program data folder will be used.",
+    "LabelRefreshMode": "Refresh mode:",
+    "LabelReleaseDate": "Release date:",
+    "LabelRemoteClientBitrateLimit": "Internet streaming bitrate limit (Mbps):",
+    "LabelRemoteClientBitrateLimitHelp": "An optional per-stream bitrate limit for all out of network devices. This is useful to prevent devices from requesting a higher bitrate than your internet connection can handle. This may result in increased CPU load on your server in order to transcode videos on the fly to a lower bitrate.",
+    "LabelRequireHttps": "Require HTTPS",
+    "LabelRequireHttpsHelp": "If checked, the server will automatically redirect all requests over HTTP to HTTPS. This has no effect if the server is not listening on HTTPS.",
+    "LabelRuntimeMinutes": "Run time (minutes):",
+    "LabelScheduledTaskLastRan": "Last ran {0}, taking {1}.",
+    "LabelScreensaver": "Screensaver:",
+    "LabelSelectFolderGroupsHelp": "Folders that are unchecked will be displayed by themselves in their own view.",
+    "LabelSkipIfGraphicalSubsPresentHelp": "Keeping text versions of subtitles will result in more efficient delivery and decrease the likelihood of video transcoding.",
+    "LabelSonyAggregationFlagsHelp": "Determines the content of the aggregationFlags element in the urn:schemas-sonycom:av namespace.",
+    "LabelSyncPlayPlaybackDiff": "Playback time difference:",
+    "LabelSyncPlaySyncMethod": "Sync method:",
+    "LabelSyncPlayNewGroup": "New group",
+    "LabelSyncPlayNewGroupDescription": "Create a new group",
+    "LabelSyncPlayLeaveGroup": "Leave group",
+    "HeaderAppearsOn": "Appears On",
+    "HeaderAudioBooks": "Audio Books",
+    "HeaderAudioSettings": "Audio Settings",
+    "HeaderAutomaticUpdates": "Automatic Updates",
+    "HeaderBranding": "Branding",
+    "HeaderConfigureRemoteAccess": "Configure Remote Access",
+    "HeaderConfirmPluginInstallation": "Confirm Plugin Installation",
+    "HeaderConfirmProfileDeletion": "Confirm Profile Deletion",
+    "HeaderConfirmRevokeApiKey": "Revoke API Key",
+    "HeaderConnectToServer": "Connect to Server",
+    "HeaderConnectionFailure": "Connection Failure",
+    "HeaderContainerProfile": "Container Profile",
+    "HeaderContainerProfileHelp": "Container profiles indicate the limitations of a device when playing specific formats. If a limitation applies then the media will be transcoded, even if the format is configured for direct play.",
+    "HeaderContinueListening": "Continue Listening",
+    "HeaderDVR": "DVR",
+    "HeaderFavoritePlaylists": "Favorite Playlists",
+    "HeaderHttpsSettings": "HTTPS Settings",
+    "HeaderNavigation": "Navigation",
+    "HeaderProfileServerSettingsHelp": "These values control how Jellyfin Server will present itself to the device.",
+    "HeaderRemoteAccessSettings": "Remote Access Settings",
+    "HeaderRemoteControl": "Remote Control",
+    "HeaderRemoveMediaFolder": "Remove Media Folder",
+    "HeaderRemoveMediaLocation": "Remove Media Location",
+    "HeaderResponseProfile": "Response Profile",
+    "HeaderResponseProfileHelp": "Response profiles provide a way to customize information sent to the device when playing certain kinds of media.",
+    "HeaderRestart": "Restart",
+    "HeaderRestartingServer": "Restarting Server",
+    "HeaderRevisionHistory": "Revision History",
+    "HeaderRunningTasks": "Running Tasks",
+    "HeaderScenes": "Scenes",
+    "HeaderSchedule": "Schedule",
+    "HeaderSeasons": "Seasons",
+    "HeaderSecondsValue": "{0} Seconds",
+    "HeaderSelectCertificatePath": "Select Certificate Path",
+    "HeaderSelectMetadataPath": "Select Metadata Path",
+    "HeaderSelectMetadataPathHelp": "Browse or enter the path you'd like to store metadata within. The folder must be writeable.",
+    "HeaderSelectPath": "Select Path",
+    "HeaderSelectServer": "Select Server",
+    "LabelFolder": "Folder:",
+    "LabelSyncPlayLeaveGroupDescription": "Disable SyncPlay",
+    "LabelSyncPlayAccessCreateAndJoinGroups": "Allow user to create and join groups",
+    "LabelSyncPlayAccessJoinGroups": "Allow user to join groups",
+    "LabelSyncPlayAccessNone": "Disabled for this user",
+    "LabelSyncPlayAccess": "SyncPlay access",
+    "LabelTVHomeScreen": "TV mode home screen:",
+    "LabelTag": "Tag:",
+    "LabelTextBackgroundColor": "Text background color:",
+    "LabelTextColor": "Text color:",
+    "LabelTextSize": "Text size:",
+    "LabelTheme": "Theme:",
+    "LabelTime": "Time:",
+    "LabelTitle": "Title:",
+    "LabelTrackNumber": "Track number:",
+    "LabelTranscodingAudioCodec": "Audio codec:",
+    "LabelTranscodingContainer": "Container:",
+    "LabelTranscodePath": "Transcode path:",
+    "LabelTranscodingTempPathHelp": "Specify a custom path for the transcode files served to clients. Leave blank to use the server default.",
+    "LabelTranscodes": "Transcodes:",
+    "LabelTranscodingFramerate": "Transcoding framerate:",
+    "LabelTranscodingProgress": "Transcoding progress:",
+    "LabelTranscodingThreadCount": "Transcoding thread count:",
+    "LabelTranscodingThreadCountHelp": "Select the maximum number of threads to use when transcoding. Reducing the thread count will lower CPU usage but may not convert fast enough for a smooth playback experience.",
+    "LabelTranscodingVideoCodec": "Video codec:",
+    "LabelTriggerType": "Trigger Type:",
+    "LabelTunerIpAddress": "Tuner IP Address:",
+    "LabelTunerType": "Tuner type:",
+    "LabelUserLibraryHelp": "Select which user library to display to the device. Leave empty to inherit the default setting.",
+    "LabelUserLoginAttemptsBeforeLockout": "Failed login attempts before user is locked out:",
+    "LabelUserRemoteClientBitrateLimitHelp": "Override the default global value set in server playback settings.",
+    "LabelVaapiDeviceHelp": "This is the render node that is used for hardware acceleration.",
+    "LabelVideoBitrate": "Video bitrate:",
+    "LabelVideoCodec": "Video codec:",
+    "LabelXDlnaCap": "X-DLNA cap:",
+    "LabelXDlnaCapHelp": "Determines the content of the X_DLNACAP element in the urn:schemas-dlna-org:device-1-0 namespace.",
+    "LabelXDlnaDoc": "X-DLNA doc:",
+    "LabelXDlnaDocHelp": "Determines the content of the X_DLNADOC element in the urn:schemas-dlna-org:device-1-0 namespace.",
+    "LabelffmpegPathHelp": "The path to the ffmpeg application file, or folder containing ffmpeg.",
+    "LanNetworksHelp": "Comma separated list of IP addresses or IP/netmask entries for networks that will be considered on local network when enforcing bandwidth restrictions. If set, all other IP addresses will be considered to be on the external network and will be subject to the external bandwidth restrictions. If left blank, only the server's subnet is considered to be on the local network.",
+    "LaunchWebAppOnStartupHelp": "Open the web client in your default web browser when the server initially starts. This will not occur when using the restart server function.",
+    "LearnHowYouCanContribute": "Learn how you can contribute.",
+    "LeaveBlankToNotSetAPassword": "You can leave this field blank to set no password.",
+    "Like": "Like",
+    "LinksValue": "Links: {0}",
+    "List": "List",
+    "Live": "Live",
+    "LiveBroadcasts": "Live broadcasts",
+    "LiveTV": "Live TV",
+    "Logo": "Logo",
+    "ManageRecording": "Manage recording",
+    "MapChannels": "Map Channels",
+    "MarkPlayed": "Mark played",
+    "MarkUnplayed": "Mark unplayed",
+    "MediaInfoAnamorphic": "Anamorphic",
+    "MediaInfoAspectRatio": "Aspect ratio",
+    "MediaInfoBitDepth": "Bit depth",
+    "MediaInfoBitrate": "Bitrate",
+    "MediaInfoChannels": "Channels",
+    "MediaInfoCodec": "Codec",
+    "MediaInfoCodecTag": "Codec tag",
+    "MediaInfoContainer": "Container",
+    "MediaInfoDefault": "Default",
+    "MediaInfoExternal": "External",
+    "MediaInfoForced": "Forced",
+    "MediaInfoFramerate": "Framerate",
+    "MediaInfoInterlaced": "Interlaced",
+    "MediaInfoLanguage": "Language",
+    "MediaInfoLayout": "Layout",
+    "MediaInfoLevel": "Level",
+    "MediaInfoPath": "Path",
+    "MediaInfoPixelFormat": "Pixel format",
+    "MediaInfoProfile": "Profile",
+    "MediaInfoRefFrames": "Ref frames",
+    "MediaInfoResolution": "Resolution",
+    "MediaInfoSampleRate": "Sample rate",
+    "MediaInfoSize": "Size",
+    "MediaInfoTimestamp": "Timestamp",
+    "MediaInfoSoftware": "Software",
+    "MediaInfoStreamTypeAudio": "Audio",
+    "MediaInfoStreamTypeData": "Data",
+    "MediaInfoStreamTypeEmbeddedImage": "Embedded Image",
+    "MediaInfoStreamTypeSubtitle": "Subtitle",
+    "MediaInfoStreamTypeVideo": "Video",
+    "MediaIsBeingConverted": "The media is being converted into a format that is compatible with the device that is playing the media.",
+    "Menu": "Menu",
+    "MessageAlreadyInstalled": "This version is already installed.",
+    "MessageAreYouSureDeleteSubtitles": "Are you sure you wish to delete this subtitle file?",
+    "MessageAreYouSureYouWishToRemoveMediaFolder": "Are you sure you wish to remove this media folder?",
+    "MessageConfirmAppExit": "Do you want to exit?",
+    "MessageConfirmDeleteGuideProvider": "Are you sure you wish to delete this guide provider?",
+    "MessageConfirmDeleteTunerDevice": "Are you sure you wish to delete this device?",
+    "MessageConfirmProfileDeletion": "Are you sure you wish to delete this profile?",
+    "MessageConfirmRecordingCancellation": "Cancel recording?",
+    "MessageConfirmRemoveMediaLocation": "Are you sure you wish to remove this location?",
+    "MessageConfirmRestart": "Are you sure you wish to restart Jellyfin Server?",
+    "MessageConfirmRevokeApiKey": "Are you sure you wish to revoke this api key? The application's connection to Jellyfin Server will be abruptly terminated.",
+    "MessageConfirmShutdown": "Are you sure you wish to shutdown the server?",
+    "MessageContactAdminToResetPassword": "Please contact your system administrator to reset your password.",
+    "MessageCreateAccountAt": "Create an account at {0}",
+    "MessageDeleteTaskTrigger": "Are you sure you wish to delete this task trigger?",
+    "MessageDirectoryPickerBSDInstruction": "For BSD, you may need to configure storage within your FreeNAS Jail in order to allow Jellyfin to access it.",
+    "MessageDirectoryPickerLinuxInstruction": "For Linux on Arch Linux, CentOS, Debian, Fedora, openSUSE, or Ubuntu, you must grant the service user at least read access to your storage locations.",
+    "MessageDownloadQueued": "Download queued.",
+    "MessageEnablingOptionLongerScans": "Enabling this option may result in significantly longer library scans.",
+    "MessageFileReadError": "There was an error reading the file. Please try again.",
+    "MessageForgotPasswordFileCreated": "The following file has been created on your server and contains instructions on how to proceed:",
+    "MessageForgotPasswordInNetworkRequired": "Please try again within your home network to initiate the password reset process.",
+    "MessageImageFileTypeAllowed": "Only JPEG and PNG files are supported.",
+    "MessageImageTypeNotSelected": "Please select an image type from the drop-down menu.",
+    "MessageLeaveEmptyToInherit": "Leave empty to inherit settings from a parent item or the global default value.",
+    "MessageNoCollectionsAvailable": "Collections allow you to enjoy personalized groupings of Movies, Series, and Albums. Click the + button to start creating collections.",
+    "MessageNoTrailersFound": "No trailers found. Install the Trailer channel to enhance your movie experience by adding a library of internet trailers.",
+    "MessagePasswordResetForUsers": "The following users have had their passwords reset. They can now sign in with the pin codes that were used to perform the reset.",
+    "MessagePlayAccessRestricted": "Playback of this content is currently restricted. Please contact your server administrator for more information.",
+    "MessagePluginInstallDisclaimer": "Plugins built by Jellyfin community members are a great way to enhance your Jellyfin experience with additional features and benefits. Before installing, please be aware of the effects they may have on your Jellyfin Server, such as longer library scans, additional background processing, and decreased system stability.",
+    "MessageReenableUser": "See below to reenable",
+    "MessageSettingsSaved": "Settings saved.",
+    "MessageTheFollowingLocationWillBeRemovedFromLibrary": "The following media locations will be removed from your library:",
+    "MessageUnableToConnectToServer": "We're unable to connect to the selected server right now. Please ensure it is running and try again.",
+    "MessageUnsetContentHelp": "Content will be displayed as plain folders. For best results use the metadata manager to set the content types of sub-folders.",
+    "OptionPlainStorageFoldersHelp": "If enabled, all folders are represented in DIDL as \"object.container.storageFolder\" instead of a more specific type, such as \"object.container.person.musicArtist\".",
+    "OptionPlainVideoItemsHelp": "If enabled, all videos are represented in DIDL as \"object.item.videoItem\" instead of a more specific type, such as \"object.item.videoItem.movie\".",
+    "OptionReportByteRangeSeekingWhenTranscoding": "Report that the server supports byte seeking when transcoding",
+    "OptionReportByteRangeSeekingWhenTranscodingHelp": "This is required for some devices that don't time seek very well.",
+    "OptionRequirePerfectSubtitleMatch": "Only download subtitles that are a perfect match for my video files",
+    "OptionSaveMetadataAsHiddenHelp": "Changing this will apply to new metadata saved going forward. Existing metadata files will be updated the next time they are saved by Jellyfin Server.",
+    "ParentalRating": "Parental rating",
+    "PasswordResetProviderHelp": "Choose a Password Reset Provider to be used when this user requests a password reset",
+    "PasswordSaved": "Password saved.",
+    "PlaceFavoriteChannelsAtBeginning": "Place favorite channels at the beginning",
+    "PlayCount": "Play count",
+    "ReplaceAllMetadata": "Replace all metadata",
+    "ReplaceExistingImages": "Replace existing images",
+    "RestartPleaseWaitMessage": "Please wait while Jellyfin Server shuts down and restarts. This may take a minute or two.",
+    "ResumeAt": "Resume from {0}",
+    "Rewind": "Rewind",
+    "RunAtStartup": "Run at startup",
+    "Runtime": "Runtime",
+    "Saturday": "Saturday",
+    "Save": "Save",
+    "SaveChanges": "Save changes",
+    "SaveSubtitlesIntoMediaFolders": "Save subtitles into media folders",
+    "SaveSubtitlesIntoMediaFoldersHelp": "Storing subtitles next to video files will allow them to be more easily managed.",
+    "SendMessage": "Send message",
+    "LabelInNetworkSignInWithEasyPasswordHelp": "Use the easy pin code to sign in to clients within your local network. Your regular password will only be needed away from home. If the pin code is left blank, you won't need a password within your home network.",
+    "LabelInternetQuality": "Internet quality:",
+    "LabelKeepUpTo": "Keep up to:",
+    "LabelKodiMetadataEnableExtraThumbs": "Copy extrafanart to extrathumbs field",
+    "LabelKodiMetadataEnableExtraThumbsHelp": "When downloading images they can be saved into both extrafanart and extrathumbs for maximum Kodi skin compatibility.",
+    "LabelKodiMetadataEnablePathSubstitutionHelp": "Enables path substitution of image paths using the server's path substitution settings.",
+    "LabelKodiMetadataSaveImagePaths": "Save image paths within nfo files",
+    "LabelKodiMetadataSaveImagePathsHelp": "This is recommended if you have image file names that don't conform to Kodi guidelines.",
+    "LabelKodiMetadataUser": "Save user watch data to NFO files for:",
+    "LabelKodiMetadataUserHelp": "Save watch data to NFO files for other applications to utilize.",
+    "LabelLanNetworks": "LAN networks:",
+    "LabelLibraryPageSize": "Library page size:",
+    "LabelLibraryPageSizeHelp": "Sets the amount of items to show on a library page. Set to 0 in order to disable paging.",
+    "LabelLineup": "Lineup:",
+    "LabelLocalHttpServerPortNumber": "Local HTTP port number:",
+    "LabelLocalHttpServerPortNumberHelp": "The TCP port number that Jellyfin's HTTP server should bind to.",
+    "LabelLockItemToPreventChanges": "Lock this item to prevent future changes",
+    "LabelLoginDisclaimer": "Login disclaimer:",
+    "LabelLoginDisclaimerHelp": "A message that will be displayed at the bottom of the login page.",
+    "LabelLogs": "Logs:",
+    "LabelManufacturer": "Manufacturer:",
+    "LabelManufacturerUrl": "Manufacturer URL",
+    "LabelMatchType": "Match type:",
+    "LabelMaxBackdropsPerItem": "Maximum number of backdrops per item:",
+    "LabelMaxChromecastBitrate": "Chromecast streaming quality:",
+    "LabelMaxResumePercentage": "Maximum resume percentage:",
+    "MessageYouHaveVersionInstalled": "You currently have version {0} installed.",
+    "MessageSyncPlayEnabled": "SyncPlay enabled.",
+    "MessageSyncPlayDisabled": "SyncPlay disabled.",
+    "MessageSyncPlayUserJoined": "<b>{0}</b> has joined the group.",
+    "MessageSyncPlayUserLeft": "<b>{0}</b> has left the group.",
+    "MessageSyncPlayGroupWait": "<b>{0}</b> is buffering...",
+    "MessageSyncPlayNoGroupsAvailable": "No groups available. Start playing something first.",
+    "MessageSyncPlayPlaybackPermissionRequired": "Playback permission required.",
+    "MessageSyncPlayGroupDoesNotExist": "Failed to join group because it does not exist.",
+    "MessageSyncPlayCreateGroupDenied": "Permission required to create a group.",
+    "MessageSyncPlayJoinGroupDenied": "Permission required to use SyncPlay.",
+    "MessageSyncPlayLibraryAccessDenied": "Access to this content is restricted.",
+    "MessageSyncPlayErrorAccessingGroups": "An error occurred while accessing groups list.",
+    "MessageSyncPlayErrorNoActivePlayer": "No active player found. SyncPlay has been disabled.",
+    "MessageSyncPlayErrorMissingSession": "Failed to enable SyncPlay! Missing session.",
+    "MessageSyncPlayErrorMedia": "Failed to enable SyncPlay! Media error.",
+    "Metadata": "Metadata",
+    "MetadataManager": "Metadata Manager",
+    "MetadataSettingChangeHelp": "Changing metadata settings will affect new content that is added going forward. To refresh existing content, open the detail screen and click the refresh button, or perform bulk refreshes using the metadata manager.",
+    "MinutesAfter": "minutes after",
+    "MinutesBefore": "minutes before",
+    "Mobile": "Mobile",
+    "Monday": "Monday",
+    "MoreFromValue": "More from {0}",
+    "MoreMediaInfo": "Media Info",
+    "MoveLeft": "Move left",
+    "MoveRight": "Move right",
+    "MovieLibraryHelp": "Review the {0}movie naming guide{1}.",
+    "MusicLibraryHelp": "Review the {0}music naming guide{1}.",
+    "NewCollectionHelp": "Collections allow you to create personalized groupings of movies and other library content.",
+    "NoCreatedLibraries": "Seems like you haven't created any libraries yet. {0}Would you like to create one now?{1}",
+    "NoNewDevicesFound": "No new devices found. To add a new tuner, close this dialog and enter the device information manually.",
+    "NoSubtitlesHelp": "Subtitles will not be loaded by default. They can still be turned on manually during playback.",
+    "None": "None",
+    "Normal": "Normal",
+    "NumLocationsValue": "{0} folders",
+    "ServerRestartNeededAfterPluginInstall": "Jellyfin Server will need to be restarted after installing a plugin.",
+    "ServerUpdateNeeded": "This Jellyfin Server needs to be updated. To download the latest version, please visit {0}",
+    "Settings": "Settings",
+    "SettingsSaved": "Settings saved.",
+    "SettingsWarning": "Changing these values may cause instability or connectivity failures. If you experience any problems, we recommend changing them back to default.",
+    "Share": "Share",
+    "ShowIndicatorsFor": "Show indicators for:",
+    "XmlDocumentAttributeListHelp": "These attributes are applied to the root element of every XML response.",
+    "XmlTvKidsCategoriesHelp": "Programs with these categories will be displayed as programs for children. Separate multiple with '|'.",
+    "XmlTvMovieCategoriesHelp": "Programs with these categories will be displayed as movies. Separate multiple with '|'.",
+    "XmlTvNewsCategoriesHelp": "Programs with these categories will be displayed as news programs. Separate multiple with '|'.",
+    "XmlTvPathHelp": "A path to a XMLTV file. Jellyfin will read this file and periodically check it for updates. You are responsible for creating and updating the file.",
+    "XmlTvSportsCategoriesHelp": "Programs with these categories will be displayed as sports programs. Separate multiple with '|'.",
+    "PathNotFound": "The path could not be found. Please ensure the path is valid and try again.",
+    "WriteAccessRequired": "Jellyfin Server requires write access to this folder. Please ensure write access and try again.",
+    "UnsupportedPlayback": "Jellyfin cannot decrypt content protected by DRM but all content will be attempted regardless, including protected titles. Some files may appear completely black due to encryption or other unsupported features, such as interactive titles.",
+    "ShowLess": "Show less",
+    "ShowMore": "Show more",
+    "Shuffle": "Shuffle",
+    "New": "New",
+    "Filter": "Filter",
+    "SkipEpisodesAlreadyInMyLibraryHelp": "Episodes will be compared using season and episode numbers, when available.",
+    "SmallCaps": "Small Caps",
+    "SubtitleAppearanceSettingsDisclaimer": "These settings will not apply to graphical subtitles (PGS, DVD, etc) or ASS/SSA subtitles that embed their own styles.",
+    "SubtitleDownloadersHelp": "Enable and rank your preferred subtitle downloaders in order of priority.",
+    "SubtitleOffset": "Subtitle Offset",
+    "SyncPlayAccessHelp": "Select the level of access this user has to the SyncPlay feature. SyncPlay enables to sync playback with other devices.",
+    "SystemDlnaProfilesHelp": "System profiles are read-only. Changes to a system profile will be saved to a new custom profile.",
+    "TabContainers": "Containers",
+    "TabDVR": "DVR",
+    "TvLibraryHelp": "Review the {0}TV naming guide{1}.",
+    "UserAgentHelp": "Supply a custom user-agent HTTP header.",
+    "ValueContainer": "Container: {0}",
+    "EnableFastImageFadeIn": "Faster animations",
+    "EnableFastImageFadeInHelp": "Use faster animations and transitions",
+    "EnableBlurhash": "Enable blurred placeholders for images",
+    "EnableBlurhashHelp": "Images that are still being loaded will be displayed with a blurred placeholder",
+    "ButtonSyncPlay": "SyncPlay"
 }
diff --git a/src/strings/fi.json b/src/strings/fi.json
index c3ca9d81d9..b50ed369e1 100644
--- a/src/strings/fi.json
+++ b/src/strings/fi.json
@@ -354,7 +354,7 @@
     "OptionPlayCount": "Toistokerrat",
     "OptionPlayed": "Toistettu",
     "OptionOnAppStartup": "Käynnistyksen yhteydessä",
-    "OptionNew": "Uusi...",
+    "OptionNew": "Uusi…",
     "OptionNameSort": "Nimi",
     "OptionMonday": "Maanantai",
     "OptionMissingEpisode": "Puuttuvat jaksot",
@@ -428,7 +428,7 @@
     "LabelPreferredDisplayLanguage": "Ensisijainen näyttökieli:",
     "LabelOriginalTitle": "Alkuperäinen nimi:",
     "LabelOriginalAspectRatio": "Alkuperäinen kuvasuhde:",
-    "LabelEnableAutomaticPortMapHelp": "Yritä automaattisesti yhdistää julkinen ja paikallinen portti UPnP:n kautta. Tämä ei välttämättä toimi kaikkien reitittimien kanssa. Muutokset tulevat voimaan vasta palvelimen uudelleenkäynnistyksen yhteydessä.",
+    "LabelEnableAutomaticPortMapHelp": "Automaattisesti ohjaa reitittimesi julkiset portit palvelimesi paikallisiin portteihin UPnP:n kautta. Tämä ei välttämättä toimi kaikkien reitittimien tai verkkoasetusten kanssa. Muutokset tulevat voimaan vasta palvelimen uudelleenkäynnistyksen yhteydessä.",
     "LabelEnableAutomaticPortMap": "Salli reitittimen porttien automaattinen avaaminen (UPnP)",
     "LabelDownloadLanguages": "Latauskielet:",
     "LabelDisplaySpecialsWithinSeasons": "Näytä erityiset jaksot kausien sisällä, jolloin ne ilmestyivät",
@@ -776,7 +776,6 @@
     "SaveSubtitlesIntoMediaFolders": "Tallenna tekstitykset mediakansioihin",
     "Saturday": "Lauantai",
     "ResumeAt": "Jatka kohdasta {0}",
-    "RestartPleaseWaitMessage": "Odota kunnes Jellyfin palvelin sammuu ja käynnistyy uudelleen. Tämä voi kestää hetken aikaa.",
     "RequiredForAllRemoteConnections": "Vaadittu kaikille etäyhteyksille",
     "ReplaceExistingImages": "Korvaa olemassaolevat kuvat",
     "ReplaceAllMetadata": "Korvaa kaikki metadata",
@@ -902,7 +901,6 @@
     "HeaderSecondsValue": "{0} Sekuntia",
     "HeaderRunningTasks": "Käynnissä olevat tehtävät",
     "HeaderRevisionHistory": "Versiohistoria",
-    "HeaderRestartingServer": "Uudelleenkäynnistetään palvelinta",
     "HeaderRemoveMediaFolder": "Poista mediakansio",
     "HeaderRemoteControl": "Etäohjaus",
     "HeaderPleaseSignIn": "Ole hyvä ja kirjaudu sisään",
@@ -1208,7 +1206,7 @@
     "LabelOverview": "Yleiskatsaus:",
     "LabelPasswordResetProvider": "Salasanan nollauksen palveluntarjoaja:",
     "LabelParentalRating": "Ikäraja:",
-    "LabelOptionalNetworkPathHelp": "Jos tämä kansio on jaettu verkossa, polun jakaminen voi mahdollistaa Jellyfin-sovellusten muilla laitteilla käyttää mediatiedostoja suoraan.",
+    "LabelOptionalNetworkPathHelp": "Jos tämä kansio on jaettu verkossasi, polun jakaminen voi mahdollistaa muilla laitteilla olevien Jellyfin-sovellusten pääsyn suoraan mediatiedostoihin. Esimerkiksi {0} tai {1}.",
     "LabelMovieRecordingPath": "Elokuvien tallenteiden polku (valinnainen):",
     "LabelMusicStreamingTranscodingBitrateHelp": "Määritä enimmäisnopeus musiikkia suoratoistettaessa.",
     "LabelMusicStreamingTranscodingBitrate": "Musiikin transkoodauksen bitrate:",
@@ -1245,5 +1243,36 @@
     "FetchingData": "Noudetaan lisätietoja",
     "Features": "Ominaisuudet",
     "ErrorMessageStartHourGreaterThanEnd": "Loppumisajan on oltava myöhemmin kuin aloitusaika.",
-    "MediaInfoAnamorphic": "Anamorfinen"
+    "MediaInfoAnamorphic": "Anamorfinen",
+    "ErrorGettingTvLineups": "TV esiintyjälistan lataamisessa tapahtui virhe. Varmista, että tiedot on oikein ja yritä uudelleen.",
+    "EnableDetailsBannerHelp": "Näyttää julistekuvan yksityiskohdat -sivun ylälaidassa.",
+    "EnableDetailsBanner": "Yksityiskohtien banneri",
+    "ButtonSyncPlay": "SyncPlay",
+    "HeaderAccessSchedule": "Käyttöoikeusaikataulu",
+    "HeaderAccessScheduleHelp": "Luo käyttöoikeusaikataulu rajoittaaksesi käyttöä tietylle aikavälille.",
+    "HardwareAccelerationWarning": "Hardwarekiihdytyksen käyttöönotto voi aiheuttaa epävakautta joissain ympäristöissä. Varmista että sekä käyttöjärjestelmäsi että videoajurisi ovat ajan tasalla. Mikäli huomaat ongelmia videotoistossa säädettyäsi tätä asetusta, sinun täytyy muuttaa asetus takaisin kohtaan \"Ei mitään\".",
+    "EncoderPresetHelp": "Valitse nopeampi arvo kohentaaksesi suorituskykyä tai hitaampi arvo parantaaksesi kuvanlaatua.",
+    "H264CrfHelp": "Constant Rate Factor (CRF) on x264 -enkooderin kuvanlaadun vakioasetus. Voit valita arvon lukujen 0 ja 51 väliltä, jossa matalammat arvot tarkoittavat parempaa kuvanlaatua (suurempien tiedostokokojen hinnalla). Järkevät arvot ovat väliltä 18-28. Vakioarvo x264:lle on 23, joten voit käyttää sitä lähtökohtana.",
+    "GuideProviderSelectListings": "Valitse listaukset",
+    "GuideProviderLogin": "Kirjaudu",
+    "GuestStar": "Vieraileva tähti",
+    "GroupVersions": "Ryhmitä versiot",
+    "FFmpegSavePathNotFound": "Emme löytäneet FFmpegiä syöttämästäsi tiedostopolusta. Huomioi, että myös FFprobe vaaditaan ja sen täytyy sijaita samassa kansiossa. Nämä komponentit jaetaan normaalisti samassa paketissa. Varmista, että syöttämäsi polku on oikein ja yritä uudestaan.",
+    "ErrorSavingTvProvider": "TV-palveluntarjoajaa lisättäessä tapahtui virhe. Varmista sen saatavuus ja yritä uudestaan.",
+    "ErrorPleaseSelectLineup": "Valitse lineup ja yritä uudestaan. Mikäli lineuppeja ei ole saatavilla, varmista että käyttäjätunnuksesi, salasanasi sekä postinumerosi ovat oikein.",
+    "ErrorAddingListingsToSchedulesDirect": "Lineuppia Schedules Direct -käyttäjätunnuksellesi lisättäessä ilmeni virhe. Schedules Direct sallii vain rajallisen määrän lineuppeja yhdelle käyttäjätunnukselle. Mikäli haluat jatkaa, voit esimerkiksi kirjautua Schedules Direct -sivustolle ja poistaa muita listauksia käyttäjätunnukseltasi.",
+    "EnableDecodingColorDepth10Vp9": "Salli 10-bittinen hardware dekoodaus (VP9)",
+    "EnableDecodingColorDepth10Hevc": "Salli 10-bittinen hardware dekoodaus (HEVC)",
+    "HeaderCastCrew": "Näyttelijät ja henkilökunta",
+    "HeaderCastAndCrew": "Näyttelijät ja henkilökunta",
+    "HeaderCancelSeries": "Peruuta sarja",
+    "HeaderCancelRecording": "Peruuta tallennus",
+    "HeaderBranding": "Brändäys",
+    "HeaderBlockItemsWithNoRating": "Estä kaikki joissa ei ole luokitusta tai jonka luokitusta ei voida tunnistaa:",
+    "HeaderAppearsOn": "Esiintyy seuraavissa",
+    "ApiKeysCaption": "Lista aktiivisista API-avaimista",
+    "HeaderApiKeysHelp": "Ulkoiset sovellukset tarvitsevat API-avaimen voidakseen toimia Jellyfin -palvelimen kanssa. Avaimet myönnetään joko kirjautumalla sisään Jellyfin -käyttäjätunnuksella tai myöntämällä sellainen sovellukselle manuaalisesti.",
+    "HeaderAdditionalParts": "Muut osat",
+    "HeaderAddScheduledTaskTrigger": "Lisää laukaisin",
+    "HeaderActiveRecordings": "Käynnissä olevat nauhoitukset"
 }
diff --git a/src/strings/fr-ca.json b/src/strings/fr-ca.json
index 5880dbb770..5f03a9d43f 100644
--- a/src/strings/fr-ca.json
+++ b/src/strings/fr-ca.json
@@ -90,14 +90,14 @@
     "Alerts": "Alertes",
     "All": "Tout",
     "AllChannels": "Toutes les chaînes",
-    "AllComplexFormats": "Tous les formats complexes (ASS, SSA, VOBSUB, PGS, SUB/IDX etc)",
+    "AllComplexFormats": "Tous les formats complexes (ASS, SSA, VOBSUB, PGS, SUB/IDX, ...)",
     "AllEpisodes": "Tous les épisodes",
     "AllLanguages": "Toutes les langues",
     "AllLibraries": "Toutes les médiathèques",
     "AllowMediaConversion": "Autoriser la conversion des médias",
     "AllowMediaConversionHelp": "Autoriser ou refuser l'accès à la fonctionnalité de conversion des médias.",
     "AllowOnTheFlySubtitleExtraction": "Autoriser l'extraction des sous-titres à la volée",
-    "AllowOnTheFlySubtitleExtractionHelp": "Les sous-titres intégrés peuvent être extraits des vidéos et distribués aux applications Jellyfin au format texte pour éviter le transcodage. Sur certains systèmes, cela peut prendre du temps et arrêter la lecture de la vidéo pendant le processus d'extraction. Désactivez cette option pour graver les sous-titres avec un transcodage quand l'appareil ne les prend pas en charge nativement.",
+    "AllowOnTheFlySubtitleExtractionHelp": "Les sous-titres intégrés peuvent être extraits des vidéos et distribués aux clients en format texte pour éviter le transcodage. Sur certains systèmes, cela peut prendre du temps et arrêter la lecture de la vidéo pendant le processus d'extraction. Désactivez cette option pour graver les sous-titres avec un transcodage quand l'appareil ne les prend pas en charge nativement.",
     "AllowRemoteAccess": "Autoriser les connexions distantes à ce serveur Jellyfin.",
     "AllowRemoteAccessHelp": "Si l'option est désactivée, toutes les connexions distantes seront bloquées.",
     "Artists": "Artistes",
@@ -134,13 +134,13 @@
     "BirthLocation": "Lieu de naissance",
     "BirthPlaceValue": "Lieu de naissance : {0}",
     "Blacklist": "Liste noire",
-    "BookLibraryHelp": "Les livres audios et formats textes sont supportés. Consultez le {0}Guide de nommage de livres de Jellyfin{1}.",
+    "BookLibraryHelp": "Les livres audios et formats textes sont supportés. Consultez le {0} Guide de nommage de livres {1}.",
     "Box": "Boîtier",
     "BoxRear": "Dos de boîtier",
     "Browse": "Parcourir",
     "BrowsePluginCatalogMessage": "Explorer notre catalogue des plugins pour voir les plugins disponibles.",
-    "AllowHWTranscodingHelp": "Permet au récepteur TV de transcoder les flux à la volée. Cela peut aider à réduire le transcodage requis par le serveur Jellyfin.",
-    "BurnSubtitlesHelp": "Détermine si le serveur doit graver les sous-titres lors de la conversion vidéo en fonction du format des sous-titres. Éviter la gravure des sous-titres améliorera les performances du serveur. Sélectionnez Auto pour graver les formats basés sur l'image (par exemple, VOBSUB, PGS, SUB/IDX etc) ainsi que certains sous-titres ASS/SSA",
+    "AllowHWTranscodingHelp": "Permets au syntonisateur de transcoder les flux à la volée. Cela peut aider à réduire le transcodage requis par le serveur.",
+    "BurnSubtitlesHelp": "Détermine si le serveur doit graver les sous-titres lors du transcodage vidéo. Éviter ceci améliorera les performances du serveur. Sélectionnez Auto pour graver les formats basés sur l'image (par exemple, VOBSUB, PGS, SUB/IDX etc) ainsi que certains sous-titres ASS/SSA.",
     "ButtonAccept": "Accepter",
     "ButtonAdd": "Ajouter",
     "ButtonAddMediaLibrary": "Ajouter une médiathèque",
@@ -187,7 +187,7 @@
     "ButtonMore": "Plus",
     "ButtonNetwork": "Réseau",
     "AspectRatio": "Format de visionnement",
-    "AskAdminToCreateLibrary": "Demander à l'administrateur pour créer une bibliothèque de média.",
+    "AskAdminToCreateLibrary": "Demander un administrateur de créer une médiathèque.",
     "Artist": "Artiste",
     "AllowFfmpegThrottlingHelp": "Quand un transcodage ou rémux se déplace après la position de relecture, suspendre le processus pour consommer moins de ressources. Ceci est le plus utile pour chercher moins. Désactiver s'il y a des problèmes de relecture.",
     "AllowFfmpegThrottling": "Restreindre la vitesse de transcodage",
@@ -198,5 +198,68 @@
     "HeaderFavoriteShows": "Séries favorites",
     "HeaderFavoriteEpisodes": "Épisodes favoris",
     "HeaderFavoriteArtists": "Artistes favoris",
-    "HeaderFavoriteAlbums": "Albums favoris"
+    "HeaderFavoriteAlbums": "Albums favoris",
+    "ButtonSyncPlay": "SyncPlay",
+    "Default": "Défaut",
+    "DeathDateValue": "Mort: {0}",
+    "DatePlayed": "Date écoutée",
+    "DateAdded": "Date d'ajout",
+    "CriticRating": "Évaluation critique",
+    "CopyStreamURLError": "Une erreur est survenue en essayant de copier l'URL.",
+    "CopyStreamURLSuccess": "L'URL a été copié avec succès.",
+    "CopyStreamURL": "Copier l'URL du stream",
+    "ContinueWatching": "Continuer à visionner",
+    "Connect": "Connexion",
+    "ConfirmEndPlayerSession": "Voulez-vous éteindre Jellyfin sur {0}?",
+    "ConfirmDeletion": "Confirmer la suppression",
+    "ConfirmDeleteItems": "Supprimer ceux-ci les effacera du système de fichiers et votre médiathèque. Êtes-vous sûr de vouloir continuer?",
+    "ConfirmDeleteImage": "Effacer l'image?",
+    "ClientSettings": "Paramètres du client",
+    "ChannelNumber": "Numéro de canal",
+    "ChannelNameOnly": "Canal {0} seulment",
+    "ChannelAccessHelp": "Sélectionner les canaux que vous désirer partager avec cet usager. Les administrateurs seront capable de modifier tout les canaux en utilisant le gestionnaire des métadonnées.",
+    "Categories": "Catégories",
+    "CancelSeries": "Annuler la série",
+    "CancelRecording": "Annuler l'enregistrement",
+    "ButtonWebsite": "Site web",
+    "ButtonViewWebsite": "Voir le site web",
+    "ButtonUp": "Vers le haut",
+    "ButtonUninstall": "Désinstaller",
+    "ButtonTogglePlaylist": "Liste de lecture",
+    "ButtonToggleContextMenu": "Plus",
+    "ButtonSubtitles": "Sous-titres",
+    "ButtonSubmit": "Soumettre",
+    "ButtonStop": "Arrêt",
+    "ButtonStart": "Démarrer",
+    "ButtonSort": "Trier",
+    "ButtonSignIn": "Se connecter",
+    "ButtonShutdown": "Éteindre",
+    "ButtonShuffle": "Lecture aléatoire",
+    "ButtonSettings": "Paramètres",
+    "ButtonSend": "Envoyer",
+    "ButtonSelectServer": "Sélectionner le serveur",
+    "ButtonSelectDirectory": "Sélectionner le répertoire",
+    "ButtonSearch": "Rechercher",
+    "ButtonScanAllLibraries": "Analyser toutes les médiathèques",
+    "ButtonSave": "Sauvegarder",
+    "ButtonRevoke": "Révoquer",
+    "ButtonResume": "Reprendre la lecture",
+    "ButtonResetPassword": "Réinitialiser le mot de passe",
+    "ButtonResetEasyPassword": "Remettre à nouveau le code NIP facile",
+    "ButtonRepeat": "Répéter",
+    "ButtonRename": "Renommer",
+    "ButtonRemove": "Enlever",
+    "ButtonRefreshGuideData": "Rafraîchir les données de guide",
+    "ButtonRefresh": "Rafraîchir",
+    "ButtonProfile": "Profil",
+    "ButtonPreviousTrack": "Piste précédente",
+    "ButtonPlay": "Lecture",
+    "ButtonPause": "Pause",
+    "ButtonParentalControl": "Contrôle parentale",
+    "ButtonOpen": "Ouvrir",
+    "ButtonOk": "OK",
+    "ButtonNextTrack": "Prochaine piste",
+    "ButtonNew": "Nouveau",
+    "ButtonAddImage": "Ajouter l'image",
+    "BoxSet": "Coffret"
 }
diff --git a/src/strings/fr.json b/src/strings/fr.json
index 01c8ae4394..c71afef661 100644
--- a/src/strings/fr.json
+++ b/src/strings/fr.json
@@ -3,14 +3,14 @@
     "AccessRestrictedTryAgainLater": "L'accès est actuellement restreint. Veuillez réessayer plus tard.",
     "Actor": "Acteur(trice)",
     "Add": "Ajouter",
-    "AddItemToCollectionHelp": "Ajoutez des éléments à des collections en les recherchant et en utilisant leurs menus contextuels (clic droit ou appui long).",
+    "AddItemToCollectionHelp": "Ajoutez des éléments à des collections en les recherchant et en utilisant leurs menus contextuels (clic droit ou appui long) pour les ajouter à une collection.",
     "AddToCollection": "Ajouter à la collection",
     "AddToPlayQueue": "Ajouter à la file d'attente",
     "AddToPlaylist": "Ajouter à la liste de lecture",
     "AddedOnValue": "Ajouté le {0}",
     "AdditionalNotificationServices": "Visitez le catalogue d'extensions pour installer des services de notifications supplémentaires.",
     "AirDate": "Date de diffusion",
-    "Aired": "Diffusé",
+    "Aired": "Diffusé sur",
     "Alerts": "Alertes",
     "All": "Tout",
     "AllChannels": "Toutes les chaînes",
@@ -896,7 +896,7 @@
     "MessageNoAvailablePlugins": "Aucune extension disponible.",
     "MessageNoMovieSuggestionsAvailable": "Aucune suggestion de film n'est actuellement disponible. Commencez à regarder et à noter vos films pour avoir des suggestions.",
     "MessageNoPluginsInstalled": "Vous n'avez aucune extension installée.",
-    "MessageNoTrailersFound": "Aucune bande-annonce trouvée. Installez la chaîne Trailers pour améliorer votre expérience, par l'ajout d'une médiathèque de bandes-annonces disponibles sur Internet.",
+    "MessageNoTrailersFound": "Installez la chaîne Trailers pour améliorer votre expérience cinéma, par l'ajout d'une médiathèque de bandes-annonces disponibles sur Internet.",
     "MessageNothingHere": "Il n'y a rien ici.",
     "MessagePasswordResetForUsers": "Les mot de passes de ces utilisateurs ont été réinitialisés. Ils peuvent maintenant se connecter avec le code PIN utilisé pour la réinitialisation.",
     "MessagePlayAccessRestricted": "La lecture de ce contenu est actuellement restreinte. Contactez l'administrateur de votre serveur pour plus d'informations.",
@@ -1120,7 +1120,7 @@
     "Programs": "Programmes",
     "Quality": "Qualité",
     "QueueAllFromHere": "Tout mettre en file d'attente à partir d'ici",
-    "Raised": "Augmenter",
+    "Raised": "Élevé",
     "Rate": "Débit",
     "RecentlyWatched": "Lu récemment",
     "RecommendationBecauseYouLike": "Parce que vous aimez {0}",
@@ -1149,7 +1149,6 @@
     "ReplaceAllMetadata": "Remplacer toutes les métadonnées",
     "ReplaceExistingImages": "Remplacer les images existantes",
     "RequiredForAllRemoteConnections": "Obligatoire pour toutes les connexions externes",
-    "RestartPleaseWaitMessage": "Veuillez patienter pendant que le serveur Jellyfin s'arrête et redémarre. Cela peut prendre une minute ou deux.",
     "ResumeAt": "Reprendre à {0}",
     "Rewind": "Rembobiner",
     "RunAtStartup": "Exécuter au démarrage",
@@ -1386,7 +1385,6 @@
     "HeaderFavoriteArtists": "Artistes préférés",
     "HeaderFavoriteSongs": "Chansons préférées",
     "HeaderFavoriteVideos": "Vidéos préférées",
-    "HeaderRestartingServer": "Redémarrage du serveur",
     "LabelServerName": "Nom du serveur :",
     "DashboardVersionNumber": "Version : {0}",
     "DashboardServerName": "Serveur : {0}",
@@ -1448,7 +1446,7 @@
     "FetchingData": "Récuperer des données suplémentaires",
     "CopyStreamURLSuccess": "URL copiée avec succès.",
     "CopyStreamURL": "Copier l'URL du flux",
-    "LabelBaseUrlHelp": "Ajoute un sous-répertoire personnalisé à l'adresse URL du serveur. Par exemple : <code>http://example.com/<b>&lt ;baseurl&gt ;</b></code>",
+    "LabelBaseUrlHelp": "Ajoute un sous-répertoire personnalisé à l'adresse URL du serveur. Par exemple : <code>http://exemple.com/<b>&lt;baseurl&gt;</b></code>",
     "HeaderFavoritePeople": "Personnes préférées",
     "OptionRandom": "Aléatoire",
     "ButtonSplit": "Séparer",
@@ -1458,8 +1456,6 @@
     "MessageConfirmAppExit": "Voulez-vous quitter ?",
     "LabelVideoResolution": "Résolution vidéo :",
     "LabelStreamType": "Type de flux :",
-    "EnableFastImageFadeInHelp": "Activer un fondu plus rapide pour l'animation des images chargées.",
-    "EnableFastImageFadeIn": "Fondu d'image rapide",
     "LabelPlayerDimensions": "Dimension du lecteur :",
     "LabelDroppedFrames": "Images perdues :",
     "LabelCorruptedFrames": "Images corrompues :",
@@ -1510,7 +1506,7 @@
     "HeaderFavoritePlaylists": "Listes de lecture favorites",
     "TabDVR": "DVR",
     "LabelChromecastVersion": "Version de Chromecast",
-    "LabelEnableHttpsHelp": "Autorise le serveur à écouter les requêtes HTTPS sur le port configurée. Un certificat valide doit être configuré pour permettre ce mode de fonctionnement.",
+    "LabelEnableHttpsHelp": "Autorise le serveur à écouter les requêtes HTTPS sur le port configuré. Un certificat valide doit être configuré pour permettre ce mode de fonctionnement.",
     "LabelEnableHttps": "Activer HTTPS",
     "HeaderServerAddressSettings": "Paramètres adresses serveur",
     "HeaderRemoteAccessSettings": "Paramètres d'accès distant",
@@ -1525,7 +1521,7 @@
     "EnableDetailsBanner": "Bannière des détails",
     "EnableDetailsBannerHelp": "Affichez une image de bannière en haut de la page de détails de l'article.",
     "HeaderSyncPlaySelectGroup": "Rejoindre un groupe",
-    "LabelSyncPlayAccessCreateAndJoinGroups": "Autoriser l'utilisateur à créer un ou rejoindre un groupe",
+    "LabelSyncPlayAccessCreateAndJoinGroups": "Autoriser l'utilisateur à créer ou rejoindre un groupe",
     "LabelSyncPlayLeaveGroupDescription": "Désactiver SyncPlay",
     "LabelSyncPlayLeaveGroup": "Quitter le groupe",
     "LabelSyncPlayNewGroupDescription": "Créer un nouveau groupe",
@@ -1533,15 +1529,15 @@
     "LabelSyncPlaySyncMethod": "Méthode de synchronisation :",
     "LabelSyncPlayPlaybackDiff": "Décalage de la lecture :",
     "MillisecondsUnit": "ms",
-    "LabelSyncPlayTimeOffset": "Décalage de temps avec le serveur  :",
+    "LabelSyncPlayTimeOffset": "Décalage de temps avec le serveur :",
     "HeaderSyncPlayEnabled": "SyncPlay activé",
     "MessageSyncPlayLibraryAccessDenied": "L'accès à ce contenu est restreint.",
     "MessageSyncPlayJoinGroupDenied": "Permission requise pour utiliser SyncPlay.",
     "MessageSyncPlayCreateGroupDenied": "Permission requise pour créer un groupe.",
     "MessageSyncPlayGroupDoesNotExist": "Impossible de rejoindre le groupe car il n'existe pas.",
     "MessageSyncPlayPlaybackPermissionRequired": "Autorisation de lecture requise.",
-    "MessageSyncPlayNoGroupsAvailable": "Aucun groupe disponible. Commencez par lancer quelque chose.",
-    "MessageSyncPlayGroupWait": "<b>{0}</b> est en train de charger...",
+    "MessageSyncPlayNoGroupsAvailable": "Aucun groupe disponible. Commencez par lire quelque chose.",
+    "MessageSyncPlayGroupWait": "<b>{0}</b> est en train de charger…",
     "MessageSyncPlayUserLeft": "<b>{0}</b> a quitté le groupe.",
     "MessageSyncPlayUserJoined": "<b>{0}</b> a rejoint le groupe.",
     "MessageSyncPlayDisabled": "SyncPlay désactivé.",
@@ -1549,9 +1545,33 @@
     "LabelSyncPlayAccess": "Accès SyncPlay",
     "LabelSyncPlayAccessNone": "Désactivé pour cet utilisateur",
     "LabelSyncPlayAccessJoinGroups": "Autoriser l'utilisateur à rejoindre un groupe",
-    "SyncPlayAccessHelp": "Sélectionner le niveau d'accès de cet utilisateur pour la fonctionnalité SyncPlay. SyncPlay permet de synchroniser la lecture avec d'autres utilisateurs.",
+    "SyncPlayAccessHelp": "Sélectionner le niveau d'accès de cet utilisateur pour la fonctionnalité SyncPlay. SyncPlay permet de synchroniser la lecture avec d'autres appareils.",
     "MessageSyncPlayErrorMedia": "Impossible d'activer SyncPlay ! Erreur média.",
     "MessageSyncPlayErrorMissingSession": "Impossible d'activer SyncPlay ! Session manquante.",
-    "MessageSyncPlayErrorNoActivePlayer": "Aucun player actif trouvé. SyncPlay a été désactivé.",
-    "MessageSyncPlayErrorAccessingGroups": "Une erreur s'est produite pendant l'accès à la liste de groupes."
+    "MessageSyncPlayErrorNoActivePlayer": "Aucun lecteur actif trouvé. SyncPlay a été désactivé.",
+    "MessageSyncPlayErrorAccessingGroups": "Une erreur s'est produite pendant l'accès à la liste de groupes.",
+    "ShowMore": "Voir plus",
+    "ShowLess": "Voir moins",
+    "EnableBlurhashHelp": "Les images qui sont encore en cours de chargement seront remplacées par une image générique floue",
+    "EnableBlurhash": "Utilise des images génériques floues à la place des images",
+    "ButtonCast": "Diffuser",
+    "ButtonSyncPlay": "SyncPlay",
+    "TabRepositories": "Dépôts",
+    "MessageNoGenresAvailable": "Utiliser des fournisseurs de métadonnées pour récupérer les genres depuis internet.",
+    "MessageAddRepository": "Si vous souhaitez ajouter un dépôt, cliquez sur le bouton près de l'entête et renseignez les informations demandées.",
+    "LabelRepositoryNameHelp": "Un nom personnalisé pour distinguer ce dépôt des autres ajoutés sur votre serveur.",
+    "LabelRepositoryName": "Nom du dépôt",
+    "LabelRepositoryUrlHelp": "La localisation du manifeste du dépôt que vous voulez inclure.",
+    "LabelRepositoryUrl": "URL du dépôt",
+    "HeaderNewRepository": "Nouveau dépôt",
+    "MessageNoRepositories": "Pas de dépôts.",
+    "EnableFasterAnimationsHelp": "Utiliser des animations et des transitions plus rapides",
+    "EnableFasterAnimations": "Animations plus rapides",
+    "EnableDecodingColorDepth10Vp9": "Activer le décodage hardware 10-Bit pour VP9",
+    "EnableDecodingColorDepth10Hevc": "Activer le décodage hardware 10-Bit pour HEVC",
+    "ClearQueue": "Vider la file d'attente",
+    "StopPlayback": "Arrêter",
+    "ButtonPlayer": "Démarrer",
+    "Writers": "Écrivains",
+    "ViewAlbumArtist": "Voir l'album de l'artiste"
 }
diff --git a/src/strings/gl.json b/src/strings/gl.json
index 5341462de7..e87ce46770 100644
--- a/src/strings/gl.json
+++ b/src/strings/gl.json
@@ -11,5 +11,6 @@
     "AirDate": "Data de emisión",
     "Aired": "Emitido",
     "AddToPlaylist": "Engadir á lista de reprodución",
-    "Add": "Engadir"
+    "Add": "Engadir",
+    "ButtonSyncPlay": "SyncPlay"
 }
diff --git a/src/strings/gsw.json b/src/strings/gsw.json
index e396313856..d7cd980b80 100644
--- a/src/strings/gsw.json
+++ b/src/strings/gsw.json
@@ -164,6 +164,13 @@
     "ValueSpecialEpisodeName": "Extra - {0}",
     "VersionNumber": "Version {0}",
     "Absolute": "Absolut",
-    "Actor": "Schauspiler",
-    "AccessRestrictedTryAgainLater": "Zuegriff isch momentan beschränkt. Probier bitte später nomau. "
+    "Actor": "Schauspieler",
+    "AccessRestrictedTryAgainLater": "Zuegriff isch momentan beschränkt. Probiers bitte spöter nomol.",
+    "ButtonSyncPlay": "SyncPlay",
+    "AdditionalNotificationServices": "Durchsuech de Plugin Katalog zum zuesätzlichi Benochrichtigungsdienst zinstalliere.",
+    "AddedOnValue": "hinzuegfüegt",
+    "AddToPlaylist": "Zur Playlist hinzuefüege",
+    "AddToPlayQueue": "Zur Warteschlange hinzuefüege",
+    "AddToCollection": "Zur Collection hinzuefüege",
+    "Add": "hinzuefüege"
 }
diff --git a/src/strings/he.json b/src/strings/he.json
index a3e4bc9326..31bc228bb2 100644
--- a/src/strings/he.json
+++ b/src/strings/he.json
@@ -607,7 +607,6 @@
     "HeaderSelectServer": "בחר שרת",
     "HeaderSecondsValue": "{0} שניות",
     "HeaderSeasons": "עונות",
-    "HeaderRestartingServer": "מאתחל שרת",
     "HeaderRestart": "הפעלה מחדש",
     "HeaderProfileInformation": "מידע פרופיל",
     "HeaderProfile": "פרופיל",
@@ -772,5 +771,9 @@
     "LabelSource": "מקור:",
     "LabelSoundEffects": "אפקטי סאונד:",
     "ButtonTogglePlaylist": "רשימת ניגון",
-    "ButtonToggleContextMenu": "עוד"
+    "ButtonToggleContextMenu": "עוד",
+    "ButtonSyncPlay": "SyncPlay",
+    "ButtonPlayer": "נגן",
+    "StopPlayback": "הפסק הפעלה",
+    "ClearQueue": "נקה תור"
 }
diff --git a/src/strings/hi-in.json b/src/strings/hi-in.json
index 7a51a4f695..48b82c601f 100644
--- a/src/strings/hi-in.json
+++ b/src/strings/hi-in.json
@@ -73,10 +73,10 @@
     "ButtonAddScheduledTaskTrigger": "ट्रिगर जोड़ें",
     "ButtonAddMediaLibrary": "मीडिया लाइब्रेरी जोड़ें",
     "ButtonAddImage": "छवि जोड़ें",
-    "ButtonAdd": "जोड़ना",
+    "ButtonAdd": "जोड़ें",
     "UnsupportedPlayback": "Jellyfin DRM द्वारा संरक्षित सामग्री को डिक्रिप्ट नहीं कर सकता है, लेकिन सभी सामग्री की परवाह किए बिना, संरक्षित शीर्षकों सहित प्रयास किया जाएगा। एन्क्रिप्शन या अन्य असमर्थित सुविधाओं जैसे इंटरेक्टिव शीर्षक के कारण कुछ फाइलें पूरी तरह से काली दिखाई दे सकती हैं।",
     "BoxRear": "बॉक्स (पीछे)",
-    "Box": "डिब्बा",
+    "Box": "बॉक्स",
     "Books": "पुस्तकें",
     "BookLibraryHelp": "ऑडियो और पाठ्य पुस्तकें समर्थित हैं। {0} पुस्तक नामकरण गाइड {1} की समीक्षा करें।",
     "Blacklist": "काला सूची में डालना",
@@ -112,5 +112,10 @@
     "AlbumArtist": "चित्राधार कलाकार",
     "AllowOnTheFlySubtitleExtraction": "मक्खी पर उपशीर्षक निष्कर्षण की अनुमति दें",
     "Album": "एल्बम",
-    "AddItemToCollectionHelp": "उनके लिए खोज करके संग्रह में आइटम जोड़ें और उन्हें संग्रह में जोड़ने के लिए उनके राइट-क्लिक या टैप मेनू का उपयोग करें।"
+    "AddItemToCollectionHelp": "उनके लिए खोज करके संग्रह में आइटम जोड़ें और उन्हें संग्रह में जोड़ने के लिए उनके राइट-क्लिक या टैप मेनू का उपयोग करें।",
+    "ButtonSyncPlay": "SyncPlay",
+    "BrowsePluginCatalogMessage": "उपलब्ध प्लगिन्स देखने के लिए हमारे कैटलॉग को ब्राउज़ करें।",
+    "Browse": "ब्राउज़",
+    "BoxSet": "बॉक्स सेट",
+    "BurnSubtitlesHelp": "निर्धारित करता है कि वीडियो ट्रांसकोडिंग करते समय सर्वर को उपशीर्षक बर्न-इन करना चाहिए। इससे बचने से प्रदर्शन में बहुत सुधार होगा। छवि आधारित उपशीर्षक (VOBSUB, PGS, SUB, IDX, …) एवं ASS अथवा SSA जैसे उपशीर्षक बर्न-इन करने के लिए ऑटो का चयन करें।"
 }
diff --git a/src/strings/hr.json b/src/strings/hr.json
index 107014626e..1693302c67 100644
--- a/src/strings/hr.json
+++ b/src/strings/hr.json
@@ -7,14 +7,14 @@
     "AdditionalNotificationServices": "Pretražite katalog dodataka kako bi instalirali dodatne servise za obavijesti.",
     "AllChannels": "Svi kanali",
     "AllEpisodes": "Sve epizode",
-    "AllowHWTranscodingHelp": "Ako je omogućeno, omogućite TV/radio uređaju da konvertira strujanja u letu. Ovo može pomoći smanjiti konvertiranje koje zahtijeva Jellyfin Server.",
+    "AllowHWTranscodingHelp": "Omogućite TV/radio uređaju da konvertira strujanja u letu. Ovo može pomoći smanjiti konvertiranje koje zahtijeva Jellyfin Server.",
     "Anytime": "Bilo kada",
-    "AroundTime": "Oko {0}",
+    "AroundTime": "Oko",
     "AsManyAsPossible": "Što više je moguće",
     "AttributeNew": "Novo",
     "Backdrops": "Pozadine",
     "BirthDateValue": "Rođen: {0}",
-    "BirthLocation": "Lokacije rođenja",
+    "BirthLocation": "Lokacija rođenja",
     "BirthPlaceValue": "Mjesto rođenja: {0}",
     "BrowsePluginCatalogMessage": "Pregledajte dostupne dodatke u našem katalogu.",
     "ButtonAdd": "Dodaj",
@@ -120,35 +120,35 @@
     "DoNotRecord": "Ne snimi",
     "Download": "Preuzimanje",
     "DrmChannelsNotImported": "Kanali s DRM se neće uvesti.",
-    "EasyPasswordHelp": "Vaš laki PIN kod se koristi za izvan-mrežni pristup s podržanim Jellyfin aplikacijama, a također se može koristiti za jednostavnu mrežnu prijavu.",
+    "EasyPasswordHelp": "Vaš laki PIN kod se koristi za izvan-mrežni pristup na podržanim klijentima i također se može koristiti za jednostavnu mrežnu prijavu.",
     "Edit": "Izmjeni",
     "EditImages": "Uređivanje slika",
     "EditSubtitles": "Uredi titlove",
-    "EnableColorCodedBackgrounds": "Omogući kodirane boje pozadine",
-    "EnablePhotos": "Omogući slike",
-    "EnablePhotosHelp": "Slike će biti otkrite i prikazivane zajedno s drugim medijskim datotekama.",
+    "EnableColorCodedBackgrounds": "Kodirane boje pozadine",
+    "EnablePhotos": "Prikaži slike",
+    "EnablePhotosHelp": "Slike će biti otkrivene i prikazivane zajedno s drugim medijskim datotekama.",
     "Ended": "Završeno",
     "EndsAtValue": "Završava u {0}",
     "ErrorAddingListingsToSchedulesDirect": "Došlo je do pogreške prilikom dodavanja postava vašim zakazanim direktnim računima. Raspored dopušta samo ograničen broj postava po računu. Možda ćete morati se prijavite u zakazanim \"Direct\" web stranicama i ukloniti unose drugih s računa prije nastavka.",
     "ErrorAddingMediaPathToVirtualFolder": "Došlo je do pogreške prilikom dodavanja putanje medija. Provjerite dali je putanja valjana i da proces Jellyfin Server-a ima pristup tom mjestu.",
     "ErrorAddingTunerDevice": "Došlo je do pogreške prilikom dodavanja uređaja TV/radio pretraživača. Provjerite da je dostupan i pokušajte ponovno.",
-    "ErrorGettingTvLineups": "Došlo je do pogreške prilikom preuzimanja tv postave. Provjerite dali su vaše informacije točne i pokušajte ponovno.",
+    "ErrorGettingTvLineups": "Došlo je do pogreške prilikom preuzimanja TV postave. Provjerite dali su vaše informacije točne i pokušajte ponovno.",
     "ErrorMessageStartHourGreaterThanEnd": "Vrijeme završetka mora biti veće od početka.",
     "ErrorPleaseSelectLineup": "Odaberite postavu i pokušajte ponovno. Ako niti jedna postava nije dostupna provjerite dali su korisničko ime, lozinka i poštanski broj točni.",
     "ErrorSavingTvProvider": "Došlo je do pogreške prilikom snimanja TV pružatelja. Provjerite da je dostupan i pokušajte ponovno.",
-    "ExtractChapterImagesHelp": "Izdvajanje slika poglavlja omogućiti će Jellyfin aplikaciji za prikaz grafičkih izbornika za odabir scena. Proces može biti spor, CPU intenzivno korišten i može zahtijevati nekoliko gigabajta prostora. Ono se pokreće kad je otkriven video, a također i kao noćni zadatak. Raspored je podesiv u području rasporeda zadataka. Ne preporučuje se za pokretanje ovog zadatka tijekom sati čestog korištenja.",
+    "ExtractChapterImagesHelp": "Izdvajanje slika poglavlja omogućiti će klijentima prikaz grafičkih izbornika za odabir scena. Proces može biti spor, resursi intenzivno korišteni i može zahtijevati nekoliko gigabajta prostora. Ono se pokreće kad je otkriven video, a također i kao noćni zadatak. Raspored je podesiv u području rasporeda zadataka. Ne preporučuje se za pokretanje ovog zadatka tijekom sati čestog korištenja.",
     "FFmpegSavePathNotFound": "Nismo mogli locirati FFmpeg korištenjem putanje koju ste unijeli. FFprobe je također potreban i mora postojati u istoj mapi. Te komponente su obično u paketu zajedno u istom preuzimanju. Provjerite putanju i pokušajte ponovno.",
     "Favorite": "Omiljeni",
     "File": "Datoteka",
     "FileNotFound": "Datoteka nije pronađena.",
     "FileReadCancelled": "Učitavanje datoteke je prekinuto.",
-    "FileReadError": "Prilikom učitavanja datoteke desila se greška",
+    "FileReadError": "Prilikom učitavanja datoteke dogodila se greška.",
     "FolderTypeBooks": "Knjige",
     "FolderTypeMovies": "Filmovi",
     "FolderTypeMusic": "Glazba",
-    "FolderTypeMusicVideos": "Glazbeni videi",
+    "FolderTypeMusicVideos": "Glazbeni spotovi",
     "FolderTypeTvShows": "TV",
-    "FolderTypeUnset": "Isključi (miješani sadržaj)",
+    "FolderTypeUnset": "Miješani sadržaj",
     "Friday": "Petak",
     "Genres": "Žanrovi",
     "GroupVersions": "Verzija grupe",
@@ -158,7 +158,7 @@
     "H264CrfHelp": "Konstante brzine faktora (CRF) je postavka zadane kvalitete za x264 enkodera. Možete postaviti vrijednosti između 0 i 51, gdje će niže vrijednosti rezultirati boljom kvalitetom (na račun veće veličine datoteka). Razumne vrijednosti su između 18 i 28. Zadana za x264 je 23, tako da to možete koristiti kao početnu točku.",
     "EncoderPresetHelp": "Odaberite bržu vrijednost za poboljšanje performansi ili sporiju za poboljšanje kvalitete.",
     "HDPrograms": "HD programi",
-    "HardwareAccelerationWarning": "Omogućavanje hardverskog ubrzanja može uzrokovati nestabilnostima u nekim sredinama. Pobrinite se da Vaš operativni sustav i video drajveri su u potpunosti ažurni. Ako imate poteškoća s reprodukcijom videa nakon omogućavanja ovoga, morat ćete promijeniti postavku natrag na Automatski.",
+    "HardwareAccelerationWarning": "Omogućavanje hardverskog ubrzanja može uzrokovati nestabilnostima u nekim sredinama. Pobrinite se da Vaš operativni sustav i video drajveri su u potpunosti ažurni. Ako imate poteškoća s reprodukcijom videa nakon omogućavanja ovoga, morat ćete promijeniti postavku natrag na Ništa.",
     "HeaderAccessSchedule": "Raspored pristupa",
     "HeaderAccessScheduleHelp": "Napravite raspored pristupa da bi ograničili pristup određenim satima.",
     "HeaderActiveDevices": "Aktivni uređaji",
@@ -189,7 +189,7 @@
     "HeaderCodecProfileHelp": "Profili kodeka definiraju ograničenja kada uređaji izvode sadržaj u specifičnom kodeku. Ako se ograničenja podudaraju tada će sadržaj biti transkodiran, iako je kodek konfiguriran za direktno izvođenje.",
     "HeaderConfirmPluginInstallation": "Potvrdi instalaciju dodatka",
     "HeaderConfirmProfileDeletion": "Potvrdite brisanje profila",
-    "HeaderConfirmRevokeApiKey": "Opozovi Api ključ",
+    "HeaderConfirmRevokeApiKey": "Opozovi API ključ",
     "HeaderConnectToServer": "Spoji se na Server",
     "HeaderConnectionFailure": "Neuspjelo spajanje",
     "HeaderContainerProfile": "Profil spremnika",
@@ -221,7 +221,7 @@
     "HeaderForgotPassword": "Zaboravili ste lozinku",
     "HeaderFrequentlyPlayed": "Često izvođeno",
     "HeaderGuideProviders": "Pružatelji vodiča",
-    "HeaderHttpHeaders": "Http zaglavlja",
+    "HeaderHttpHeaders": "HTTP zaglavlja",
     "HeaderIdentification": "Identifikacija",
     "HeaderIdentificationCriteriaHelp": "Unesite barem jedan kriterij za identifikaciju.",
     "HeaderIdentificationHeader": "Identifikacija zaglavlja",
@@ -244,7 +244,7 @@
     "HeaderLoginFailure": "Neuspjela prijava",
     "HeaderMedia": "Medij",
     "HeaderMediaFolders": "Medijska mapa",
-    "HeaderMediaInfo": "Info medija:",
+    "HeaderMediaInfo": "Info medija",
     "HeaderMetadataSettings": "Postavke meta-podataka",
     "HeaderMoreLikeThis": "Više ovakvih",
     "HeaderMovies": "Filmovi",
@@ -278,8 +278,8 @@
     "HeaderScenes": "Scene",
     "HeaderSchedule": "Raspored",
     "HeaderSeasons": "Sezone",
-    "HeaderSelectCertificatePath": "Odaberi put certifikata:",
-    "HeaderSelectMetadataPath": "Odaberite putanju meta-podataka:",
+    "HeaderSelectCertificatePath": "Odaberi putanju certifikata",
+    "HeaderSelectMetadataPath": "Odaberite putanju meta-podataka",
     "HeaderSelectMetadataPathHelp": "Pregledajte ili unesite putanju za pohranu meta-podataka. U mapu se mora moći pisati.",
     "HeaderSelectPath": "Odaberi putanju",
     "HeaderSelectServer": "Odaberi Server",
@@ -288,7 +288,7 @@
     "HeaderSelectTranscodingPath": "Odaberite privremenu putanju konvertiranja",
     "HeaderSelectTranscodingPathHelp": "Pregledajte ili unesite putanju za korištenje konvertiranja privremenih datoteka. U mapu se mora moći pisati.",
     "HeaderSendMessage": "Pošalji poruku",
-    "HeaderSeries": "Series:",
+    "HeaderSeries": "Serija",
     "HeaderSeriesOptions": "Opcije serija",
     "HeaderServerSettings": "Postavke Servera",
     "HeaderSettings": "Postavke",
@@ -325,7 +325,7 @@
     "Identify": "Identificiraj",
     "Images": "Slike",
     "ImportFavoriteChannelsHelp": "Ako je omogućeno, samo kanali koji su označeni kao omiljeni na uređaju TV/radio pretraživača će se uvesti.",
-    "InstallingPackage": "Instaliranje {0}",
+    "InstallingPackage": "Instaliranje {0} (verzija {1})",
     "InstantMix": "Trenutno miješanje",
     "ItemCount": "{0} stavaka",
     "Kids": "Djeca",
@@ -344,13 +344,13 @@
     "LabelAlbumArtMaxWidth": "Maksimalna širina Album art-a:",
     "LabelAlbumArtMaxWidthHelp": "Maksimalna rezolucija albuma izloženih putem UPnP:albumArtURI.",
     "LabelAlbumArtPN": "Grafika albuma PN:",
-    "LabelAlbumArtists": "Izvođači albuma",
+    "LabelAlbumArtists": "Izvođači albuma:",
     "LabelAll": "Sve",
     "LabelAllowHWTranscoding": "Dopusti hardversko konvertiranje",
     "LabelAllowServerAutoRestart": "Dopusti serveru da se automatski resetira kako bi proveo nadogradnje",
-    "LabelAllowServerAutoRestartHelp": "Server će se resetirati dok je u statusu mirovanja, odnosno kada nema aktivnih korisnika.",
+    "LabelAllowServerAutoRestartHelp": "Server će se resetirati samo dok je u statusu mirovanja kada nema aktivnih korisnika.",
     "LabelAppName": "Ime aplikacije",
-    "LabelAppNameExample": "Primjer: Sickbeard, NzbDrone",
+    "LabelAppNameExample": "Primjer: Sickbeard, Sonarr",
     "LabelArtists": "Izvođači:",
     "LabelArtistsHelp": "Odvoji višestruko koristeći ;",
     "LabelAudioLanguagePreference": "Postavke audio jezika:",
@@ -362,7 +362,7 @@
     "LabelBlastMessageIntervalHelp": "Određuje trajanje u sekundama između svake poruke dostupnosti servera.",
     "LabelCache": "Predmemorija:",
     "LabelCachePath": "Putanja predmemorije:",
-    "LabelCachePathHelp": "Odredite prilagođenu lokaciju za predmemorijske datoteke servera, kao što su slike. Ostavite prazno za korištenje zadanog poslužitelja.",
+    "LabelCachePathHelp": "Odredite prilagođenu lokaciju za predmemorijske datoteke servera kao što su slike. Ostavite prazno za korištenje zadanog poslužitelja.",
     "LabelCancelled": "Otkazan",
     "LabelChannels": "Kanali:",
     "LabelCollection": "Kolekcija:",
@@ -371,12 +371,12 @@
     "LabelCountry": "Zemlja:",
     "LabelCriticRating": "Ocjene kritike:",
     "LabelCurrentPassword": "Sadašnja lozinka:",
-    "LabelCustomCss": "Prilagođen css:",
-    "LabelCustomCssHelp": "Primijenite svoj vlastiti prilagođeni css na web sučelje.",
+    "LabelCustomCss": "Prilagođeni CSS:",
+    "LabelCustomCssHelp": "Primijenite svoj vlastiti prilagođeni stil na web sučelje.",
     "LabelCustomDeviceDisplayName": "Prikaz naziva:",
     "LabelCustomDeviceDisplayNameHelp": "Navedite naziv prilagođenog prikaza ili ostaviti prazno za korištenje naziva koji je izvijestio uređaj.",
     "LabelCustomRating": "Prilagođena ocjena:",
-    "LabelDateAdded": "Datumu dodavanja",
+    "LabelDateAdded": "Datum dodavanja:",
     "LabelDateAddedBehavior": "Ponašanje datuma dodanog za novi sadržaj:",
     "LabelDateAddedBehaviorHelp": "Ako je prisutna vrijednost meta-podataka uvijek će se koristiti prije bilo kojih od ovih opcija.",
     "LabelDay": "Dan:",
@@ -384,29 +384,29 @@
     "LabelDefaultUser": "Zadani korisnik:",
     "LabelDefaultUserHelp": "Određuje koja će biblioteka biti prikazana na spojenim uređajima. Ovo se može zaobići za svaki uređaj koristeći profile.",
     "LabelDeviceDescription": "Opis uređaja",
-    "LabelDidlMode": "Didl način:",
+    "LabelDidlMode": "DIDL način:",
     "LabelDisplayMissingEpisodesWithinSeasons": "Prikaži epizode koje nedostaju unutar sezone",
     "LabelDisplayName": "Prikaz naziva:",
     "LabelDisplayOrder": "Poredak prikaza:",
     "LabelDisplaySpecialsWithinSeasons": "Prikaz specijalnih dodataka unutar sezona u kojima su emitirani",
     "LabelDownMixAudioScale": "Pojačaj zvuk kada radiš downmix:",
-    "LabelDownMixAudioScaleHelp": "Pojačaj zvuk kada radiš downmix. Postavi na 1 ako želiš zadržati orginalnu jačinu zvuka.",
+    "LabelDownMixAudioScaleHelp": "Pojačaj zvuk prilikom downmix-a. Vrijednost 1 će zadržati originalnu jačinu zvuka.",
     "LabelDownloadLanguages": "Jezici za preuzimanje:",
     "LabelEasyPinCode": "Lagan PIN kod:",
     "LabelEmbedAlbumArtDidl": "Ugradi grafike albuma u Didl",
     "LabelEmbedAlbumArtDidlHelp": "Neki uređaji podržavaju ovu metodu za prikaz grafike albuma. Drugi bi mogli imati problema sa ovom opcijom uključenom.",
     "LabelEnableAutomaticPortMap": "Omogući automatsko mapiranje porta",
-    "LabelEnableAutomaticPortMapHelp": "Pokušaj automatski mapirati javni port za lokalni port preko UPnP. Možda neće raditi s nekim modelima router-a.",
+    "LabelEnableAutomaticPortMapHelp": "Automatski proslijedi javni port na svom ruteru na lokalni port preko UPnP. Možda neće raditi sa nekim modelima router-a ili mrežnim konfiguracijama. Promjene se neće primijeniti do restarta servera.",
     "LabelEnableBlastAliveMessages": "Objavi poruke dostupnosti",
     "LabelEnableBlastAliveMessagesHelp": "Omogući ovo ako server nije prikazan kao siguran za druge UPnP uređaje na mreži.",
     "LabelEnableDlnaClientDiscoveryInterval": "Interval za otkrivanje kljenata (sekunde)",
     "LabelEnableDlnaClientDiscoveryIntervalHelp": "Određuje trajanje u sekundama između SSDP pretraživanja obavljenih od Jellyfin-a.",
-    "LabelEnableDlnaDebugLogging": "Omogući DLNA logiranje grešaka.",
-    "LabelEnableDlnaDebugLoggingHelp": "Ovo će kreirati iznimno velike log datoteke i jedino se preporuča koristiti u slučaju problema.",
+    "LabelEnableDlnaDebugLogging": "Omogući DLNA logiranje grešaka",
+    "LabelEnableDlnaDebugLoggingHelp": "Kreiraj iznimno velike log datoteke i preporuča se koristiti jedino u slučaju problema.",
     "LabelEnableDlnaPlayTo": "Omogući DLNA izvođenje na",
-    "LabelEnableDlnaPlayToHelp": "Jellyfin može otkriti uređaje unutar svoje mreže i ponuditi mogućnost da ih daljinski upravlja.",
-    "LabelEnableDlnaServer": "Omogući Dlna server",
-    "LabelEnableDlnaServerHelp": "Omogućuje UPnP uređajima na mreži da pregledavaju i pokreću Jellyfin sadržaj.",
+    "LabelEnableDlnaPlayToHelp": "Otkrij uređaje unutar svoje mreže i ponudi mogućnost da ih daljinski upravlja.",
+    "LabelEnableDlnaServer": "Omogući DLNA server",
+    "LabelEnableDlnaServerHelp": "Omogućuje UPnP uređajima na mreži da pregledavaju i pokreću sadržaj.",
     "LabelEnableRealtimeMonitor": "Omogući nadgledanje u realnom vremenu",
     "LabelEnableRealtimeMonitorHelp": "Promjene će biti procesuirane odmah, nad podržanim datotekama sistema.",
     "LabelEnableSingleImageInDidlLimit": "Ograničenje na jednu ugrađenu sliku",
@@ -416,12 +416,12 @@
     "LabelEvent": "Događaj:",
     "LabelEveryXMinutes": "Svaki:",
     "LabelExtractChaptersDuringLibraryScan": "Izvadi slike poglavlja dok traje skeniranje biblioteke",
-    "LabelExtractChaptersDuringLibraryScanHelp": "Ako je omogućeno, slike poglavlje će se izdvojiti kad se videozapisi uvezu tijekom skeniranja biblioteke. Ako je onemogućeno izdvojiti će se u rasporedu zadatka slika poglavlja, čime se omogućuje da se skeniranje redovne biblioteke završiti brže.",
+    "LabelExtractChaptersDuringLibraryScanHelp": "Generiraj slike poglavlje kad se videozapisi uvezu tijekom skeniranja biblioteke. U suprotnom, izdvajanje će se odraditi u rasporedu zadatka slika poglavlja, čime se omogućuje da se skeniranje redovne biblioteke završi brže.",
     "LabelFailed": "Neuspješno",
     "LabelFileOrUrl": "Datoteka ili url:",
     "LabelFinish": "Kraj",
     "LabelForgotPasswordUsernameHelp": "Unesite korisničko ime, ako se sjećate.",
-    "LabelFriendlyName": "Prijateljsko ime",
+    "LabelFriendlyName": "Prijateljsko ime:",
     "LabelServerNameHelp": "Ovo ime će se koristiti za identifikaciju servera. Ako ostavite prazno, ime računala će se koristi kao identifikator.",
     "LabelGroupMoviesIntoCollections": "Grupiraj filmove u kolekciju",
     "LabelGroupMoviesIntoCollectionsHelp": "Kada se prikazuje lista filmova, filmovi koji pripadaju kolekciji biti će prikazani kao jedna stavka.",
@@ -475,7 +475,7 @@
     "LabelMetadataDownloadersHelp": "Omogućite i poredajte željene preuzimatelje meta-podataka po redu prioriteta. Manjeg prioriteta preuzimatelji koristit će se samo za ispunjavanje nedostajućih informacija.",
     "LabelMetadataPath": "Put meta-podataka:",
     "LabelMetadataPathHelp": "Odredite prilagođenu lokaciju za preuzete ilustracije i meta-podatke.",
-    "LabelMetadataReaders": "Čitači meta-podataka",
+    "LabelMetadataReaders": "Čitači meta-podataka:",
     "LabelMetadataReadersHelp": "Poredajte željene lokalne izvore meta-podataka po redu prioriteta. Prva nađena datoteka biti će čitana.",
     "LabelMetadataSavers": "Snimači meta-podataka:",
     "LabelMetadataSaversHelp": "Odaberite formate datoteka za spremanje meta-podataka.",
@@ -567,7 +567,7 @@
     "LabelStopWhenPossible": "Zaustavi kada je moguće:",
     "LabelStopping": "Zaustavljanje",
     "LabelSubtitleFormatHelp": "Npr.: srt",
-    "LabelSubtitlePlaybackMode": "Način titlova prijevoda",
+    "LabelSubtitlePlaybackMode": "Način prijevoda:",
     "LabelSupportedMediaTypes": "Podržani tipovi medija:",
     "LabelTag": "Oznaka:",
     "LabelTagline": "Slogan:",
@@ -652,15 +652,15 @@
     "MessageDirectoryPickerBSDInstruction": "Za BSD možda ćete morati podesiti pohranu unutar vašega FreeNAS kako bi se omogućilo Jellyfin-u pristup.",
     "MessageDirectoryPickerInstruction": "Mrežne putanje mogu se unijeti ručno u slučaju da gumb Mreže ne uspije locirati vaše uređaje. Na primjer, {0} ili {1}.",
     "MessageDirectoryPickerLinuxInstruction": "Za Linux na Arch Linux, CentOS, Debian, Fedora, OpenSuse ili Ubuntu morate dati korisniku Jellyfin sistema barem pristup čitanja vašim lokacijama za skladištenje.",
-    "MessageDownloadQueued": "Preuzimanje na čekanju",
-    "MessageFileReadError": "Prilikom učitavanja datoteke desila se greška",
+    "MessageDownloadQueued": "Preuzimanje na čekanju.",
+    "MessageFileReadError": "Prilikom učitavanja datoteke desila se greška. Pokušajte ponovno.",
     "MessageForgotPasswordFileCreated": "Sljedeća datoteka je stvorena na vašem poslužitelju i sadrži upute o tome kako postupiti:",
     "MessageForgotPasswordInNetworkRequired": "Molim pokušajte ponovno unutar kućne mreže za pokretanje postupka za poništavanje zaporke.",
     "MessageInstallPluginFromApp": "Ovaj dodatak mora biti instaliran unutar aplikacije u kojoj ga namjeravate koristiti.",
     "MessageInvalidForgotPasswordPin": "Upisan je neispravan ili zastarjele pin. Molim, pokušajte ponovno.",
     "MessageInvalidUser": "Pogrešno korisničko ime ili lozinka. Molim, pokušajte ponovo.",
     "MessageItemSaved": "Stavka je snimljena.",
-    "MessageItemsAdded": "Stavke su dodane",
+    "MessageItemsAdded": "Stavke su dodane.",
     "MessageLeaveEmptyToInherit": "Ostavite prazno da naslijedi postavke od roditelja stavke ili globalnu zadanu vrijednost.",
     "MessageNoAvailablePlugins": "Nema odgovarajućih dodataka.",
     "MessageNoMovieSuggestionsAvailable": "Filmski prijedlozi nisu trenutno dostupni. Počnite s gledanjem i ocjenjivanjem svoje filmove, a zatim se vratite da biste vidjeli svoje preporuke.",
@@ -672,7 +672,7 @@
     "MessagePluginConfigurationRequiresLocalAccess": "Za podešavanje ovog dodatka prijavite se izravno na lokalni server.",
     "MessagePluginInstallDisclaimer": "Dodaci izgrađeni od strane članova Jellyfin zajednice su sjajan način kako bi unaprijedili Vaše iskustvo Jellyfin s dodatnim značajkama i prednostima. Prije instaliranja budite svjesni učinaka koje mogu imati na vaš Jellyfin Server, kao što je duže skeniranje biblioteke, dodatna pozadinska obrada, a smanjena stabilnost sustava.",
     "MessageReenableUser": "Pogledajte dolje za ponovno omogućenje",
-    "MessageSettingsSaved": "Postavke snimljene",
+    "MessageSettingsSaved": "Postavke spremljene.",
     "MessageTheFollowingLocationWillBeRemovedFromLibrary": "Sljedeće lokacije medija biti će uklonjene iz vaše Jellyfin biblioteke:",
     "MessageUnableToConnectToServer": "Nismo u mogućnosti spojiti se na odabrani poslužitelj. Provjerite dali je pokrenut i pokušajte ponovno.",
     "MessageUnsetContentHelp": "Sadržaj će biti prikazan kao obične mape. Za najbolje rezultate upotrijebite upravitelj meta-podataka za postavljanje vrste sadržaja pod-mapa.",
@@ -785,14 +785,14 @@
     "OptionMissingEpisode": "Epizode koje nedostaju",
     "OptionMonday": "Ponedjeljak",
     "OptionNameSort": "Nazivu",
-    "OptionNew": "Novo...",
+    "OptionNew": "Novo…",
     "OptionNone": "Ništa",
     "OptionOnAppStartup": "Kada se aplikacija pokrene",
     "OptionOnInterval": "U intervalu",
     "OptionParentalRating": "Roditeljska ocjena",
     "OptionPlainStorageFolders": "Prikaži sve mape kako jednostavne mape za skladištenje",
     "OptionPlainStorageFoldersHelp": "Ako je omogućeno, sve mape se prezentiraju u DIDL-u kao \"objekt.spremnik.skladišnaMapa\" umjesto više specijaliziranog tipa kao \"objekt.spremnik.osoba.glazbaIzvođač\".",
-    "OptionPlainVideoItems": "Prikaži sav video kao jednostavne video stavke.",
+    "OptionPlainVideoItems": "Prikaži sve video zapise kao jednostavne video stavke",
     "OptionPlainVideoItemsHelp": "Ako je omogućeno, sav video se prezentira u DIDL-u kao \"objekt.stavka.videoStavka\" umjesto više specijaliziranog tipa kao \"objekt.stavka.videoStavka.film\".",
     "OptionPlayCount": "Broju izvođenja",
     "OptionPlayed": "Izvođeni",
@@ -862,7 +862,7 @@
     "RecordingScheduled": "Snimka je zakazana.",
     "Refresh": "Osviježi",
     "RefreshDialogHelp": "Meta-podaci se osvježavaju na temelju postavki i internet usluga koje su omogućene u nadzornoj ploči Jellyfin Server-a.",
-    "RefreshQueued": "Osviježi stavke na čekanju",
+    "RefreshQueued": "Osviježi stavke na čekanju.",
     "ReleaseDate": "Datum izdavanja",
     "RememberMe": "Zapamti me",
     "RemoveFromCollection": "Ukloni iz kolekcije",
@@ -890,7 +890,7 @@
     "ServerNameIsShuttingDown": "Jellyfin Server - {0} se gasi.",
     "ServerUpdateNeeded": "Jellyfin Server treba ažurirati. Da biste preuzeli najnoviju verziju, posjetite {0}",
     "Settings": "Postavke",
-    "SettingsSaved": "Postavke snimljene",
+    "SettingsSaved": "Postavke spremljene.",
     "SettingsWarning": "Mijenjanje ove vrijednosti može uzrokovati nestabilnost ili kvarove na povezivanju. Ako naiđete na bilo kakve probleme, preporučamo da ih promijenite natrag na zadane.",
     "Share": "Dijeli",
     "ShowIndicatorsFor": "Prikaži pokazatelja za:",
@@ -1006,9 +1006,248 @@
     "AccessRestrictedTryAgainLater": "Dostup je trenutačno ograničen. Pokušajte poslije ponovno.",
     "Albums": "Albumi",
     "All": "Sve",
-    "AllComplexFormats": "Svi kompleksni formati (ASS, SSA, VOBSUB, PGS, SUB/IDX, itd.)",
+    "AllComplexFormats": "Svi kompleksni formati (ASS, SSA, VOBSUB, PGS, SUB, IDX, ...)",
     "Books": "Knjige",
     "Channels": "Kanali",
     "Collections": "Kolekcije",
-    "Artists": "Izvođači"
+    "Artists": "Izvođači",
+    "DownloadsValue": "{0} preuzimanja",
+    "Down": "Dolje",
+    "Playlists": "Popis za reprodukciju",
+    "AllowMediaConversionHelp": "Dopusti ili odbij pristup mogućnosti konverzije datoteke.",
+    "AllLibraries": "Sve biblioteke",
+    "Aired": "Prikazano",
+    "AirDate": "Datum prikazivanja",
+    "AddedOnValue": "Dodano {0}",
+    "Songs": "Pjesme",
+    "Shows": "Serije",
+    "Photos": "Slike",
+    "HeaderFavoriteSongs": "Omiljene pjesme",
+    "HeaderFavoriteArtists": "Omiljeni izvođači",
+    "HeaderFavoriteAlbums": "Omiljeni albumi",
+    "HeaderFavoriteEpisodes": "Omiljene epizode",
+    "HeaderFavoriteShows": "Omiljene serije",
+    "HeaderContinueWatching": "Nastavi gledati",
+    "HeaderAlbumArtists": "Izvođači na albumu",
+    "Folders": "Mape",
+    "Favorites": "Favoriti",
+    "ButtonCast": "Uloge",
+    "EveryXHours": "Svakih {0} sati",
+    "EveryHour": "Svaki sat",
+    "OnApplicationStartup": "Prilikom pokretanja aplikacije",
+    "Backdrop": "Pozadina",
+    "Auto": "Automatski",
+    "Audio": "Audio",
+    "Artist": "Izvođač",
+    "AnyLanguage": "Bilo koji jezik",
+    "AlwaysPlaySubtitlesHelp": "Prijevodi koji odgovaraju odabranom jeziku će uvijek biti odabrani unatoč jeziku audio zapisa.",
+    "AlwaysPlaySubtitles": "Uvijek prikaži prijevod",
+    "AllowRemoteAccessHelp": "Ako je odznačeno, svi udaljeni pristupi će biti blokirani.",
+    "AllowRemoteAccess": "Dopusti udaljene pristupe na ovaj Jellyfin server.",
+    "AllowOnTheFlySubtitleExtraction": "Dopusti izvlačenje prijevoda u hodu",
+    "AllowMediaConversion": "Dopusti konverziju datoteke",
+    "AllLanguages": "Svi jezici",
+    "Alerts": "Upozorenja",
+    "AlbumArtist": "Izvođač na albumu",
+    "Album": "Album",
+    "AddToPlayQueue": "Dodaj u red izvođenja",
+    "Banner": "Zaglavlje",
+    "AutoBasedOnLanguageSetting": "Automatski (prema jezičnim postavkama)",
+    "AspectRatio": "Omjer",
+    "Ascending": "Uzlazno",
+    "Art": "Grafike",
+    "Absolute": "Apsolutno",
+    "CopyStreamURLSuccess": "URL uspješno kopiran.",
+    "CopyStreamURL": "Kopiraj URL streama",
+    "ContinueWatching": "Nastavi gledati",
+    "Connect": "Spoji",
+    "ClientSettings": "Postavke klijenta",
+    "ButtonTogglePlaylist": "Lista izvođenja",
+    "ButtonToggleContextMenu": "Više",
+    "ButtonSplit": "Odvoji",
+    "ButtonStop": "Stop",
+    "ButtonScanAllLibraries": "Skeniraj sve biblioteke",
+    "ButtonInfo": "Info",
+    "ButtonFilter": "Filtriraj",
+    "ButtonAddImage": "Dodaj sliku",
+    "Box": "Kutija",
+    "AskAdminToCreateLibrary": "Traži administratora da kreira biblioteku.",
+    "PictureInPicture": "Slika u slici",
+    "OtherArtist": "Ostali izvođači",
+    "OptionThumb": "Sličica",
+    "OptionProtocolHttp": "HTTP",
+    "OptionProfileVideo": "Video",
+    "OptionProfileAudio": "Audio",
+    "OptionPoster": "Poster",
+    "OptionList": "Lista",
+    "OptionIsSD": "SD",
+    "OptionIsHD": "HD",
+    "OptionDvd": "DVD",
+    "OptionDownloadLogoImage": "Logo",
+    "OptionBluray": "Blu-ray",
+    "OptionBanner": "Zaglavlje",
+    "Option3D": "3D",
+    "OneChannel": "Jedan kanal",
+    "Off": "Isključi",
+    "Normal": "Normalno",
+    "None": "Ništa",
+    "NoSubtitles": "Ništa",
+    "No": "Ne",
+    "NextUp": "Slijedi",
+    "Next": "Slijedeće",
+    "Never": "Nikada",
+    "MusicVideo": "Glazbeni spot",
+    "Movie": "Film",
+    "Metadata": "Meta podaci",
+    "MessageSyncPlayLibraryAccessDenied": "Pristup ovom sadržaju je ograničen.",
+    "MessageSyncPlayDisabled": "SyncPlay onemogućen.",
+    "MessageSyncPlayEnabled": "SyncPlay omogućen.",
+    "MessagePleaseWait": "Molimo pričekajte. Ovo može potrajati nekoliko minuta.",
+    "LabelRepositoryName": "Naziv repozitorija",
+    "LabelRepositoryUrl": "URL repozitorija",
+    "HeaderNewRepository": "Novi repozitorij",
+    "MessageNoRepositories": "Nema repozitorija.",
+    "MessageConfirmAppExit": "Da li želite izaći?",
+    "Menu": "Meni",
+    "MediaInfoStreamTypeVideo": "Video",
+    "MediaInfoStreamTypeSubtitle": "Prijevod",
+    "MediaInfoStreamTypeData": "Podaci",
+    "MediaInfoStreamTypeAudio": "Audio",
+    "MediaInfoSoftware": "Softver",
+    "Logo": "Logo",
+    "List": "Lista",
+    "LabelYear": "Godina:",
+    "LabelVideo": "Video",
+    "DashboardArchitecture": "Arhitektura: {0}",
+    "DashboardOperatingSystem": "Operativni sustav: {0}",
+    "DashboardServerName": "Server: {0}",
+    "DashboardVersionNumber": "Verzija: {0}",
+    "LabelVersion": "Verzija:",
+    "LabelTheme": "Tema:",
+    "LabelTextSize": "Veličina teksta:",
+    "LabelTextColor": "Boja teksta:",
+    "LabelSyncPlayAccess": "SyncPlay pristup",
+    "LabelSyncPlayAccessNone": "Onemogućeno za ovog korisnika",
+    "LabelSyncPlayAccessJoinGroups": "Dozvoli korisniku da se pridruži grupama",
+    "LabelSyncPlayAccessCreateAndJoinGroups": "Dozvoli korisniku da kreira i pridruži se grupama",
+    "LabelSyncPlayLeaveGroupDescription": "Onemogući SyncPlay",
+    "LabelSyncPlayLeaveGroup": "Napusti grupu",
+    "LabelSyncPlayNewGroupDescription": "Kreiraj novu grupu",
+    "LabelSyncPlayNewGroup": "Nova grupa",
+    "MillisecondsUnit": "ms",
+    "LabelSubtitles": "Prijevodi",
+    "LabelStatus": "Status:",
+    "LabelSoundEffects": "Zvučni efekti:",
+    "LabelSortOrder": "Redoslijed sortiranja:",
+    "LabelSortBy": "Sortiranje po:",
+    "LabelSize": "Veličina:",
+    "LabelServerName": "Naziv servera:",
+    "EnableFasterAnimations": "Brže animacije",
+    "LabelReasonForTranscoding": "Razlog transkodiranja:",
+    "LabelPreferredSubtitleLanguage": "Preferirani jezik prijevoda:",
+    "LabelStable": "Stabilna",
+    "LabelLanNetworks": "LAN mreže:",
+    "LabelInternetQuality": "Internet kvaliteta:",
+    "LabelHomeNetworkQuality": "Kvaliteta kućne mreže:",
+    "LabelFormat": "Format:",
+    "LabelFont": "Font:",
+    "LabelFolder": "Mapa:",
+    "LabelEnableHttps": "Omogući HTTPS",
+    "LabelEnableHardwareDecodingFor": "Omogući hardversko dekodiranje za:",
+    "LabelDisplayLanguageHelp": "Prevođenje Jellyfin-a je projekt u tijeku.",
+    "LabelDisplayLanguage": "Jezik prikaza:",
+    "LabelAutomaticallyRefreshInternetMetadataEvery": "Automatski osvježi meta podatke sa interneta:",
+    "LabelAudioChannels": "Audio kanali:",
+    "LabelAudio": "Audio",
+    "LabelAlbum": "Album:",
+    "Label3DFormat": "3D format:",
+    "Items": "Stavke",
+    "Horizontal": "Horizontalno",
+    "Home": "Početna",
+    "Hide": "Sakrij",
+    "HeaderSyncPlayEnabled": "SyncPlay omogućen",
+    "HeaderSyncPlaySelectGroup": "Pridruži se grupi",
+    "HeaderSubtitleDownloads": "Preuzimanje prijevoda",
+    "HeaderSubtitleAppearance": "Prikaz prijevoda",
+    "HeaderStopRecording": "Zaustavi snimanje",
+    "HeaderStatus": "Status",
+    "HeaderSeriesStatus": "Status serije",
+    "HeaderSecondsValue": "{0} sekundi",
+    "HeaderRemoteAccessSettings": "Postavke udaljenog pristupa",
+    "HeaderPlaybackError": "Pogreška reprodukcije",
+    "HeaderPlayAll": "Reproduciraj sve",
+    "HeaderOnNow": "Trenutno",
+    "HeaderNextVideoPlayingInValue": "Slijedeći video se reproducira za {0}",
+    "HeaderNextEpisodePlayingInValue": "Slijedeća epizoda se reproducira za {0}",
+    "HeaderNewDevices": "Novi uređaji",
+    "HeaderNavigation": "Navigacija",
+    "HeaderMyDevice": "Moj uređaj",
+    "HeaderLibrarySettings": "Postavke biblioteke",
+    "HeaderHome": "Početna",
+    "HeaderGenres": "Žanrovi",
+    "HeaderFavoritePeople": "Omiljeni ljudi",
+    "HeaderFavoriteMovies": "Omiljeni filmovi",
+    "HeaderFavoriteBooks": "Omiljene knjige",
+    "HeaderDVR": "DVR",
+    "HeaderDownloadSync": "Preuzmi i sinkroniziraj",
+    "HeaderContinueListening": "Nastavi slušati",
+    "HeaderConfigureRemoteAccess": "Konfiguriraj udaljeni pristup",
+    "HeaderAudioBooks": "Audio knjige",
+    "ApiKeysCaption": "Popis trenutno dostupnih API ključeva",
+    "HeaderAllowMediaDeletionFrom": "Dozvoli brisanje datoteka iz",
+    "HeaderAlbums": "Albumi",
+    "HeaderAdmin": "Administrator",
+    "Guide": "Vodič",
+    "GroupBySeries": "Grupiraj po serijama",
+    "Genre": "Žanr",
+    "General": "Općenito",
+    "Fullscreen": "Prikaz cijelog ekrana",
+    "Filters": "Filteri",
+    "FetchingData": "Dohvaćanje dodatnih podataka",
+    "Features": "Mogućnosti",
+    "Extras": "Dodaci",
+    "ExtraLarge": "Ekstra veliko",
+    "ExitFullscreen": "Izađi iz prikaza cijelog ekrana",
+    "EveryNDays": "Svakih {0} dana",
+    "Episodes": "Epizode",
+    "Episode": "Epizoda",
+    "EnableHardwareEncoding": "Omogući hardversko enkodiranje",
+    "EnableExternalVideoPlayers": "Vanjski video player",
+    "EnableDecodingColorDepth10Vp9": "Omogući 10-Bitno hardversko dekodiranje za VP9",
+    "EnableDecodingColorDepth10Hevc": "Omogući 10-Bitno hardversko dekodiranje za HEVC",
+    "EnableCinemaMode": "Kino mod",
+    "EnableBackdrops": "Pozadine",
+    "EditMetadata": "Izmijeni meta podatke",
+    "DisplayMissingEpisodesWithinSeasons": "Prikaži epizode koje nedostaju unutar sezona",
+    "DisplayInMyMedia": "Prikaz na početnom ekranu",
+    "Display": "Prikaz",
+    "Disconnect": "Odspoji",
+    "Disc": "Disk",
+    "Disabled": "Onemogućeno",
+    "Directors": "Režiseri",
+    "DirectPlaying": "Direktna reprodukcija",
+    "DetectingDevices": "Tražim uređaje",
+    "Descending": "Silazno",
+    "DefaultMetadataLangaugeDescription": "Ovo su vaše zadane postavke te se mogu prilagoditi na razini biblioteke.",
+    "Default": "Zadano",
+    "DatePlayed": "Datum reprodukcije",
+    "DateAdded": "Datum dodavanja",
+    "CriticRating": "Rejting kritičara",
+    "CopyStreamURLError": "Došlo je do greške prilikom kopiranja URLa.",
+    "ConfirmEndPlayerSession": "Da li želite ugasiti Jellyfin na {0}?",
+    "CommunityRating": "Rejting zajednice",
+    "Browse": "Pretraži",
+    "BoxRear": "Kutija (stražnja)",
+    "ButtonSyncPlay": "SyncPlay",
+    "DirectStreaming": "Direktno strujanje",
+    "DirectStreamHelp2": "Direktno strujanje datoteke koristi jako malo procesne snage bez gubitka kvalitete videozapisa.",
+    "Desktop": "Stolno računalo",
+    "ColorTransfer": "Prijenos boje",
+    "ColorSpace": "Spektar boja",
+    "ColorPrimaries": "Primarne boje",
+    "BookLibraryHelp": "Audio i tekstualne knjige su podržane. Provjeri {1} upute za imenovanje knjige {0}.",
+    "Blacklist": "Crna lista",
+    "AuthProviderHelp": "Odaberi pružatelja ovjere autentičnosti koji će se koristiti za provjeru lozinke.",
+    "AllowFfmpegThrottling": "Uspori transkodiranje",
+    "AllowOnTheFlySubtitleExtractionHelp": "Ugrađeni titlovi mogu biti izvedeni iz videozapisa i dostavljena klijentima u običnom tekstu, u svrhu spriječavanja video transcodinga. Na nekim sustavima ovo može potrajati duže vrijeme i video reprodukcija može trzati tijekom postupka izvođenja. Onemogući ovo da imaš ugrađene titlove spaljene u video transkodingu kada nisu nativno podržani od strane uređaja klijenta."
 }
diff --git a/src/strings/hu.json b/src/strings/hu.json
index 6d6307285d..5559e2f10a 100644
--- a/src/strings/hu.json
+++ b/src/strings/hu.json
@@ -1127,7 +1127,7 @@
     "AddToPlayQueue": "Hozzáadás a lejátszási sorhoz",
     "AllowHWTranscodingHelp": "Lehetővé teszi a tuner számára, hogy át tudja kódolni a streameket valós időben. Ez segíthet csökkenteni a Szerver által igényelt átkódolást.",
     "AllowOnTheFlySubtitleExtraction": "Felirat kinyerésének engedélyezése valós időben",
-    "MessageNoTrailersFound": "Nincsenek előzetesek. Telepítsd a Trailer csatornát, hogy javítsd a filmélményt az internetes előzetesek könyvtárának hozzáadásával.",
+    "MessageNoTrailersFound": "Telepítsd a Trailer csatornát, hogy javítsd a filmélményt az internetes előzetesek könyvtárának hozzáadásával.",
     "OptionEnableM2tsMode": "M2ts mód engedélyezése",
     "OptionEnableM2tsModeHelp": "Engedélyezze az m2ts módot amikor mpegts kódolás történik.",
     "OptionEnded": "Befejezett",
@@ -1196,11 +1196,10 @@
     "RecordingScheduled": "A rögzítés ütemezett.",
     "Recordings": "Felvételek",
     "RefreshQueued": "Frissítés sorba állítva.",
-    "RemoveFromCollection": "Gyűjteményből eltávolítani",
+    "RemoveFromCollection": "Törlés a gyűjteményből",
     "RemoveFromPlaylist": "Lejátszási listáról eltávolítani",
     "RepeatEpisodes": "Epizódok ismétlése",
     "RequiredForAllRemoteConnections": "Minden távoli kapcsolathoz szükséges",
-    "RestartPleaseWaitMessage": "Kérlek várj, amíg a Jellyfin Szerver leáll és újraindul. Ez eltarthat egy-két percig.",
     "ResumeAt": "Folytatás: {0}",
     "RunAtStartup": "Futtassa indításkor",
     "SaveSubtitlesIntoMediaFolders": "Mentse a feliratokat a média mappákba",
@@ -1324,7 +1323,6 @@
     "HeaderFavoriteVideos": "Kedvenc Videók",
     "HeaderGuideProviders": "TV műsorújság Szolgáltatók",
     "HeaderHome": "Kezdőlap",
-    "HeaderRestartingServer": "Szerver újraindítása",
     "HeaderUpcomingOnTV": "Következő TV műsorok",
     "ImportFavoriteChannelsHelp": "Ha engedélyezve van, csak a tuner eszközön kedvencként megjelölt csatornák kerülnek importálásra.",
     "LabelAlbumArtHelp": "A használandó PN érték az albumborítók esetében, mely a upnp:albumArtURI dlna:profileID tulajdonságában szerepel. Néhány eszköz meghatározott értéket vár el, függetlenül a kép méretétől.",
@@ -1393,8 +1391,6 @@
     "ButtonSplit": "Szétvág",
     "Absolute": "Abszolút",
     "LabelSkipIfAudioTrackPresentHelp": "Vedd ki a pipát, ha minden videóhoz szeretnél feliratot az audio nyelvétől függetlenül.",
-    "EnableFastImageFadeInHelp": "Poszterek és más képek megjelenítése gyorsabb animációkkal.",
-    "EnableFastImageFadeIn": "Gyors kép-előtűnés",
     "SubtitleOffset": "Felirat eltolása",
     "SeriesDisplayOrderHelp": "Rakd sorba az epizódokat az adásba kerülésük dátuma, a DVD sorszám, vagy az abszolút számozás szerint.",
     "SelectAdminUsername": "Kérjük válassz felhasználónevet az adminisztrátor fiók számára.",
@@ -1525,7 +1521,7 @@
     "TabDVR": "DVR",
     "HeaderDVR": "DVR",
     "SaveChanges": "Változtatások mentése",
-    "MessageSyncPlayGroupWait": "<b>{0}</b> bufferel...",
+    "MessageSyncPlayGroupWait": "<b>{0}</b> pufferel…",
     "MessageSyncPlayUserLeft": "<b>{0}</b> elhagyta a csoportot.",
     "MessageSyncPlayUserJoined": "<b>{0}</b> csatlakozott a csoporthoz.",
     "MessageSyncPlayDisabled": "SyncPlay letiltva.",
@@ -1556,5 +1552,29 @@
     "LabelSyncPlayPlaybackDiff": "Lejátszási időkülönbség:",
     "LabelSyncPlayTimeOffset": "Időeltolás a szerverhez képest:",
     "EnableDetailsBannerHelp": "Megjelenít egy banner képet a részletes információoldal tetején.",
-    "EnableDetailsBanner": "Banner a részletes oldalon"
+    "EnableDetailsBanner": "Banner a részletes oldalon",
+    "EnableBlurhashHelp": "A még betöltés alatt álló képek helyén egy elmosódott helyettesítő képet jelenít meg",
+    "EnableBlurhash": "Elmosódott helyettesítőképek engedélyezése",
+    "ShowMore": "Továbbiak megtekintése",
+    "ShowLess": "Kevesebb mutatása",
+    "ButtonCast": "Vetítés",
+    "ButtonSyncPlay": "SyncPlay",
+    "MessageNoGenresAvailable": "Engedélyezz néhány metaadat szolgáltatót, hogy műfaj adatokat tölthess le az internetről.",
+    "EnableFasterAnimationsHelp": "Gyorsabb animációk és áttűnések használata",
+    "EnableFasterAnimations": "Gyorsabb animációk",
+    "EnableDecodingColorDepth10Vp9": "10 bites hardveres dekódolás engedélyezése VP9-hez",
+    "EnableDecodingColorDepth10Hevc": "10 bites hardveres dekódolás engedélyezése HEVC-hez",
+    "TabRepositories": "Tárolók",
+    "MessageAddRepository": "Ha új tárolót szeretnél hozzáadni, kattints a gombra a fejlécben, és add meg a szükséges adatokat.",
+    "LabelRepositoryNameHelp": "Egy egyedi név, amivel megkülönböztetheted a tárolót a többi, a szervezhez hozzáadott tárolótól.",
+    "LabelRepositoryName": "Tároló neve",
+    "LabelRepositoryUrlHelp": "A hivatkozni kívánt tároló manifeszt helye.",
+    "LabelRepositoryUrl": "Tároló URL-je",
+    "HeaderNewRepository": "Új tároló",
+    "MessageNoRepositories": "Nincs tároló.",
+    "Writers": "Írók",
+    "ClearQueue": "Sor ürítése",
+    "StopPlayback": "Lejátszás leállítása",
+    "ViewAlbumArtist": "Album előadójának megtekintése",
+    "ButtonPlayer": "Lejátszó"
 }
diff --git a/src/strings/id.json b/src/strings/id.json
index 8085767984..9d347b7dcc 100644
--- a/src/strings/id.json
+++ b/src/strings/id.json
@@ -192,8 +192,8 @@
     "AddToPlayQueue": "Tambah ke dalam antrean putar",
     "AddToCollection": "Tambah ke dalam koleksi",
     "AddItemToCollectionHelp": "Tambahkan item ke dalam koleksi melalui pencarian dan gunakan klik kanan atau ketuk menu untuk menambahkannya ke dalam koleksi.",
-    "AccessRestrictedTryAgainLater": "Akses sedang dibatasi. Silakan coba kembali nanti.",
-    "Absolute": "Mutlak",
+    "AccessRestrictedTryAgainLater": "Akses sedang dibatasi. Mohon tunggu beberapa saat lagi",
+    "Absolute": "Absolut",
     "Songs": "Lagu",
     "Playlists": "Daftar putar",
     "ValueSpecialEpisodeName": "Spesial - {0}",
@@ -204,5 +204,6 @@
     "Alerts": "Peringatan",
     "AddedOnValue": "Ditambahkan {0}",
     "AllowFfmpegThrottling": "Transcode Tercekik",
-    "AllowOnTheFlySubtitleExtractionHelp": "Subtitle yang melekat di video dapat dikeluarkan dan dikirimkan kepada klien dalam bentuk text biasa dengan tujuan untuk menghalau terjadinya transcoding pada video. Pada beberapa system ini membutuhkan waktu yang lama dan dapat menyebabkan video playback menjadi terhenti dikarenakan proses ekstraksi. Non-aktifkan fitur ini untuk membiarkan subtitle langsung dilekatkan kepada video dengan cara transcoding ketika klien tidak mendukung fitur ini."
+    "AllowOnTheFlySubtitleExtractionHelp": "Subtitle yang melekat di video dapat dikeluarkan dan dikirimkan kepada klien dalam bentuk text biasa dengan tujuan untuk menghalau terjadinya transcoding pada video. Pada beberapa system ini membutuhkan waktu yang lama dan dapat menyebabkan video playback menjadi terhenti dikarenakan proses ekstraksi. Non-aktifkan fitur ini untuk membiarkan subtitle langsung dilekatkan kepada video dengan cara transcoding ketika klien tidak mendukung fitur ini.",
+    "ButtonSyncPlay": "SyncPlay"
 }
diff --git a/src/strings/is-is.json b/src/strings/is-is.json
index 1042737ae2..ff8f924e22 100644
--- a/src/strings/is-is.json
+++ b/src/strings/is-is.json
@@ -543,5 +543,10 @@
     "LabelAllowServerAutoRestart": "Leyfa netþjóni að endurræsa sig sjálfkrafa til þess að uppfæra sig",
     "LabelAllowHWTranscoding": "Leyfa vélbúnaðarumkóðun",
     "Label3DFormat": "3D snið:",
-    "HeaderIdentification": "Auðkenning"
+    "HeaderIdentification": "Auðkenning",
+    "ConfirmDeleteItems": "Ef þessum skrám er eytt verða þær fjarlægðar úr bæði stýrikerfinu og miðlasafninu. Ertu viss um að þú viljir halda áfram?",
+    "CommunityRating": "Mat samfélagsins",
+    "ButtonStart": "Byrja",
+    "BoxSet": "Kassasett",
+    "ButtonSyncPlay": "SyncPlay"
 }
diff --git a/src/strings/it.json b/src/strings/it.json
index 71d09eced7..69919fbd76 100644
--- a/src/strings/it.json
+++ b/src/strings/it.json
@@ -861,7 +861,7 @@
     "MessageNoAvailablePlugins": "Nessun plugin disponibile.",
     "MessageNoMovieSuggestionsAvailable": "Nessun suggerimento di film attualmente disponibile. Iniziare a guardare e valutare i vostri film, e poi tornare per i suggerimenti.",
     "MessageNoPluginsInstalled": "Non hai plugin installati.",
-    "MessageNoTrailersFound": "Nessun trailer trovato. Installa il canale dei Trailer per migliorare la tua esperienza cinematografica importando una libreria di trailer da internet.",
+    "MessageNoTrailersFound": "Installa il canale dei trailer per migliorare la tua esperienza cinematografica aggiungendo una libreria di trailer da internet.",
     "MessageNothingHere": "Non c'è niente qui.",
     "MessagePasswordResetForUsers": "I seguenti utenti havvo avuto le loro password resettate. Adesso possono accedere con i codici pin che sono stati utilizzati per eseguire il reset.",
     "MessagePlayAccessRestricted": "Le riproduzione di questi contenuti è bloccata. Per favore contatta il tuo amministratore del server per maggiori informazioni.",
@@ -1105,7 +1105,6 @@
     "ReplaceAllMetadata": "Sostituisci tutti i metadati",
     "ReplaceExistingImages": "Sovrascrivi immagini esistenti",
     "RequiredForAllRemoteConnections": "Richiesto per tutte le connessioni remote",
-    "RestartPleaseWaitMessage": "Per piacere aspetta mentre Jellyfin Server si arresta e riavvia. Questo può richiedere un minuto o due.",
     "ResumeAt": "Riprendi da {0}",
     "Rewind": "Riavvolgi",
     "RunAtStartup": "Esegui all'avvio",
@@ -1157,7 +1156,7 @@
     "SortChannelsBy": "Ordina canali per:",
     "SortName": "Nome ordinamento",
     "Sports": "Sport",
-    "StopRecording": "Ferma registrazione",
+    "StopRecording": "Interrompi registrazione",
     "SubtitleAppearanceSettingsAlsoPassedToCastDevices": "Queste impostazioni si applicano anche a qualsiasi riproduzione di Chromecast avviata da questo dispositivo.",
     "SubtitleAppearanceSettingsDisclaimer": "Queste impostazioni non si applicano a sottotitoli grafici (PGS, DVD, ecc.) o sottotitoli ASS/SSA che hanno i propri stili.",
     "SubtitleDownloadersHelp": "Abilita e classifica i tuoi downloader di sottotitoli preferiti in ordine di priorità.",
@@ -1314,7 +1313,6 @@
     "HeaderFavoriteVideos": "Video Preferiti",
     "HeaderFetcherSettings": "Impostazioni del Fetcher",
     "HeaderImageOptions": "Opzioni Immagine",
-    "HeaderRestartingServer": "Riavvio Server",
     "Home": "Home",
     "LabelAlbum": "Album:",
     "LabelAudio": "Audio",
@@ -1455,8 +1453,6 @@
     "MessageConfirmAppExit": "Vuoi uscire?",
     "HeaderNavigation": "Navigazione",
     "CopyStreamURLError": "Si è verificato un errore nel copiare l'indirizzo.",
-    "EnableFastImageFadeInHelp": "Abilita la dissolvenza veloce per le immagini caricate",
-    "EnableFastImageFadeIn": "Dissolvenza immagine veloce",
     "PlaybackErrorNoCompatibleStream": "Il client è incompatibile con il media e il server non sta inviando un formato compatibile.",
     "OptionForceRemoteSourceTranscoding": "Forza la transcodifica da fonti di media remoti (come LiveTV)",
     "NoCreatedLibraries": "Sembra che tu non abbia ancora creato delle librerie. {0}Vuoi crearne una adesso?{1}",
@@ -1512,7 +1508,7 @@
     "LabelChromecastVersion": "Versione Chromecast",
     "LabelRequireHttpsHelp": "Se selezionata, il server reindirizzerà tutte le richieste HTTP a HTTPS. Vale solo se il sever è configurato per l'ascolto in HTTPS.",
     "LabelRequireHttps": "Richiede HTTPS",
-    "LabelEnableHttpsHelp": "Abilita il server all'ascolto sulla porta HTTPS. Il certificato deve essere configurato e valido per l'abilitazione.",
+    "LabelEnableHttpsHelp": "Abilita il server all'ascolto sulla porta HTTPS configurata. Il certificato deve essere configurato e valido per l'abilitazione.",
     "LabelEnableHttps": "Abilita HTTPS",
     "HeaderServerAddressSettings": "Configurazione Indirizzo Server",
     "HeaderRemoteAccessSettings": "Configurazione Access Remoto",
@@ -1520,5 +1516,61 @@
     "TabDVR": "DVR",
     "SaveChanges": "Salva modifiche",
     "HeaderDVR": "DVR",
-    "LabelNightly": "Nightly"
+    "LabelNightly": "Nightly",
+    "SyncPlayAccessHelp": "Selezionare il livello d'accesso di questo utente a SyncPlay che permetterà di riprodurre contemporaneamente su diversi dispositivi.",
+    "MessageSyncPlayErrorMedia": "Impossibile abilitare SyncPlay! Errore media.",
+    "MessageSyncPlayErrorMissingSession": "Impossibile abilitare SyncPlay! Sessione mancante.",
+    "MessageSyncPlayErrorNoActivePlayer": "Nessun player attivo. SyncPlay è stato disabilitato.",
+    "MessageSyncPlayErrorAccessingGroups": "Errore durante l'accesso alla lista dei gruppi.",
+    "MessageSyncPlayLibraryAccessDenied": "L'accesso a questo contenuto è negato.",
+    "MessageSyncPlayJoinGroupDenied": "E' Necessario il permesso per l'utilizzo di SyncPlay.",
+    "MessageSyncPlayCreateGroupDenied": "E' necessario il permesso di creazione di un gruppo.",
+    "MessageSyncPlayGroupDoesNotExist": "Impossibile unirsi al gruppo perchè non esiste.",
+    "MessageSyncPlayPlaybackPermissionRequired": "Permesso di riproduzione necessario.",
+    "MessageSyncPlayNoGroupsAvailable": "Nessun gruppo disponibile. Inizia a riprodurre qualcosa.",
+    "MessageSyncPlayGroupWait": "<b>{0}</b> sta bufferizzando...",
+    "MessageSyncPlayUserLeft": "<b>{0}</b> ha lasciato il gruppo.",
+    "MessageSyncPlayUserJoined": "<b>{0}</b> si è unito al gruppo.",
+    "MessageSyncPlayDisabled": "SyncPlay disabilitato.",
+    "MessageSyncPlayEnabled": "SyncPlay abilitato.",
+    "LabelSyncPlayAccess": "Accesso SyncPlay",
+    "LabelSyncPlayAccessNone": "Disabilitato per questo utente",
+    "LabelSyncPlayAccessJoinGroups": "Permetti all'utente di unirsi ai gruppi",
+    "LabelSyncPlayAccessCreateAndJoinGroups": "Permetti all'utente di creare e unirsi ai gruppi",
+    "LabelSyncPlayLeaveGroupDescription": "Disabilita SyncPlay",
+    "LabelSyncPlayLeaveGroup": "Lascia il gruppo",
+    "LabelSyncPlayNewGroupDescription": "Crea un nuovo gruppo",
+    "LabelSyncPlayNewGroup": "Nuovo gruppo",
+    "LabelSyncPlaySyncMethod": "Metodo Sync:",
+    "LabelSyncPlayPlaybackDiff": "Differenza oraria nella riproduzione:",
+    "MillisecondsUnit": "ms",
+    "LabelSyncPlayTimeOffset": "Differenza temporale con il server:",
+    "HeaderSyncPlayEnabled": "SyncPlay abilitato",
+    "HeaderSyncPlaySelectGroup": "Unisciti a un gruppo",
+    "EnableDetailsBannerHelp": "Mostra il banner nella parte superiore della pagina di dettaglio dell'elemento.",
+    "EnableDetailsBanner": "Banner Dettagli",
+    "EnableBlurhashHelp": "Le immagini ancora da caricare saranno mostrate inizialmente sfocate",
+    "EnableBlurhash": "Abilita i segnaposto sfocati per le immagini",
+    "ShowMore": "Mostra di più",
+    "ShowLess": "Mostra meno",
+    "ButtonCast": "Cast",
+    "ButtonSyncPlay": "SyncPlay",
+    "EnableFasterAnimationsHelp": "Utilizza animazioni e transizioni veloci",
+    "EnableFasterAnimations": "Animazioni veloci",
+    "EnableDecodingColorDepth10Vp9": "Abilita la decodifica hardware 10-Bit per VP9",
+    "EnableDecodingColorDepth10Hevc": "Abilita la decodifica hardware 10-Bit per HEVC",
+    "TabRepositories": "Repository",
+    "MessageNoGenresAvailable": "Abilita un metadata provider per recuperare i generi da internet.",
+    "MessageAddRepository": "Cliccare sul bottone vicino all'header se si intende aggiungere un nuovo repository.",
+    "LabelRepositoryNameHelp": "Nome personalizzato per distinguere questo repository dagli altri sul tuo server.",
+    "LabelRepositoryName": "Nome Repository",
+    "LabelRepositoryUrlHelp": "URL del repository manifest che si vuole includere.",
+    "LabelRepositoryUrl": "URL Repository",
+    "HeaderNewRepository": "Nuovo Repository",
+    "MessageNoRepositories": "Nessun repository.",
+    "ButtonPlayer": "Player",
+    "ViewAlbumArtist": "Visualizza artista dell'album",
+    "Writers": "Scrittori",
+    "ClearQueue": "Svuota la coda",
+    "StopPlayback": "Interrompi riproduzione"
 }
diff --git a/src/strings/ja.json b/src/strings/ja.json
index 0f90a05c40..b93b3175e4 100644
--- a/src/strings/ja.json
+++ b/src/strings/ja.json
@@ -14,7 +14,7 @@
     "Alerts": "アーティスト",
     "All": "すべて",
     "AllChannels": "すべてのチャンネル",
-    "AllComplexFormats": "すべての複雑なフォーマット (ASS, SSA, VOBSUB, PGS, SUB/IDX, etc.)",
+    "AllComplexFormats": "すべての複雑なフォーマット (ASS, SSA, VOBSUB, PGS, SUB, IDX など)",
     "AllEpisodes": "すべてのエピソード",
     "AllLanguages": "すべての言語",
     "AllLibraries": "すべてのライブラリ",
@@ -22,15 +22,15 @@
     "AllowMediaConversion": "メディアの変換を許可する",
     "AllowMediaConversionHelp": "メディア変換機能へのアクセスを許可もしくは、拒否します。",
     "AllowOnTheFlySubtitleExtraction": "字幕の抽出の許可/拒否",
-    "AllowOnTheFlySubtitleExtractionHelp": "埋め込まれた字幕は、ビデオのトランスコーディングを防ぐために、ビデオから抽出してプレーンテキストでクライアントに配信できます。 システムによっては、これに時間がかかり、抽出中にビデオの再生が止まることがあります。 これを無効にし、埋め込み字幕がクライアントデバイスでネイティブにサポートされていない場合、ビデオのトランスコーディングが強制されます。",
+    "AllowOnTheFlySubtitleExtractionHelp": "埋め込まれた字幕は、ビデオのトランスコードを防ぐために、ビデオから抽出してプレーンテキストでクライアントに配信できます。 システムによっては、これに時間がかかり、抽出中にビデオの再生が止まることがあります。 これを無効にし、埋め込み字幕がクライアントデバイスでネイティブにサポートされていない場合、ビデオのトランスコードが強制されます。",
     "AllowRemoteAccess": "Jellyfin Serverへのリモート接続の許可。",
     "AllowRemoteAccessHelp": "チェックが入っていない場合すべてのリモート接続をブロックします。",
     "AllowedRemoteAddressesHelp": "リモート接続を許可するネットワークのIPアドレスまたはIPアドレス/マスク長 空白のままにすると、すべてのリモートアドレスが許可されます。",
-    "AlwaysPlaySubtitles": "字幕を常に有効にする",
+    "AlwaysPlaySubtitles": "常に有効",
     "AlwaysPlaySubtitlesHelp": "言語に合った字幕が音声言語に関係なく読み込まれます。",
-    "AnyLanguage": "いずれかの言語",
+    "AnyLanguage": "任意の言語",
     "Anytime": "いつでも",
-    "AroundTime": "{0}頃",
+    "AroundTime": "だいたい",
     "Art": "アート",
     "Artists": "アーティスト",
     "AsManyAsPossible": "できるだけ多く",
@@ -47,13 +47,13 @@
     "BirthLocation": "生まれた場所",
     "BirthPlaceValue": "生まれた場所: {0}",
     "Blacklist": "ブラックリスト",
-    "BookLibraryHelp": "オーディオブックとテキストブックに対応しています。{0}Jellyfinブック命名ガイド{1}.",
+    "BookLibraryHelp": "オーディオブックとテキストブックに対応しています。{0} の資料、ブック命名ガイド {1} を参照。",
     "Books": "ブック",
     "Box": "ボックス",
     "BoxRear": "ボックス(後)",
     "Browse": "ブラウズ",
     "BrowsePluginCatalogMessage": "利用可能なプラグインを表示するには、プラグインカタログを参照してください。",
-    "BurnSubtitlesHelp": "字幕フォーマットに応じて、ビデオを変換するときにサーバーが字幕を直接書き込むかどうかを決定します。 字幕の書き込みを避けると、サーバーのパフォーマンスが向上します。 特定のASS / SSA字幕だけでなく画像ベースのフォーマット(VOBSUB, PGS, SUB/IDX, etc)を焼くには自動を選択します",
+    "BurnSubtitlesHelp": "ビデオのトランスコード時にサーバーが字幕を焼付けるかどうかを決定します。 この字幕焼付けを避けると、サーバーのパフォーマンスが非常に向上します。 画像ベースの形式 (VOBSUB, PGS, SUB, IDX など) と特定の ASS または SSA 字幕でだけ焼付けを行うには、自動を選んでください。",
     "ButtonAdd": "追加",
     "ButtonAddMediaLibrary": "メディアライブラリを追加",
     "ButtonAddScheduledTaskTrigger": "トリガーを追加",
@@ -186,7 +186,7 @@
     "DisplayInOtherHomeScreenSections": "最新のメディアなどをホーム画面に表示する",
     "DisplayMissingEpisodesWithinSeasons": "シーズンの欠けているエピソードを表示する",
     "DisplayMissingEpisodesWithinSeasonsHelp": "これは サーバーのTVライブラリ設定でも有効にする必要があります。",
-    "DisplayModeHelp": "ellyfinを実行している画面の種類を選択します。",
+    "DisplayModeHelp": "インターフェース用のお好みのレイアウトスタイルを選びます。",
     "DoNotRecord": "記録しない",
     "Down": "下",
     "Download": "ダウンロード",
@@ -435,7 +435,6 @@
     "HeaderResponseProfile": "レスポンスプロファイル",
     "HeaderResponseProfileHelp": "レスポンスプロファイルは、特定の種類のメディアを再生するときにデバイスに送信される情報をカスタマイズする方法を提供します。",
     "HeaderRestart": "リスタート",
-    "HeaderRestartingServer": "サーバーの再起動",
     "HeaderRevisionHistory": "更新履歴",
     "HeaderRunningTasks": "実行中のタスク",
     "HeaderScenes": "シーン",
@@ -826,12 +825,12 @@
     "LabelAudioSampleRate": "音声サンプルレート:",
     "HeaderFavoritePeople": "お気に入りの俳優",
     "LabelFileOrUrl": "ファイル又はURL:",
-    "LabelHardwareAccelerationTypeHelp": "これはサポートされたシステムでのみ利用可能な実験的な機能です。",
+    "LabelHardwareAccelerationTypeHelp": "ハードウェアアクセラレーションを利用するには追加設定が必要です。",
     "LabelHomeNetworkQuality": "ホームネットワーク品質:",
     "HeaderXmlDocumentAttribute": "XMLドキュメント属性",
     "HeaderXmlDocumentAttributes": "XMLドキュメント属性",
     "Images": "画像",
-    "InstallingPackage": "インストール中 {0}",
+    "InstallingPackage": "{0} （バージョン {1} ）をインストールしています",
     "ItemCount": "{0} アイテム",
     "Items": "アイテム",
     "Kids": "子供",
@@ -900,7 +899,7 @@
     "LabelHomeScreenSectionValue": "ホームスクリーンセクション {0}:",
     "LabelHttpsPort": "ローカルHTTPSポート番号:",
     "LabelIconMaxHeight": "アイコン最大高さ:",
-    "LabelIconMaxWidth": "いおコン最大幅:",
+    "LabelIconMaxWidth": "アイコン最大幅:",
     "LabelKodiMetadataEnablePathSubstitution": "パス置換の有効化",
     "LabelKodiMetadataSaveImagePaths": "NFOファイル中に画像パスを保存",
     "LabelManufacturer": "製作社:",
@@ -1144,5 +1143,98 @@
     "ClientSettings": "クライアント設定",
     "Artist": "アーティスト",
     "AlbumArtist": "アルバム アーティスト",
-    "Album": "アルバム"
+    "Album": "アルバム",
+    "ButtonSyncPlay": "SyncPlay",
+    "DeinterlaceMethodHelp": "インターレースコンテンツをトランスコードする際に使用するデインターレース方式を選びます。",
+    "ButtonTogglePlaylist": "プレイリスト",
+    "ButtonToggleContextMenu": "さらに表示",
+    "BoxSet": "ボックスセット",
+    "AllowFfmpegThrottlingHelp": "トランスコードや remux が現在の再生位置から十分に先に進んだ場合、処理を一時停止してリソースの消費を抑えます。これは、あまり早送り・早戻しをしないで視聴する場合に便利です。再生に問題が発生した場合は、この機能をオフにしてください。",
+    "LabelDisplaySpecialsWithinSeasons": "放送されたシーズン内のスペシャルを表示",
+    "LabelDeinterlaceMethod": "インターレス解除方法:",
+    "LabelDefaultUserHelp": "接続されたデバイスに表示するユーザーライブラリを決定します。これは、プロファイルを使用して各デバイスに対してオーバーライドすることができます。",
+    "LabelDateAddedBehavior": "新規コンテンツの追加日のふるまい:",
+    "LabelCustomCertificatePathHelp": "カスタムドメインでTLSサポートを有効にするための証明書と秘密鍵を含むPKCS #12ファイルのパス。",
+    "LabelCachePathHelp": "画像などのサーバーキャッシュファイルの場所を指定します。空欄にしておくと、サーバーのデフォルトを使います。",
+    "LabelBlastMessageIntervalHelp": "ブラスト アライブ メッセージ間の時間を秒単位で指定します。",
+    "LabelBindToLocalNetworkAddressHelp": "追加の設定。http サーバをバインドするローカル IP アドレスを上書きします。空のままにしておくと、サーバは利用可能なすべてのアドレスにバインドします。この値を変更するには、Jellyfin Server を再起動する必要があります。",
+    "LabelAlbumArtMaxWidthHelp": "upnp:albumArtURI で公開するアルバムアートの最大解像度。",
+    "LabelAlbumArtMaxHeightHelp": "upnp:albumArtURI で公開するアルバムアートの最大解像度。",
+    "LabelAlbumArtHelp": "upnp:albumArtURI の dlna:profileID 属性で、アルバムアートに使われるPN。デバイスによっては、画像のサイズと無関係に特定の値を要求するものもあります。",
+    "HeaderSyncPlayEnabled": "SyncPlay を有効にしました",
+    "HeaderSyncPlaySelectGroup": "グループに参加",
+    "HeaderServerAddressSettings": "サーバー アドレス設定",
+    "HeaderRemoteAccessSettings": "リモート接続設定",
+    "HeaderHttpsSettings": "HTTPS 設定",
+    "HeaderFavoritePlaylists": "お気に入りのプレイリスト",
+    "HeaderDVR": "DVR",
+    "ApiKeysCaption": "現在有効にしている API キー一覧",
+    "EnableDetailsBannerHelp": "項目の詳細ページのトップに、バナー画像を表示します。",
+    "EnableDetailsBanner": "詳細画面バナー",
+    "EnableDecodingColorDepth10Vp9": "VP9 の10ビット ハードウェア デコードを有効に",
+    "EnableDecodingColorDepth10Hevc": "HEVC の 10ビット ハードウェア デコードを有効に",
+    "LabelEnableBlastAliveMessagesHelp": "ネットワーク上の他の UPnP デバイスによってサーバーが確実に検出されない場合、この設定を有効にします。",
+    "LabelEnableAutomaticPortMapHelp": "ルーター上のパブリックポートを、UPnP 経由でサーバーのローカルポートに自動的に転送します。これはルータのモデルやネットワーク構成によっては動作しない場合があります。変更はサーバーを再起動するまで適用されません。",
+    "LabelEmbedAlbumArtDidlHelp": "一部のデバイスでは、アルバムアートを取得するためにこの方法が好まれています。その他のデバイスでは、このオプションを有効にしても再生できない場合があります。",
+    "LabelDownMixAudioScaleHelp": "ダウンミックス時にオーディオの音量を増幅します。値が 1 の場合、元の音量を維持します。",
+    "LabelEnableHttps": "HTTPS を有効にする",
+    "LabelEnableDlnaPlayToHelp": "ネットワーク内のデバイスを検出し、それらをリモートコントロールできるようにします。",
+    "LabelEnableDlnaPlayTo": "DLNA 再生を有効にする",
+    "LabelEnableDlnaDebugLoggingHelp": "巨大なログファイルを作成します。トラブルシューティングでの必要な際にだけ使用してください。",
+    "LabelEnableDlnaClientDiscoveryIntervalHelp": "Jellyfin が実行する SSDP 検索の間隔を決めます（秒単位）。",
+    "LabelGroupMoviesIntoCollectionsHelp": "ムービーリストを表示する際、コレクションに属するムービーを1つのグループとして表示します。",
+    "LabelServerNameHelp": "この名前はサーバーを識別するために使用します。デフォルトではサーバーのコンピュータ名です。",
+    "LabelExtractChaptersDuringLibraryScanHelp": "ライブラリー スキャン中に動画を取り込んだときに、チャプター画像を生成します。もしくは、スケジュールタスクの中でチャプター画像を抽出することで、通常のライブラリー スキャンをより速く完了させることができます。",
+    "LabelExtractChaptersDuringLibraryScan": "ライブラリーをスキャンしながら、チャプター画像を生成する",
+    "LabelBaseUrlHelp": "サーバーの URL にカスタム サブディレクトリを加えます。例 : <code>http://example.com/<b>&lt;baseurl&gt;</b></code>",
+    "LabelEnableSingleImageInDidlLimitHelp": "Didl 内に複数の画像が埋め込まれている場合、一部のデバイスでは正しくレンダリングされません。",
+    "LabelEnableRealtimeMonitorHelp": "ファイルへの変更は、サポートされているファイルシステム上ですぐに処理されます。",
+    "LabelEnableHttpsHelp": "構成された HTTPS ポートからサーバーがリッスンするのを有効にします。この機能を有効にするには、適切な証明書を設定する必要があります。",
+    "LabelImageFetchersHelp": "画像検索サイトの優先度を設定します。",
+    "LabelPostProcessorArgumentsHelp": "{path}を録画ファイルのパスとして使用します。",
+    "LabelPostProcessorArguments": "後処理のコマンドライン引数:",
+    "LabelPostProcessor": "後処理を行うアプリケーション:",
+    "LabelPlayMethod": "プレイ方法:",
+    "LabelPleaseRestart": "変更はWebクライアントを手動でリロードした後に適用されます。",
+    "LabelPlayer": "プレイヤー:",
+    "LabelPlayDefaultAudioTrack": "言語に関係なくデフォルトの音声トラックを再生",
+    "LabelPersonRoleHelp": "例: アイスクリームトラックドライバー",
+    "LabelPasswordResetProvider": "パスワードリセットの提供:",
+    "LabelOptionalNetworkPathHelp": "ネットワーク内の共有フォルダの場合,ネットワーク共有のパスが他デバイスのJellyfinアプリからメディアファイルに直接アクセスできるようになります。例えば {0} や {1}です。",
+    "LabelNumberOfGuideDaysHelp": "多くの日数分のガイドデータをダウンロードするとより先のスケジュールとリストを見ることができるようになりますが,ダウンロードに時間がかかるようになります。自動に設定するとチャンネル数を基に選択されます。",
+    "LabelNumberOfGuideDays": "ガイドデータをダウンロードする日数:",
+    "LabelNewsCategories": "ニュースのカテゴリ:",
+    "LabelNightly": "最新・不安定版",
+    "LabelStable": "安定版",
+    "LabelChromecastVersion": "Chromecastバージョン",
+    "LabelMusicStreamingTranscodingBitrateHelp": "音楽ストリーミングの最大ビットレートを指定します。",
+    "LabelMoviePrefixHelp": "映画のタイトルに接頭辞が適用されている場合,ここに記入することでサーバが適切に扱える可能性があります。",
+    "LabelMinScreenshotDownloadWidth": "ダウンロードするスクリーンショットの最小幅:",
+    "LabelMinResumePercentageHelp": "この割合の時間よりも前に再生を停止した場合,そのアイテムは未再生とみなします。",
+    "LabelMinResumePercentage": "レジューム再生する時間の最小パーセンテージ:",
+    "LabelMinResumeDurationHelp": "動画で再生している場所を記録してレジュームできるようにする,最短の時間です。",
+    "LabelMinResumeDuration": "レジューム再生する最小時間:",
+    "LabelMinBackdropDownloadWidth": "ダウンロードする背景の最小幅:",
+    "LabelMetadataSaversHelp": "メタデータを保存するファイルのフォーマットを選択します。",
+    "LabelMetadataReadersHelp": "ローカルメタデータ取得先の優先度を並び替えます。最初に見つかったファイルが読み込まれます。",
+    "LabelMetadataDownloadersHelp": "優先度順にオンラインメタデータ取得先を並び替えます。低い優先度のメタデータ取得先は,欠落した情報を補うためのみに使われるようになります。",
+    "LabelMetadataPathHelp": "ダウンロードされたアートワークとメタデータの保存先を自分で指定します。",
+    "LabelMaxStreamingBitrateHelp": "ストリーミングの際の最大ビットレートを指定します。",
+    "LabelMaxScreenshotsPerItem": "アイテムごとのスクリーンショットの最大数:",
+    "LabelMaxResumePercentageHelp": "この割合の時間よりも後に再生を停止した場合,そのアイテムは最後まで視聴されたものとみなします。",
+    "LabelMaxResumePercentage": "レジューム再生する時間の最大パーセンテージ:",
+    "LabelMaxBackdropsPerItem": "アイテムごとの背景の最大数:",
+    "LabelLoginDisclaimerHelp": "ログインページの下部に表示されるメッセージです。",
+    "LabelLockItemToPreventChanges": "今後の変更を抑止するためにこのアイテムをロックします",
+    "LabelLibraryPageSizeHelp": "ライブラリのページに表示するアイテムの数を指定します。0を指定するとページングを無効にします。",
+    "LabelLibraryPageSize": "ライブラリページの表示数:",
+    "LabelKodiMetadataUserHelp": "他のアプリで利用するために,視聴データをNFOファイルに保存します。",
+    "LabelKodiMetadataUser": "ユーザー視聴データをNFOファイルに保存:",
+    "LabelKodiMetadataSaveImagePathsHelp": "これは,Kodiのガイドラインに適応していないファイル名の画像を所持している場合に推奨されます。",
+    "LabelKodiMetadataEnableExtraThumbsHelp": "Kodiのスキンとの互換性を最大にするために,画像をダウンロードしたときに追加ファンアートと追加サムネイルの両方に保存します。",
+    "LabelKodiMetadataEnableExtraThumbs": "追加ファンアートを追加サムネイルのフィールドにコピー",
+    "LabelKodiMetadataDateFormatHelp": "NFOファイル内の全データが,このフォーマットによって解析されます。",
+    "LabelKeepUpTo": "最新:",
+    "LabelInNetworkSignInWithEasyPasswordHelp": "ローカルネットワーク内では簡単なPINコードを利用してサインインするようにします。ローカル以外からのアクセスのときのみ通常のパスワードが必要になります。PINコードを空欄にした場合,ローカルネットワーク内からのアクセスではパスワードが不要になります。",
+    "LabelInNetworkSignInWithEasyPassword": "簡単なPINコードを利用してネットワーク内からサインインする機能の有効化"
 }
diff --git a/src/strings/kk.json b/src/strings/kk.json
index f32fe9d9ec..5532af90f5 100644
--- a/src/strings/kk.json
+++ b/src/strings/kk.json
@@ -15,7 +15,7 @@
     "Alerts": "Eskertýler",
     "All": "Bári",
     "AllChannels": "Barlyq arnalar",
-    "AllComplexFormats": "Barlyq kúrdeli pishimder (ASS, SSA, VOBSUB, PGS, SUB jáne IDX)",
+    "AllComplexFormats": "Barlyq kúrdeli pishimder (ASS, SSA, VOBSUB, PGS, SUB, IDX j.t.b.)",
     "AllEpisodes": "Barlyq bólimder",
     "AllLanguages": "Barlyq tilder",
     "AllLibraries": "Barlyq tasyǵyshhanalar",
@@ -23,7 +23,7 @@
     "AllowMediaConversion": "Tasyǵyshderekterdi túrlendirýge ruqsat etý",
     "AllowMediaConversionHelp": "Tasyǵyshderekterdi túrlendirý ereksheligine qatynaý úshin jol berý nemese tıym salý.",
     "AllowOnTheFlySubtitleExtraction": "Naqty ýaqytta sýbtıtrlerdi shyǵarýǵa ruqsat etý",
-    "AllowOnTheFlySubtitleExtractionHelp": "Beıne qaıta kodtaýyna tıym salýǵa kómektesý úshin endirilgen sýbtıtrler beıneden shyǵarylyp, klıentterge kádimgi mátinben jetkizilý múmkin. Keıbir júıelerde buǵan uzaq ýaqyt ketýi jáne shyǵarý úrdisi barysynda beıne oınatý toqtatylýy múmkin. Tutynǵysh qurylǵyda olarǵa qoldaý kórsetilmegen kezde, beıne qaıta kodtalý arqyly endirilgen sýbtıtrler jazylýy úshin ony óshirińiz.",
+    "AllowOnTheFlySubtitleExtractionHelp": "Beıne qaıta kodtaýyna tıym salýǵa kómektesý úshin, endirilgen sýbtıtrler beıneden shyǵarylyp, klıentterge kádimgi mátinben jetkizilý múmkin. Keıbir júıelerde buǵan uzaq ýaqyt ketýi jáne shyǵarý úrdisi barysynda beıne oınatý toqtatylýy múmkin. Tutynǵysh qurylǵyda olarǵa qoldaý kórsetilmegen kezde, beıne qaıta kodtalý arqyly endirilgen sýbtıtrler jazylýy úshin ony óshirińiz.",
     "AllowRemoteAccess": "Osy Jellyfin Serverine syrtqy qosylymdar úshin ruqsat etý.",
     "AllowRemoteAccessHelp": "Eger jalaýsha alastalǵan bolsa, baryq syrtqy baılanystar qursaýlanady.",
     "AllowedRemoteAddressesHelp": "Qashyqtan qosylýǵa ruqsat etiletin jeliler úshin útirlermen bólingen IP-mekenjaılarynyń tizbesi nemese IP/netmask jazbalar  Eger bos qaldyrylsa, barlyq qashyqtaǵy mekenjaılarǵa ruqsat etiledi.",
@@ -32,7 +32,7 @@
     "AnamorphicVideoNotSupported": "Anamorftyq beıne úshin qoldaý kórsetilmeıdi",
     "AnyLanguage": "Qaı-qaısy til",
     "Anytime": "Árkezde",
-    "AroundTime": "{0} aınalasynda",
+    "AroundTime": "Shamamen",
     "Art": "Oıý sýret",
     "Artists": "Oryndaýshylar",
     "AsManyAsPossible": "Múmkindiginshe kóp",
@@ -49,13 +49,13 @@
     "BirthLocation": "Týǵan orny",
     "BirthPlaceValue": "Týǵan orny: {0}",
     "Blacklist": "Qara tizim",
-    "BookLibraryHelp": "Dybystyq jáne mátindik kitaptar qoldaýda. {0}Kitapty ataý nusqaýlyǵyn{1} qarap shyǵý.",
+    "BookLibraryHelp": "Dybystyq jáne mátindik kitaptar qoldaýda. {0} Kitapty ataý nusqaýlyǵyn {1} qarap shyǵý.",
     "Books": "Kitaptar",
     "Box": "Qorap",
     "BoxRear": "Qorap arty",
     "Browse": "Sharlaý",
     "BrowsePluginCatalogMessage": "Qoljetimdi plagındermen tanysý úshin plagın tizimdemesin sholyńyz.",
-    "BurnSubtitlesHelp": "Beıneni qaıta kodtaǵan kezde server sýbtıtrlerdi jazyýyn anyqtaıdy. Onan qashqaqtaý serverdiń ónimdiligin biraz jaqsartady. Sýretke negizdelgen pishimderdi (VOBSUB, PGS, SUB jáne IDX) jáne keıbir ASS nemese SSA sýbtıtrlerin jazý úshin Avtomattyny tańdańyz.",
+    "BurnSubtitlesHelp": "Beıneni qaıta kodtaǵan kezde server sýbtıtrlerdi jazyýyn anyqtaıdy. Onan qashqaqtaý serverdiń ónimdiligin biraz jaqsartady. Sýretke negizdelgen pishimderdi (VOBSUB, PGS, SUB, IDX, j.t.b.) jáne keıbir ASS nemese SSA sýbtıtrlerin jazý úshin Avtomattyny tańdańyz.",
     "ButtonAdd": "Ústeý",
     "ButtonAddMediaLibrary": "Tasyǵyshhana ústeý",
     "ButtonAddScheduledTaskTrigger": "Trıger ústeý",
@@ -599,7 +599,7 @@
     "LabelEmbedAlbumArtDidl": "DIDL ishine álbom sýretin endirý",
     "LabelEmbedAlbumArtDidlHelp": "Álbom sýretin alý úshin keıbir qurylǵylar osy ádisti qalaıdy. Basqalar úshin, osy opsıa qosylǵanda, oınatý sátsiz bolýy múmkin.",
     "LabelEnableAutomaticPortMap": "Avtomatty port salǵastyrýyn qosý",
-    "LabelEnableAutomaticPortMapHelp": "Jarıa portty jergilikti portqa UPnP arqyly avtomatty salǵastyrý áreketi. Bul keıbir jol josparlaǵysh ulgilerimen jumys istemeıtini múmkin. Ózgerister server qaıta iske qosylǵansha deıin qoldanylmaıdy.",
+    "LabelEnableAutomaticPortMapHelp": "Jol josparlaǵysh jarıa portyn server jergilikti portyna UPnP arqyly avtomatty qaıta jiberý. Bul keıbir jol josparlaǵysh ulgilerimen ne jeli ishqyrylymdarymen jumys istemeıtini múmkin. Ózgerister server qaıta iske qosylǵansha deıin qoldanylmaıdy.",
     "LabelEnableBlastAliveMessages": "Belsendilikti tekserý habarlaryn jaýdyrý",
     "LabelEnableBlastAliveMessagesHelp": "Eger jelidegi basqa UPnP qurylǵylarymen server nyq tabylmasa buny qosyńyz.",
     "LabelEnableDlnaClientDiscoveryInterval": "Klıentterdi taýyp ashý aralyǵy, s",
@@ -722,7 +722,7 @@
     "LabelNumberOfGuideDays": "Júktep alý úshin Telegıd derekterindegi kún sany:",
     "LabelNumberOfGuideDaysHelp": "Kóbirek kúndi júktep alý Telegıd derekteriniń qundylyǵyn kóteredi de aldyn-ala josparlaý úshin qabiletin jáne kóbirek tizbeler kórýdi qamtamasyz etedi, biraq bul júkteý ýaqytyn da sozdyrady. Avtomatty tańdaý arna sanyna negizdelinedi.",
     "LabelOptionalNetworkPath": "(Mindetti emes) Ortaqtastyrylǵan jelilik qalta:",
-    "LabelOptionalNetworkPathHelp": "Eger osy qalta óz jelińizde ortaqtastyrylsa, jelide ortaqtastyrylǵan joldy qamtamasyz etý basqa qurylǵylardaǵy Jellyfin-baǵdarlamalarǵa tasyǵysh faıldaryna tikeleı qol jetkizýge múmkindik beredi.",
+    "LabelOptionalNetworkPathHelp": "Eger osy qalta óz jelińizde ortaqtastyrylsa, jelide ortaqtastyrylǵan joldy qamtamasyz etý basqa qurylǵylardaǵy Jellyfin-baǵdarlamalarǵa tasyǵysh faıldaryna tikeleı qol jetkizýge múmkindik beredi. Mysaly, {0} nemese {1}.",
     "LabelOriginalAspectRatio": "Bastapqy pishimdik araqatynasy:",
     "LabelOriginalTitle": "Bastapqy ataýy:",
     "LabelOverview": "Jalpy sholý:",
@@ -1089,7 +1089,7 @@
     "OptionMissingEpisode": "Joq bólimder",
     "OptionMonday": "dúısenbi",
     "OptionNameSort": "Aty",
-    "OptionNew": "Jańa...",
+    "OptionNew": "Jańa…",
     "OptionNone": "Eshqandaı",
     "OptionOnAppStartup": "Qoldanba iske qosylǵanda",
     "OptionOnInterval": "Aralyqta",
@@ -1205,7 +1205,6 @@
     "ReplaceAllMetadata": "Barlyq metaderekterdi aýystyrý",
     "ReplaceExistingImages": "Bar sýretterdi aýystyrý",
     "RequiredForAllRemoteConnections": "Barlyq qashyqtaǵy qosylymdar úshin qajet",
-    "RestartPleaseWaitMessage": "Jellyfin Server jumysy aıaqtalyp, qaıta iske qosylǵansha deıin kúte turyńyz. Bul bir-eki mınótqa sozylýy múmkin.",
     "ResumeAt": "{0} bastap jalǵastyrý",
     "Rewind": "Shegindirý",
     "RunAtStartup": "Iske qosylýdan bastap oryndaý",
@@ -1411,7 +1410,6 @@
     "HeaderFavoriteSongs": "Tańdaýly áýender",
     "HeaderFavoriteVideos": "Tandaýly beıneler",
     "HeaderHome": "Basqy",
-    "HeaderRestartingServer": "Serverdi qaıta iske qosý",
     "LabelAuthProvider": "Túpnusqalyq rastamasyn jetkizýshi:",
     "LabelPasswordResetProvider": "Paróldi ysyrý jetkizýshisi:",
     "LabelServerName": "Server aty:",
@@ -1453,7 +1451,7 @@
     "SubtitleOffset": "Sýbtıtrler yǵysýy",
     "TabNetworking": "Jelilik jumys",
     "HeaderFavoriteBooks": "Tańdaýly kitaptar",
-    "LabelBaseUrlHelp": "Serverge neǵurlym erekshe URL mekenjaıynan kirý úshin osynda jeke ishki katalogty qosýǵa bolady.",
+    "LabelBaseUrlHelp": "Serverdiń URL-mekenjaıyna jeke ishki katalogty qosady. Mysaly: <code>http://example.com/<b>&lt;baseurl&gt;</b></code>",
     "MoreMediaInfo": "Tasyǵyshderekter týraly",
     "LabelVideoCodec": "Beınelik kodek:",
     "LabelVideoBitrate": "Beıne qarqyny:",
@@ -1484,8 +1482,6 @@
     "MessageConfirmAppExit": "Shyǵýdy qalaısyz ba?",
     "LabelVideoResolution": "Beıne ajyratymdylyǵy:",
     "LabelStreamType": "Aǵyn túri:",
-    "EnableFastImageFadeInHelp": "Júktelgen sýretter úshin shapshan kórsetilýin qosý",
-    "EnableFastImageFadeIn": "Sýrettiń shapshan kórsetilýi",
     "LabelPlayerDimensions": "Oınatqysh ólshemderi:",
     "LabelDroppedFrames": "Ótkizilgen kadrlar:",
     "LabelCorruptedFrames": "Búlingen kadrlar:",
@@ -1524,5 +1520,29 @@
     "ButtonToggleContextMenu": "Kúbirek",
     "BoxSet": "Jıyntyq",
     "Artist": "Ornatýshy",
-    "AlbumArtist": "Álbom ornatýshysy"
+    "AlbumArtist": "Álbom ornatýshysy",
+    "MessageSyncPlayDisabled": "SyncPlay óshirýli.",
+    "MessageSyncPlayEnabled": "SyncPlay qosýly.",
+    "LabelSyncPlayAccess": "SyncPlay qatynasy",
+    "LabelSyncPlayLeaveGroupDescription": "SyncPlay óshirý",
+    "LabelSyncPlayLeaveGroup": "Toptan shyǵý",
+    "LabelSyncPlayNewGroupDescription": "Jańa topty jasaý",
+    "LabelSyncPlayNewGroup": "Jańa top",
+    "LabelSyncPlaySyncMethod": "Úndestirý ádisi:",
+    "LabelSyncPlayPlaybackDiff": "Oınatý ýaqytynyń aıyrmashylyǵy:",
+    "MillisecondsUnit": "ms",
+    "LabelSyncPlayTimeOffset": "Server ýaqtynan aýytqýy:",
+    "LabelRequireHttps": "HTTPS qajet etedi",
+    "LabelNightly": "Túngi",
+    "LabelStable": "Turaqty",
+    "LabelChromecastVersion": "Chromecast nusqasy",
+    "LabelEnableHttps": "HTTPS qosý",
+    "HeaderSyncPlayEnabled": "SyncPlay qosýly",
+    "HeaderSyncPlaySelectGroup": "Topty qosý",
+    "HeaderServerAddressSettings": "Server mekenjaıy parametrleri",
+    "HeaderRemoteAccessSettings": "Qashyqtan qatynaý parametrleri",
+    "HeaderHttpsSettings": "HTTPS parametrleri",
+    "HeaderFavoritePlaylists": "Tańdaýly oınatý tizimder",
+    "HeaderDVR": "DVR",
+    "ButtonSyncPlay": "SyncPlay"
 }
diff --git a/src/strings/ko.json b/src/strings/ko.json
index 33c44334ae..660b3d34a0 100644
--- a/src/strings/ko.json
+++ b/src/strings/ko.json
@@ -810,7 +810,7 @@
     "AirDate": "방영 일자",
     "Aired": "방영됨",
     "Alerts": "알림",
-    "AllComplexFormats": "모든 복잡한 포맷 (ASS, SSA, VOBSUB, PGS, SUB, IDX)",
+    "AllComplexFormats": "모든 복잡한 포맷 (ASS, SSA, VOBSUB, PGS, SUB, IDX,...)",
     "AllLibraries": "모든 라이브러리",
     "AllowMediaConversion": "미디어 변환 허용",
     "AllowOnTheFlySubtitleExtraction": "실시간 자막 추출 허용",
@@ -821,7 +821,7 @@
     "AlwaysPlaySubtitles": "항상 표시",
     "AlwaysPlaySubtitlesHelp": "오디오 언어를 불문하고 언어 설정에 적합한 자막을 불러옵니다.",
     "AnyLanguage": "모든 언어",
-    "AroundTime": "대략 {0}",
+    "AroundTime": "대략",
     "Art": "아트",
     "AsManyAsPossible": "최대한 많이",
     "Ascending": "오름차순",
@@ -1093,7 +1093,6 @@
     "HeaderTuners": "튜너",
     "HeaderStopRecording": "녹화 중지",
     "HeaderStartNow": "지금 시작",
-    "HeaderRestartingServer": "서버 재시작",
     "HeaderPhotoAlbums": "사진 앨범",
     "HeaderNewDevices": "새 장치",
     "HeaderMyDevice": "내 장치",
@@ -1267,7 +1266,6 @@
     "RefreshQueued": "새로 고침 대기 중",
     "NoPluginConfigurationMessage": "이 플러그인은 설정할 것이 없습니다.",
     "OptionExtractChapterImage": "챕터 이미지 추출 활성화",
-    "RestartPleaseWaitMessage": "Jellyfin 서버가 종료되었다가 다시 시작될 때까지 기다리십시오. 1-2분 정도 걸릴 수 있습니다.",
     "Up": "위",
     "EasyPasswordHelp": "쉬운 핀 코드는 지원되는 기기에서 오프라인 접근을 할 때나 내부 내트워크 로그인에서 사용됩니다.",
     "CriticRating": "평점",
@@ -1343,8 +1341,6 @@
     "LabelSkipIfAudioTrackPresentHelp": "오디오 언어와 상관없이 모든 비디오가 자막을 갖추도록 하려면 이 항목을 체크하지 마십시오.",
     "LabelSelectFolderGroupsHelp": "체크되지 않은 폴더는 폴더 고유의 보기 방식으로 표시됩니다.",
     "LabelSelectFolderGroups": "자동으로 이하의 폴더의 항목을 영화, 음악, TV 와 같은 보기 방식으로 그룹화:",
-    "EnableFastImageFadeInHelp": "로드된 이미지에 더 빠른 페이드 인 효과를 적용",
-    "EnableFastImageFadeIn": "빠른 이미지 페이드 인 효과",
     "LabelScheduledTaskLastRan": "최근 실행: {0}, 소모시간: {1}.",
     "LabelRemoteClientBitrateLimitHelp": "(선택) 모든 외부 네트워크로 접속된 장치들에 적용되는 각 스트리밍별 비트레이트 제한입니다. 이는 서버의 인터넷이 처리할 수 있는 한계보다 더 높은 비트레이트를 요청하는 것을 방지할 수 있습니다. 비디오를 더 낮은 비트레이트로 트랜스코딩하기 위해 서버에 높은 CPU 부하를 줄 수 있습니다.",
     "LabelReasonForTranscoding": "트랜스코딩 원인:",
@@ -1433,5 +1429,9 @@
     "ButtonToggleContextMenu": "더보기",
     "Rate": "평",
     "PerfectMatch": "정확히 일치",
-    "OtherArtist": "다른 아티스트"
+    "OtherArtist": "다른 아티스트",
+    "ButtonSyncPlay": "SyncPlay",
+    "HeaderDVR": "DVR",
+    "EnableDecodingColorDepth10Vp9": "10비트 VP9하드웨어 디코딩 사용합니다",
+    "EnableDecodingColorDepth10Hevc": "10비트 HEVC하드웨어 디코딩 사용합니다"
 }
diff --git a/src/strings/lt-lt.json b/src/strings/lt-lt.json
index 942861f469..c8c2b6e448 100644
--- a/src/strings/lt-lt.json
+++ b/src/strings/lt-lt.json
@@ -780,7 +780,6 @@
     "LabelAllowHWTranscoding": "Leisti naudoti aparatinę įrangą perkodavimui",
     "LabelAllowedRemoteAddresses": "Nuotolinis IP adresų filtras:",
     "LabelAllowedRemoteAddressesMode": "Nuotolinio IP adresų filtro režimas:",
-    "HeaderRestartingServer": "Serveris perkraunamas",
     "HeaderLoginFailure": "Prisijungimo klaida",
     "Hide": "Paslėpti",
     "LabelAll": "Visi",
@@ -1015,5 +1014,6 @@
     "ButtonToggleContextMenu": "Daugiau",
     "ButtonSplit": "Skirstyti",
     "AskAdminToCreateLibrary": "Prašyti administratoriaus, kad sukurtų mediateka.",
-    "Album": "Albumas"
+    "Album": "Albumas",
+    "ButtonSyncPlay": "SyncPlay"
 }
diff --git a/src/strings/lv.json b/src/strings/lv.json
index 6c10863333..18346bbda0 100644
--- a/src/strings/lv.json
+++ b/src/strings/lv.json
@@ -266,7 +266,6 @@
     "HeaderSeasons": "Sezonas",
     "HeaderSchedule": "Grafiks",
     "HeaderRevisionHistory": "Revīziju Vēsture",
-    "HeaderRestartingServer": "Restartē Serveri",
     "HeaderRestart": "Restartēt",
     "HeaderRemoveMediaLocation": "Noņemt Multvides Atrašanās Vietu",
     "HeaderRemoveMediaFolder": "Noņemt Multvides Mapi",
@@ -603,14 +602,14 @@
     "AsManyAsPossible": "Cik vien iespējams",
     "Artists": "Izpildītāji",
     "Art": "Māksla",
-    "AroundTime": "Ap {0}",
+    "AroundTime": "Ap",
     "Anytime": "Jebkad",
     "AnyLanguage": "Jebkura Valoda",
     "AlwaysPlaySubtitles": "Vienmēr Rādīt",
     "AllowedRemoteAddressesHelp": "Ar komatiem atdalīts IP adrešu vai IP/tīkla masku saraksts, kas norāda uz tīkliem, kas var pieslēgties attālināti. Ja atstāts tukšs, visas attālinātās adreses tiks atļautas.",
     "AllowRemoteAccessHelp": "Ja atķeksēts, visi attālinātie savienojumi tiks bloķēti.",
     "AllowRemoteAccess": "Atļaut attālinātus savienojumus šim Jellyfin Serverim.",
-    "AllowOnTheFlySubtitleExtraction": " ",
+    "AllowOnTheFlySubtitleExtraction": "Atļaut subtitru izvilkšanu atskaņošanas laikā",
     "AllowMediaConversion": "Atļaut multimēdiju pārveidošanu",
     "AllLibraries": "Visas bibliotēkas",
     "AllLanguages": "Visas valodas",
@@ -1232,7 +1231,7 @@
     "MessageUnauthorizedUser": "Jūs neesat autorizēti lai piekļūtu serverim šajā brīdī. Lūdzu sazinieties ar savu servera administratoru priekš papildus informācijas.",
     "MessageInstallPluginFromApp": "Šis paplašinājums ir jāuzstāda no lietotnes, kurā jūs to vēlaties izmantot.",
     "LabelEmbedAlbumArtDidl": "Ievietot albumu vākus iekš Didl",
-    "EnableFastImageFadeIn": "Ātra attēlu ieplūšana",
-    "EnableFastImageFadeInHelp": "Iespējot ātrāku ieplūšanas animāciju priekš ielādētiem attēliem",
-    "LabelSelectFolderGroups": "Automātiski grupēt saturu no sekojošām datnēm skatos kā Filmas, Mūzika un TV:"
+    "LabelSelectFolderGroups": "Automātiski grupēt saturu no sekojošām datnēm skatos kā Filmas, Mūzika un TV:",
+    "AllowFfmpegThrottlingHelp": "Kad trans-kodējums vai remux tiek pietiekami tālu priekšā pašreizējai atskaņošanas vietai, process tiks pauzēts lai patērētu mazāk resursu. Tas ir noderīgākais skatoties bez biežas pārlēkšanas. Atspējo šo ja saskaries ar atskaņošanas problēmām.",
+    "ButtonSyncPlay": "SyncPlay"
 }
diff --git a/src/strings/mr.json b/src/strings/mr.json
index 381c609a9e..37cbc403de 100644
--- a/src/strings/mr.json
+++ b/src/strings/mr.json
@@ -97,5 +97,7 @@
     "ButtonRemove": "काढून टाका",
     "ButtonPreviousTrack": "मागचा ट्रॅक",
     "ButtonPlay": "प्ले",
-    "ButtonPause": "पॉझ"
+    "ButtonPause": "पॉझ",
+    "ButtonSyncPlay": "SyncPlay",
+    "Collections": "संग्रह"
 }
diff --git a/src/strings/ms.json b/src/strings/ms.json
index c377e52af1..d5f9259c21 100644
--- a/src/strings/ms.json
+++ b/src/strings/ms.json
@@ -102,5 +102,17 @@
     "HeaderContinueWatching": "Terus Menonton",
     "Genres": "Genre-genre",
     "Collections": "Koleksi",
-    "Channels": "Saluran"
+    "Channels": "Saluran",
+    "ButtonSyncPlay": "SyncPlay",
+    "Movies": "Filem",
+    "HeaderNextUp": "Seterusnya",
+    "HeaderLiveTV": "TV Siaran Langsung",
+    "HeaderFavoriteSongs": "Lagu-lagu Kegemaran",
+    "HeaderFavoriteShows": "Rancangan-rancangan Kegemaran",
+    "HeaderFavoriteEpisodes": "Episod-episod Kegemaran",
+    "HeaderFavoriteArtists": "Artis-artis Kegemaran",
+    "HeaderFavoriteAlbums": "Album-album Kegemaran",
+    "HeaderAlbumArtists": "Album Artis-artis",
+    "Folders": "Fail-fail",
+    "Favorites": "Kegemaran"
 }
diff --git a/src/strings/nb.json b/src/strings/nb.json
index 0a616ae2e1..d729b0c025 100644
--- a/src/strings/nb.json
+++ b/src/strings/nb.json
@@ -21,7 +21,7 @@
     "AllowRemoteAccess": "Tillat eksterne tilkoblinger til denne Jellyfin-serveren.",
     "AllowRemoteAccessHelp": "Alle tilkoblinger via nettverk vil blokkeres dersom du ikke aktiverer denne innstillingen.",
     "Anytime": "Når som helst",
-    "AroundTime": "Rundt {0}",
+    "AroundTime": "Rundt",
     "Artists": "Artister",
     "AsManyAsPossible": "Så mange som mulig",
     "AspectRatio": "Størrelsesforhold",
@@ -31,7 +31,7 @@
     "BirthDateValue": "Født: {0}",
     "BirthLocation": "Fødested",
     "BirthPlaceValue": "Fødested: {0}",
-    "BookLibraryHelp": "Lyd- og tekstbøker støttes. Se igjennom {0}navneguiden for bøker{1}.",
+    "BookLibraryHelp": "Lyd- og tekstbøker støttes. Se igjennom {0} navneguiden for bøker {1}.",
     "Books": "Bøker",
     "BrowsePluginCatalogMessage": "Bla i tilleggskatalogen vår for å se tilgjengelige applikasjonstillegg.",
     "ButtonAdd": "Legg til",
@@ -457,7 +457,7 @@
     "LabelEmbedAlbumArtDidl": "Bygg inn albumbilder i DIDL",
     "LabelEmbedAlbumArtDidlHelp": "Noen enheter foretrekker denne metoden for å motta albumomslag. Andre vil kunne få problemer med avspilling hvis dette alternativet er aktivert.",
     "LabelEnableAutomaticPortMap": "Aktiver automatisk portmapping",
-    "LabelEnableAutomaticPortMapHelp": "Forsøk å automatisk koble den eksterne porten til den lokale porten via UPnP. Dette fungerer ikke med alle rutere. Endringer trer ikke kraft før serveren startes på nytt.",
+    "LabelEnableAutomaticPortMapHelp": "Automatisk koble eksterne porter på ruteren til lokale porter på serveren din via UPnP. Dette fungerer ikke med alle rutere eller nettverkskonfigurasjoner. Endringer trer ikke kraft før serveren startes på nytt.",
     "LabelEnableBlastAliveMessages": "Kringkast keepalive-meldinger",
     "LabelEnableBlastAliveMessagesHelp": "Aktiver hvis serveren ikke blir konsekvent oppdaget av andre UPnP-enheter på nettverket ditt.",
     "LabelEnableDlnaClientDiscoveryInterval": "Oppdateringsintervall for klient (i sekunder)",
@@ -566,7 +566,7 @@
     "LabelNumberOfGuideDays": "Antall dager med TV-guidedata som skal lastes ned:",
     "LabelNumberOfGuideDaysHelp": "Nedlasting av TV-guide for flere dager gir muligheten for å planlegge lenger i forveien og for å se flere listinger, men vil også føre til at nedlastningen tar lenger tid. Auto vil velge basert på antall kanaler.",
     "LabelOptionalNetworkPath": "(Valgfritt) Delt nettverksmappe:",
-    "LabelOptionalNetworkPathHelp": "Hvis denne mappen er delt på nettverket, vil Jellyfin-apper på andre enheter kunne få tilgang til mediefilene direkte dersom du spesifiserer nettverksbanen her.",
+    "LabelOptionalNetworkPathHelp": "Hvis denne mappen er delt på nettverket, vil Jellyfin-apper på andre enheter kunne få tilgang til mediefilene direkte dersom du spesifiserer nettverksbanen her. For eksempel, {0} eller {1}.",
     "LabelOriginalAspectRatio": "Originalt sideforhold:",
     "LabelOriginalTitle": "Original tittel:",
     "LabelOverview": "Oversikt:",
@@ -729,7 +729,7 @@
     "MessageNoAvailablePlugins": "Ingen tilgjengelige programtillegg.",
     "MessageNoMovieSuggestionsAvailable": "Ingen filmforslag er tilgjengelige enda. Begynn å se og vurdere filmer, og kom tilbake hit etterpå for se anbefalingene dine.",
     "MessageNoPluginsInstalled": "Du har ingen programtillegg installert.",
-    "MessageNoTrailersFound": "Ingen trailere funnet. Installer trailer-tilleggskanalen for å forbedre filmopplevelsen ved å legge til et bibliotek med trailere fra Internett.",
+    "MessageNoTrailersFound": "Installer trailer-tilleggskanalen for å forbedre filmopplevelsen ved å legge til et bibliotek med trailere fra Internett.",
     "MessageNothingHere": "Ingenting her.",
     "MessagePasswordResetForUsers": "Følgende brukere har fått passordet sitt tilbakestilt. De kan nå logge inn med PIN-kodene som ble brukt til å utføre tilbakestillingen.",
     "MessagePlayAccessRestricted": "Avspilling av dette innholdet er for tiden begrenset. Ta kontakt med serverens administrator for mer informasjon.",
@@ -850,7 +850,7 @@
     "OptionMissingEpisode": "Manglende episoder",
     "OptionMonday": "Mandag",
     "OptionNameSort": "Navn",
-    "OptionNew": "Ny...",
+    "OptionNew": "Ny…",
     "OptionNone": "Ingen",
     "OptionOnAppStartup": "Ved applikasjonsoppstart",
     "OptionOnInterval": "Per intervall",
@@ -891,9 +891,9 @@
     "OptionWeekly": "Ukentlig",
     "OriginalAirDateValue": "Original utgivelsedato: {0}",
     "Overview": "Oversikt",
-    "PackageInstallCancelled": "{0}-installasjon avbrutt.",
-    "PackageInstallCompleted": "{0}-installering fullført.",
-    "PackageInstallFailed": "{0}-installasjon feilet.",
+    "PackageInstallCancelled": "Installasjon av {0} (versjon {1}) avbrutt.",
+    "PackageInstallCompleted": "Installasjon av {0} (versjon {1}) fullført.",
+    "PackageInstallFailed": "Installasjon av {0} (versjon {1}) feilet.",
     "ParentalRating": "Aldersgrense",
     "PasswordMatchError": "Passord og passordbekreftelsen må matche.",
     "PasswordResetComplete": "Passordet har blitt tilbakestilt.",
@@ -1124,14 +1124,14 @@
     "Art": "Omslagsbilde",
     "AnyLanguage": "Hvilket som helst språk",
     "AlwaysPlaySubtitlesHelp": "Undertekster som matcher foretrukket språk vil bli tatt i bruk uansett språk på lydspor.",
-    "AlwaysPlaySubtitles": "Bruk alltid undertekster",
+    "AlwaysPlaySubtitles": "Bruk alltid",
     "AllowedRemoteAddressesHelp": "Kommaseparert liste over IP-addresser eller IP/nettverksmaske for nettverk som er godkjent for eksterne tilkoblinger. Dersom feltet står tomt er alle adresser tillatt.",
     "AllowOnTheFlySubtitleExtractionHelp": "Integrerte undertekster kan hentes ut fra videoer og bli levert til klienter i klartekst for å unngå omkoding av video. På noen systemer kan dette ta lang tid og føre til opphold i avspillingen samtidig som prosessen pågår. Deaktiver innstillingen for å brenne inn underteksten i videoen ved hjelp av omkoding når undertekstformatet ikke er støttet av klienten.",
     "AllowOnTheFlySubtitleExtraction": "Tillat at undertekster hentes ut fortløpende",
     "AllLanguages": "Alle språk",
-    "AllComplexFormats": "Alle avanserte formater (ASS, SSA, VOBSUB, PGS, SUB, IDX)",
+    "AllComplexFormats": "Alle avanserte formater (ASS, SSA, VOBSUB, PGS, SUB, IDX, ...)",
     "AccessRestrictedTryAgainLater": "Tilgang er for øyeblikket begrenset. Vennligst prøv igjen senere.",
-    "BurnSubtitlesHelp": "Angir om serveren skal brenne inn teksting når videoer konverteres, basert på tekstformatet. Ytelsen på serveren vil forbedres dersom tekstingen ikke brennes inn. Velg Automatisk for å brenne inn bildebaserte formater (VOBSUB, PGS, SUB, IDX) og enkelte ASS eller SSA-undertekster.",
+    "BurnSubtitlesHelp": "Angir om serveren skal brenne inn teksting når videoer konverteres, basert på tekstformatet. Ytelsen på serveren vil forbedres dersom tekstingen ikke brennes inn. Velg Automatisk for å brenne inn bildebaserte formater (VOBSUB, PGS, SUB, IDX, ...) og enkelte ASS eller SSA-undertekster.",
     "General": "Generelt",
     "ChangingMetadataImageSettingsNewContent": "Endringer gjort i innstillinger for metadata eller omslagsbilder vil kun gjelde nytt innhold i biblioteket ditt. For å endre eksisterende innhold, må du oppdatere dets metadata manuelt.",
     "DefaultSubtitlesHelp": "Undertekster lastes inn basert på flaggene \"standard\" og \"tvungen\" i videoens integrerte metadata. Språkpreferanser tas høyde for dersom flere valg er tilgjengelig.",
@@ -1226,7 +1226,6 @@
     "HeaderKodiMetadataHelp": "For å aktivere eller deaktivere NFO-metadata, gå til bibliotekoppsettet i Jellyfin og finn valgene for lagring av metadata.",
     "OptionArtist": "Artist",
     "HeaderPhotoAlbums": "Fotoalbum",
-    "HeaderRestartingServer": "Serveren starter på nytt",
     "HeaderSecondsValue": "{0} sekunder",
     "LabelAllowedRemoteAddresses": "Filter for eksterne IP-adresser:",
     "LabelAllowedRemoteAddressesMode": "Modus for filter for eksterne IP-adresser:",
@@ -1261,7 +1260,7 @@
     "LaunchWebAppOnStartupHelp": "Åpne web-klienten i din standard nettleser når serveren starter opp. Dette vil ikke skje ved omstart av serveren.",
     "LearnHowYouCanContribute": "Finn ut hvordan du kan bidra.",
     "SeriesYearToPresent": "{0} - Nå",
-    "LabelBaseUrlHelp": "Du kan legge til din egen undermappe her for å få tilgang til serveren fra en mer unik URL.",
+    "LabelBaseUrlHelp": "Legger til en egendefinert undermappe til serverens nettadresse. For eksempel: <code>http://example.com/<b>&lt;baseurl&gt;</b></code>",
     "LabelFont": "Skrifttype:",
     "LabelMatchType": "Matchtype:",
     "OptionPosterCard": "Plakatkort",
@@ -1378,12 +1377,12 @@
     "MusicAlbum": "Musikkalbum",
     "MusicArtist": "Musikkartist",
     "Next": "Neste",
-    "NoSubtitles": "Ingen teksting",
+    "NoSubtitles": "Ingen",
     "NoSubtitlesHelp": "Undertekster vil ikke lastes inn som standard. De kan fortsatt aktiveres manuelt under avspilling.",
     "Normal": "Normal",
-    "OnlyForcedSubtitles": "Kun tvungen teksting",
+    "OnlyForcedSubtitles": "Kun tvungen",
     "OnlyForcedSubtitlesHelp": "Bare last inn undertekster merket som tvungen.",
-    "OnlyImageFormats": "Bare bildeformater (VOBSUB, PGS, SUB, osv.)",
+    "OnlyImageFormats": "Bare bildeformater (VOBSUB, PGS, SUB)",
     "OptionAllowMediaPlaybackTranscodingHelp": "Begrensning av tilgang til omkoding kan føre til avspillingsfeil i Jellyfin-apper grunnet at medieformater ikke støtes.",
     "OptionAllowSyncTranscoding": "Tillat nedlastning og synkronisering av media som krever omkoding",
     "OptionCaptionInfoExSamsung": "CaptionInfoEx (Samsung)",
@@ -1407,7 +1406,6 @@
     "Previous": "Forrige",
     "Primary": "Primær",
     "RequiredForAllRemoteConnections": "Påkrevd for alle eksterne tilkoblinger",
-    "RestartPleaseWaitMessage": "Vennligst vent mens Jellyfin-serveren skrus av og restartes. Dette kan ta et minutt eller to.",
     "RunAtStartup": "Kjør ved oppstart",
     "SaveSubtitlesIntoMediaFolders": "Lagre undertekster i mediemapper",
     "SaveSubtitlesIntoMediaFoldersHelp": "Lagring av undertekster ved siden av videofilene vil gjøre det lettere å behandle dem.",
@@ -1451,11 +1449,9 @@
     "HeaderFavoritePeople": "Favorittpersoner",
     "Raised": "Opphøyet",
     "ButtonSplit": "Del opp",
-    "SelectAdminUsername": "Vennligst velg et brukernavn for administrator kontoen. ",
+    "SelectAdminUsername": "Vennligst velg et brukernavn for administrator-kontoen.",
     "HeaderNavigation": "Navigering",
     "MessageConfirmAppExit": "Vil du avslutte?",
-    "EnableFastImageFadeInHelp": "Bruk rask inntoning av animasjon for lastede bilder",
-    "EnableFastImageFadeIn": "Rask bilde inntoning",
     "CopyStreamURLError": "Det var en feil under kopiering av URL'en.",
     "LabelVideoResolution": "Oppløsning på video:",
     "LabelPlayerDimensions": "Dimensjoner på avspiller:",
@@ -1465,7 +1461,7 @@
     "OptionForceRemoteSourceTranscoding": "Tvunget omkoding av eksterne media-kilder (som Direkte-TV)",
     "NoCreatedLibraries": "Det virker som at du ikke har opprettet noen biblioteker ennå. {0}Vil du opprette et nå?{1}",
     "AskAdminToCreateLibrary": "Spør en administrator om å lage et bibliotek.",
-    "PlaybackErrorNoCompatibleStream": "Det oppstod et problem med klientprofilering, og serveren sender ikke et kompatibelt medieformat.",
+    "PlaybackErrorNoCompatibleStream": "Denne klienten er ikke kompatibel med mediet, og serveren sender ikke et kompatibelt medieformat.",
     "AllowFfmpegThrottlingHelp": "Når en omkoding eller ompakking kommer langt nok foran den nåværende avspillingsposisjonen stoppes prosessen slik at den bruker mindre ressurser. Dette er mest nyttig når du sjeldent bytter posisjon i videoen. Slå av dette hvis du opplever problemer med avspilling.",
     "AllowFfmpegThrottling": "Begrens hastighet på omkoding",
     "Episode": "Episode",
@@ -1474,11 +1470,107 @@
     "Artist": "Artist",
     "AlbumArtist": "Albumartist",
     "Album": "Album",
-    "LabelLibraryPageSizeHelp": "Velger hvor mange elementer som skal bli vist på en bibliotek side. Velg 0 for å deaktivere.",
-    "LabelLibraryPageSize": "Biblioteks side størrelse:",
+    "LabelLibraryPageSizeHelp": "Angir hvor mange elementer som vises på en bibliotekside. Velg 0 for å deaktivere oppdeling i sider.",
+    "LabelLibraryPageSize": "Størrelse på bibliotekside:",
     "LabelDeinterlaceMethod": "Deinterlacing metode:",
     "HeaderFavoritePlaylists": "Favorittspillelister",
     "DeinterlaceMethodHelp": "Velg deinterlacing metoden som skal bli brukt når man transkoder interlaced innhold.",
     "ButtonTogglePlaylist": "Spilleliste",
-    "ButtonToggleContextMenu": "Mer"
+    "ButtonToggleContextMenu": "Mer",
+    "EnableBlurhashHelp": "Bilder som fortsatt lastes inn vil vises med en tåkete plassholder",
+    "EnableBlurhash": "Aktiver tåkete plassholdere for bilder",
+    "UnsupportedPlayback": "Jellyfin kan ikke dekryptere innhold beskyttet med DRM, men alt innhold vil bli forsøkt uansett, inkludert beskyttede titler. Noen filer kan fremstå helt svarte grunnet kryptering eller andre ikke støttede funksjoner, som interaktive titler.",
+    "OnApplicationStartup": "Ved oppstart av applikasjonen",
+    "EveryXHours": "Hver {0}. time",
+    "EveryHour": "Hver time",
+    "EveryXMinutes": "Hvert {0}. minutt",
+    "OnWakeFromSleep": "Ved oppvåkning fra hvilemodus",
+    "WeeklyAt": "{0}er kl. {1}",
+    "DailyAt": "Daglig kl. {0}",
+    "LastSeen": "Sist sett {0}",
+    "PersonRole": "som {0}",
+    "ListPaging": "{0}-{1} av {2}",
+    "WriteAccessRequired": "Jellyfin Server krever skrivetilgang til denne mappen. Vennligst påse at skrivetilgang er gitt og prøv igjen.",
+    "PathNotFound": "Banen ble ikke funnet. Påse at banen er gyldig og prøv igjen.",
+    "YadifBob": "YADIF Bob",
+    "Yadif": "YADIF",
+    "Track": "Spor",
+    "TabDVR": "Opptak",
+    "SyncPlayAccessHelp": "Velg tilgangsnivået denne brukeren skal ha til SyncPlay-funksjonen. SyncPlay muliggjør synkronisert avspilling med andre enheter.",
+    "Filter": "Filter",
+    "New": "Ny",
+    "ShowMore": "Vis mer",
+    "ShowLess": "Vis mindre",
+    "Season": "Sesong",
+    "SaveChanges": "Lagre endringer",
+    "ReleaseGroup": "Utgivelsesgruppe",
+    "PreferEmbeddedEpisodeInfosOverFileNames": "Foretrekk innebygd episodeinformasjon framfor filnavn",
+    "PreferEmbeddedEpisodeInfosOverFileNamesHelp": "Dette bruker episodeinformasjonen fra innebygd metadata hvis tilgjengelig.",
+    "Person": "Person",
+    "OtherArtist": "Annen artist",
+    "Movie": "Film",
+    "MessageSyncPlayErrorMedia": "Kunne ikke aktivere SyncPlay! Mediefeil.",
+    "MessageSyncPlayErrorMissingSession": "Kunne ikke aktivere SyncPlay! Mangler sesjon.",
+    "MessageSyncPlayErrorNoActivePlayer": "Ingen aktiv avspiller funnet. SyncPlay har blitt deaktivert.",
+    "MessageSyncPlayErrorAccessingGroups": "En feil oppstod under lasting av gruppelisten.",
+    "MessageSyncPlayLibraryAccessDenied": "Tilgang til dette innholdet er begrenset.",
+    "MessageSyncPlayJoinGroupDenied": "Tillatelse kreves for å bruke SyncPlay.",
+    "MessageSyncPlayCreateGroupDenied": "Tillatelse kreves for å opprette en gruppe.",
+    "MessageSyncPlayGroupDoesNotExist": "Kunne ikke bli med i gruppen fordi den ikke finnes.",
+    "MessageSyncPlayPlaybackPermissionRequired": "Tillatelse for avspilling kreves.",
+    "MessageSyncPlayNoGroupsAvailable": "Ingen grupper tilgjengelige. Begynn å spill noe først.",
+    "MessageSyncPlayGroupWait": "<b>{0}</b> bufrer...",
+    "MessageSyncPlayUserLeft": "<b>{0}</b> har forlatt gruppen.",
+    "MessageSyncPlayUserJoined": "<b>{0}</b> har blitt med i gruppen.",
+    "MessageSyncPlayDisabled": "SyncPlay deaktivert.",
+    "MessageSyncPlayEnabled": "SyncPlay aktivert.",
+    "MessageUnauthorizedUser": "Du har ikke autorisert tilgang til serveren akkurat nå. Vennligst kontakt serveradministratoren din for mer informasjon.",
+    "LabelSyncPlayAccess": "SyncPlay-tilgang",
+    "LabelSyncPlayAccessNone": "Deaktivert for denne brukeren",
+    "LabelSyncPlayAccessJoinGroups": "Tillat brukeren å bli med i grupper",
+    "LabelSyncPlayAccessCreateAndJoinGroups": "Tillat brukeren å lage og bli med i grupper",
+    "LabelSyncPlayLeaveGroupDescription": "Deaktiver SyncPlay",
+    "LabelSyncPlayLeaveGroup": "Forlat gruppe",
+    "LabelSyncPlayNewGroupDescription": "Lag en ny gruppe",
+    "LabelSyncPlayNewGroup": "Ny gruppe",
+    "LabelSyncPlaySyncMethod": "Synkroniseringsmetode:",
+    "LabelSyncPlayPlaybackDiff": "Tidsforskjell på avspilling:",
+    "MillisecondsUnit": "ms",
+    "LabelSyncPlayTimeOffset": "Tidsforskyvning mot serveren:",
+    "LabelRequireHttpsHelp": "Hvis valgt, vil serveren automatisk omdirigere alle HTTP-forespørsler til HTTPS. Dette har ingen effekt dersom serveren ikke lytter etter HTTPS.",
+    "LabelRequireHttps": "Krev HTTPS",
+    "LabelNightly": "Nattlig",
+    "LabelStable": "Stabil",
+    "LabelChromecastVersion": "Chromecast-versjon",
+    "LabelEnableHttpsHelp": "Aktiverer at serveren skal lytte på den valgte HTTPS-porten. Et gyldig sertifikat må også være konfigurert for at dette skal tre i kraft.",
+    "LabelEnableHttps": "Aktiver HTTPS",
+    "HeaderSyncPlayEnabled": "SyncPlay aktivert",
+    "HeaderSyncPlaySelectGroup": "Bli med i en gruppe",
+    "HeaderServerAddressSettings": "Innstillinger for serveradresse",
+    "HeaderRemoteAccessSettings": "Innstillinger for fjerntilgang",
+    "HeaderHttpsSettings": "HTTPS-innstillinger",
+    "HeaderDVR": "Opptak",
+    "ApiKeysCaption": "Liste over aktive API-nøkler",
+    "EnableDetailsBannerHelp": "Viser et bildebanner øverst på detaljsiden.",
+    "EnableDetailsBanner": "Detaljebanner",
+    "ButtonSyncPlay": "SyncPlay",
+    "LabelRepositoryName": "Navn på kilde",
+    "LabelRepositoryUrlHelp": "Lokasjonen til kilde-manifestet som du ønsker å inkludere.",
+    "LabelRepositoryUrl": "URL for kilde",
+    "HeaderNewRepository": "Ny kilde",
+    "MessageNoRepositories": "Ingen kilder.",
+    "EnableFasterAnimationsHelp": "Bruk raskere animasjoner og overganger",
+    "EnableFasterAnimations": "Raskere animasjoner",
+    "EnableDecodingColorDepth10Vp9": "Aktiver maskinvaredekoding for VP9",
+    "EnableDecodingColorDepth10Hevc": "Aktiver maskinvaredekoding for 10-Bit HEVC",
+    "ButtonPlayer": "Spiller",
+    "ButtonCast": "Cast",
+    "Writers": "Forfattere",
+    "TabRepositories": "Kilder",
+    "MessageNoGenresAvailable": "Aktiver noen metadata-kilder for å hente sjangre fra internett.",
+    "MessageAddRepository": "Hvis du ønsker å legge til en ny kilde klikker du på knappen ved siden av overskriften og fyller ut forespurt informasjon.",
+    "LabelRepositoryNameHelp": "Et egendefinert navn for å skille denne kilden fra andre som er lagt til på serveren din.",
+    "ClearQueue": "Tøm køen",
+    "ViewAlbumArtist": "Vis albumartist",
+    "StopPlayback": "Stopp avspilling"
 }
diff --git a/src/strings/nl.json b/src/strings/nl.json
index 23a563a8f0..6e3adba10f 100644
--- a/src/strings/nl.json
+++ b/src/strings/nl.json
@@ -846,7 +846,7 @@
     "MessageNoAvailablePlugins": "Geen beschikbare Plugins.",
     "MessageNoMovieSuggestionsAvailable": "Er zijn momenteel geen film suggesties beschikbaar. Begin met het bekijken en waardeer uw films, kom daarna terug om uw aanbevelingen te bekijken.",
     "MessageNoPluginsInstalled": "U heeft geen plugins geïnstalleerd.",
-    "MessageNoTrailersFound": "Geen trailers gevonden. Installeer het Trailers kanaal om uw film ervaring te verbeteren door middel van het toevoegen van een bibliotheek met internet trailers.",
+    "MessageNoTrailersFound": "Installeer het Trailers kanaal om uw film ervaring te verbeteren door middel van het toevoegen van een bibliotheek met internet trailers.",
     "MessageNothingHere": "Lijst is leeg.",
     "MessagePasswordResetForUsers": "De volgende gebruikers hebben hun wachtwoord laten herstellen. Zij kunnen nu inloggen met de pin codes die gebruikt werden om de herstel te voltooien.",
     "MessagePlayAccessRestricted": "Afspelen hiervan is op dit moment niet toegestaan. Neem contact op met uw server beheerder voor meer informatie.",
@@ -1090,7 +1090,6 @@
     "ReplaceAllMetadata": "Alle metadata vervangen",
     "ReplaceExistingImages": "Bestaande afbeeldingen vervangen",
     "RequiredForAllRemoteConnections": "Vereist voor alle externe verbindingen",
-    "RestartPleaseWaitMessage": "Wacht totdat Jellyfin Server is afgesloten en opnieuw is gestart. Dit kan een paar minuten duren.",
     "ResumeAt": "Hervatten vanaf {0}",
     "Rewind": "Terugspoelen",
     "RunAtStartup": "Uitvoeren bij opstarten",
@@ -1301,7 +1300,6 @@
     "HeaderJellyfinServer": "Jellyfin Server",
     "HeaderLiveTv": "Live TV",
     "HeaderMedia": "Media",
-    "HeaderRestartingServer": "Server wordt herstart",
     "HeaderTracks": "Nummers",
     "HeaderTuners": "Stemmers",
     "InstantMix": "Instant mix",
@@ -1441,7 +1439,7 @@
     "MediaInfoSoftware": "Software",
     "MessageImageFileTypeAllowed": "Alleen JPEG en PNG bestanden worden ondersteund.",
     "MessageImageTypeNotSelected": "Selecteer een afbeelding type van het menu alstublieft .",
-    "MessageNoCollectionsAvailable": "Collecties staan u toe om te genieten van gepersonaliseerde groeperingen van Films, Series en Albums. Klik de + knop om te beginnen met het maken van collecties.",
+    "MessageNoCollectionsAvailable": "Collecties staan u toe om te genieten van gepersonaliseerde groeperingen van Films, Series en Albums te maken. Klik op de + knop om te beginnen met het maken van collecties.",
     "MessageNoServersAvailable": "Geen servers zijn gevonden door middel van het automatisch ontdekken van een server.",
     "Metadata": "Metadata",
     "MetadataManager": "Metadata Beheerder",
@@ -1471,8 +1469,6 @@
     "Artist": "Artiest",
     "AllowFfmpegThrottlingHelp": "Wanneer een transcode of remux ver genoeg voorloopt op de huidige afspeelpositie, pauzeer het proces, zodat het minder middelen verbruikt. Dit is vooral handig wanneer u kijkt zonder vaak te zoeken. Schakel dit uit als u afspeelproblemen ondervindt.",
     "AllowFfmpegThrottling": "Throttle Transcodes",
-    "EnableFastImageFadeInHelp": "Toon posters en andere afbeeldingen met een snellere fade-animatie wanneer ze klaar zijn met laden.",
-    "EnableFastImageFadeIn": "Fast Image Fade Animaties",
     "LabelPlayerDimensions": "Afspeellengte:",
     "LabelLibraryPageSizeHelp": "Kies het aantal artikelen dat wordt weergegeven op een bibliotheekpagina. Kies 0 om dit te verbergen.",
     "LabelLibraryPageSize": "Bibliotheekpagina grootte:",
@@ -1533,7 +1529,7 @@
     "MessageSyncPlayCreateGroupDenied": "Toestemming vereist om een groep te maken.",
     "MessageSyncPlayGroupDoesNotExist": "Kan niet deelnemen aan de groep omdat deze niet bestaat.",
     "MessageSyncPlayPlaybackPermissionRequired": "Afspeelrechten vereist.",
-    "MessageSyncPlayGroupWait": "<b>{0}</b> is aan het bufferen...",
+    "MessageSyncPlayGroupWait": "<b>{0}</b> is aan het bufferen…",
     "MessageSyncPlayUserLeft": "<b>{0}</b> i heeft de groep verlaten.",
     "MessageSyncPlayUserJoined": "<b>{0}</b> is lid geworden van de groep.",
     "MessageSyncPlayDisabled": "SyncPlay uitgeschakeld.",
@@ -1554,7 +1550,7 @@
     "LabelNightly": "Nightly",
     "LabelStable": "Stabiel",
     "LabelChromecastVersion": "Chromecast versie",
-    "LabelEnableHttpsHelp": "Hiermee kan de server luisteren op de geconfigureerde HTTPS-poort. Hiervoor moet ook een geldig certificaat worden geconfigureerd.",
+    "LabelEnableHttpsHelp": "Hiermee kan de server luisteren op de geconfigureerde HTTPS-poort. Om dit te laten werken moet ook een geldig certificaat worden geconfigureerd.",
     "LabelEnableHttps": "HTTPS inschakelen",
     "HeaderSyncPlayEnabled": "SyncPlay ingeschakeld",
     "HeaderSyncPlaySelectGroup": "Word lid van een groep",
@@ -1562,5 +1558,27 @@
     "HeaderRemoteAccessSettings": "Externe toegang instellingen",
     "HeaderHttpsSettings": "HTTPS instellingen",
     "HeaderDVR": "DVR",
-    "ApiKeysCaption": "Lijst met de momenteel ingeschakelde API-sleutels"
+    "ApiKeysCaption": "Lijst met de momenteel ingeschakelde API-sleutels",
+    "ButtonSyncPlay": "SyncPlay",
+    "ShowMore": "Laat meer zien",
+    "ShowLess": "Laat minder zien",
+    "MessageNoGenresAvailable": "Stel sommige metadataproviders in staat om genres van internet te halen.",
+    "EnableFasterAnimationsHelp": "Gebruik snellere animaties en overgangen",
+    "EnableFasterAnimations": "Snellere animaties",
+    "EnableDecodingColorDepth10Vp9": "Schakel 10-bits hardwarecodering in voor VP9",
+    "EnableDecodingColorDepth10Hevc": "Schakel 10-bits hardwarecodering in voor HEVC",
+    "ClearQueue": "Leeg wachtrij",
+    "StopPlayback": "Stop afspelen",
+    "ButtonPlayer": "Speler",
+    "EnableBlurhashHelp": "Afbeeldingen die nog laden worden getoond als een wazige placeholder",
+    "EnableBlurhash": "Schakel wazige placeholders voor plaatjes in",
+    "Writers": "Schrijvers",
+    "ViewAlbumArtist": "Bekijk album artiest",
+    "MessageAddRepository": "Om een repository toe te voegen klik je op de knop naast de kop, en vul je benodigde informatie in.",
+    "LabelRepositoryNameHelp": "Een zelf te configureren naam om deze repository te kunnen onderscheiden van andere repositories.",
+    "LabelRepositoryName": "Repository naam",
+    "LabelRepositoryUrlHelp": "De locatie van het repository manifest dat je wilt gebruiken.",
+    "LabelRepositoryUrl": "Repository URL",
+    "HeaderNewRepository": "Nieuwe repository",
+    "MessageNoRepositories": "Geen repositories."
 }
diff --git a/src/strings/pl.json b/src/strings/pl.json
index 1cea825bf8..8ced01561c 100644
--- a/src/strings/pl.json
+++ b/src/strings/pl.json
@@ -15,7 +15,7 @@
     "Alerts": "Alarmy",
     "All": "Wszystkie",
     "AllChannels": "Wszystkie kanały",
-    "AllComplexFormats": "Wszystkie złożone formaty (ASS, SSA, VOBSUB, PGS, SUB/IDX, etc.)",
+    "AllComplexFormats": "Wszystkie złożone formaty (ASS, SSA, VOBSUB, PGS, SUB, IDX, ...)",
     "AllEpisodes": "Wszystkie odcinki",
     "AllLanguages": "Wszystkie języki",
     "AllLibraries": "Biblioteki",
@@ -23,7 +23,7 @@
     "AllowMediaConversion": "Zezwalaj na konwersję mediów",
     "AllowMediaConversionHelp": "Umożliwia dawanie lub odbieranie dostępu do funkcji konwersji mediów.",
     "AllowOnTheFlySubtitleExtraction": "Zezwalaj na wydobywanie napisów w locie",
-    "AllowOnTheFlySubtitleExtractionHelp": "Napisy wbudowane mogą zostać wydobyte z plików wideo i dostarczaone do klienta w postaci zwykłego tekstu, zapobiegając transkodowaniu wideo. Na niektórych systemach może to zabierać dużo czasu i powodować wstrzymywanie odtwarzania wideo podczas procesu ekstrakcji. Dezaktywuj tę opcję, aby wbudowane napisy były wypalane w transkodowanym wideo, gdy nie są obsługiwane przez urządzenie klienta.",
+    "AllowOnTheFlySubtitleExtractionHelp": "Napisy wbudowane mogą zostać wydobyte z plików wideo i dostarczone do klienta w postaci zwykłego tekstu, zapobiegając transkodowaniu wideo. Na niektórych systemach może to zabierać dużo czasu i powodować wstrzymywanie odtwarzania wideo podczas procesu ekstrakcji. Dezaktywuj tę opcję, aby wbudowane napisy były wypalane w transkodowanym wideo, gdy nie są obsługiwane przez urządzenie klienta.",
     "AllowRemoteAccess": "Zezwalaj na zdalne połączenia z tym serwerem Jellyfin.",
     "AllowRemoteAccessHelp": "Jeśli nieaktywne, wszelkie zdalne połączenia będą blokowane.",
     "AllowedRemoteAddressesHelp": "Lista rozdzielona przecinkiem w postaci adresów IP lub adresów IP z maską sieciową dla całych podsieci. W przypadku pozostawienia pustego pola, dopuszczalne będą połączenia ze wszystkich zdalnych adresów.",
@@ -31,7 +31,7 @@
     "AlwaysPlaySubtitlesHelp": "Napisy pasujące do preferowanego języka będą wczytywane, niezależnie od języka ścieżki dźwiękowej.",
     "AnyLanguage": "W dowolnym języku",
     "Anytime": "O dowolnej porze",
-    "AroundTime": "Około {0}",
+    "AroundTime": "Około",
     "Art": "Przezrocze",
     "Artists": "Wykonawcy",
     "AsManyAsPossible": "Tak wiele jak to możliwe",
@@ -48,13 +48,13 @@
     "BirthLocation": "Miejsce urodzin",
     "BirthPlaceValue": "Miejsce urodzenia: {0}",
     "Blacklist": "Czarna lista",
-    "BookLibraryHelp": "Wspierane są wersje tekstowe oraz dźwiękowe. Sprawdź przewodnik nazewnictwa książek{1}  {0}.",
+    "BookLibraryHelp": "Wspierane są wersje tekstowe oraz dźwiękowe. Sprawdź przewodnik nazewnictwa książek {1} {0}.",
     "Books": "Książki",
     "Box": "Pudełko",
     "BoxRear": "Pudełko (tył)",
     "Browse": "Przeglądaj",
     "BrowsePluginCatalogMessage": "Przejrzyj nasz katalog wtyczek żeby zobaczyć dostępne wtyczki.",
-    "BurnSubtitlesHelp": "Określa czy serwer powinien wypalać napisy podczas konwersji wideo, w zależności od formatu napisów. Unikanie wypalania napisów znacząco poprawia wydajność serwera. Wybierz Automatycznie, w celu wypalania zarówno napisów w formatach graficznych (np. VOBSUB, PGS, SUB/IDX), jak i pewnych napisów ASS lub SSA.",
+    "BurnSubtitlesHelp": "Określa czy serwer powinien wypalać napisy podczas konwersji wideo, w zależności od formatu napisów. Unikanie wypalania napisów znacząco poprawia wydajność serwera. Wybierz Automatycznie, w celu wypalania zarówno napisów w formatach graficznych (np. VOBSUB, PGS, SUB, IDX, ...), jak i pewnych napisów ASS lub SSA.",
     "ButtonAdd": "Dodaj",
     "ButtonAddMediaLibrary": "Dodaj media do biblioteki",
     "ButtonAddScheduledTaskTrigger": "Dodaj wyzwalacz",
@@ -151,7 +151,7 @@
     "ConfirmDeleteItems": "Usunięcie tej pozycji usunie ją zarówno z systemu plików jak i z biblioteki mediów. Czy chcesz kontynuować?",
     "ConfirmDeletion": "Potwierdzenie usunięcia",
     "ConfirmEndPlayerSession": "Czy chcesz zamknąć Jellyfin na {0}?",
-    "Connect": "Połacz",
+    "Connect": "Połącz",
     "ContinueWatching": "Kontynuuj odtwarzanie",
     "Continuing": "Dalej wyświetlane",
     "CriticRating": "Ocena krytyków",
@@ -160,7 +160,7 @@
     "DatePlayed": "Data odtwarzania",
     "DeathDateValue": "Zmarły: {0}",
     "Default": "Domyślny",
-    "DefaultErrorMessage": "Wystąpił bląd podczas przetwarzania twojego rządania. Proszę spróbować ponownie poźniej.",
+    "DefaultErrorMessage": "Wystąpił błąd podczas przetwarzania żądania. Proszę spróbować ponownie później.",
     "DefaultMetadataLangaugeDescription": "To są twoje ustawienia domyślne. Możesz je zmienić dla każdej biblioteki osobno.",
     "DefaultSubtitlesHelp": "Napisy będą wczytywane w oparciu o znaczniki metadanych ścieżek dźwiękowych. Preferencje językowe brane są pod uwagę, gdy dostępnych jest wiele możliwości.",
     "Delete": "Usuń",
@@ -260,7 +260,7 @@
     "Genre": "Gatunek",
     "Genres": "Gatunki",
     "GroupBySeries": "Grupuj po serialach",
-    "GroupVersions": "Wersje grup",
+    "GroupVersions": "Grupuj wersje",
     "GuestStar": "Gość specjalny",
     "Guide": "Przewodnik",
     "GuideProviderLogin": "Logowanie",
@@ -583,7 +583,7 @@
     "LabelEmbedAlbumArtDidl": "Wbudowana okładka albumu w Didl",
     "LabelEmbedAlbumArtDidlHelp": "Niektóre urządzenia wybierają tę metodę uzyskiwania okładki albumu. Inne mogą nie odtwarzać gdy ta opcja jest włączona.",
     "LabelEnableAutomaticPortMap": "Mapuj porty automatycznie",
-    "LabelEnableAutomaticPortMapHelp": "Umożliwia automatyczne mapowanie publicznego numeru portu z lokalnym numerem portu za pomocą UPnP. Ta opcja może nie działać z niektórymi modelami ruterów. Zmiany zaczną działać po ponownym uruchomieniu serwera.",
+    "LabelEnableAutomaticPortMapHelp": "Umożliwia automatyczne przekierowanie publicznego portu na twoim ruterze do lokalnego portu na serwerze przy użyciu UPnP. Ta opcja może nie działać z niektórymi modelami ruterów lub w niektórych konfiguracjach sieci. Zmiany zaczną działać po ponownym uruchomieniu serwera.",
     "LabelEnableBlastAliveMessages": "Przesyłaj komunikaty o dostępności",
     "LabelEnableBlastAliveMessagesHelp": "Aktywuj tę funkcję, jeśli serwer nie jest odpowiednio wykrywany przez inne urządzenia UPnP w twojej sieci.",
     "LabelEnableDlnaClientDiscoveryInterval": "Częstotliwość wykrywania klientów (sekundy)",
@@ -705,7 +705,7 @@
     "LabelNumberOfGuideDays": "Liczba dni pobieranych danych przewodnika:",
     "LabelNumberOfGuideDaysHelp": "Pobieranie większej liczby dni danych przewodnika, pozwoli na zaplanowanie zadań na dłuższy okres i wyświetlanie większej listy, ale wydłuży także czas na jego pobranie. Automatycznie wybierze na podstawie liczby kanałów.",
     "LabelOptionalNetworkPath": "(Opcjonalne) Udostępniony folder sieciowy:",
-    "LabelOptionalNetworkPathHelp": "Jeśli folder jest udostępniony w sieci domowej, podanie jego ścieżki, umożliwi bezpośrednie odtwarzanie na innych urządzeniach.",
+    "LabelOptionalNetworkPathHelp": "Jeśli folder jest udostępniony w sieci domowej, podanie jego ścieżki, umożliwi bezpośrednie odtwarzanie na innych urządzeniach. Na przykład, {0} lub {1}.",
     "LabelOriginalAspectRatio": "Oryginalny format obrazu:",
     "LabelOriginalTitle": "Tytuł oryginalny:",
     "LabelOverview": "Opis:",
@@ -909,7 +909,7 @@
     "MessageNoAvailablePlugins": "Brak dostępnych wtyczek.",
     "MessageNoMovieSuggestionsAvailable": "Brak aktualnie polecanych filmów. Zacznij oglądać i oceniać filmy, następnie wróć, aby obejrzeć swoje rekomendacje.",
     "MessageNoPluginsInstalled": "Brak zainstalowanych wtyczek.",
-    "MessageNoTrailersFound": "Brak dostępnych zwiastunów. Zainstaluj wtyczkę Trailer Channel, aby ulepszyć swoje doświadczenie kinowe, dodając zwiastuny z internetu do biblioteki.",
+    "MessageNoTrailersFound": "Zainstaluj wtyczkę Trailer Channel, aby ulepszyć swoje doświadczenie kinowe, dodając zwiastuny z internetu do biblioteki.",
     "MessageNothingHere": "Nic tutaj nie ma.",
     "MessagePasswordResetForUsers": "Następujący użytkownicy zresetowali swoje hasła. Mogą teraz zalogować się za pomocą kodów PIN, które zostały użyte do zresetowania.",
     "MessagePlayAccessRestricted": "Odtwarzanie tej zawartości jest aktualnie ograniczone. Skontaktuj się z administratorem serwera, aby uzyskać dodatkowe informacje.",
@@ -1054,7 +1054,7 @@
     "OptionMissingEpisode": "Brakujące Odcinki",
     "OptionMonday": "Poniedziałek",
     "OptionNameSort": "Nazwa",
-    "OptionNew": "Nowa...",
+    "OptionNew": "Nowa…",
     "OptionNone": "Brak",
     "OptionOnAppStartup": "Podczas uruchomienia aplikacji",
     "OptionOnInterval": "Cyklicznie",
@@ -1101,7 +1101,7 @@
     "OriginalAirDateValue": "Data pierwszej emisji: {0}",
     "Overview": "Opis",
     "PackageInstallCancelled": "Instalacja {0} (wersja {1}) anulowana.",
-    "PackageInstallCompleted": "Instalacja {0} zakończona.",
+    "PackageInstallCompleted": "Instalacja {0} (wersja {1}) zakończona.",
     "PackageInstallFailed": "Instalacja {0} nieudana.",
     "ParentalRating": "Kategoria wiekowa",
     "PasswordMatchError": "Hasło i potwierdzenie hasła muszą się zgadzać.",
@@ -1160,7 +1160,7 @@
     "RefreshMetadata": "Odśwież metadane",
     "RefreshQueued": "Odświeżanie dodane do kolejki zadań.",
     "ReleaseDate": "Data wydania",
-    "RememberMe": "Zapamiętaj mnie",
+    "RememberMe": "Zapamiętaj Mnie",
     "RemoveFromCollection": "Usuń z kolekcji",
     "RemoveFromPlaylist": "Usuń z listy",
     "Repeat": "Powtórz",
@@ -1171,7 +1171,6 @@
     "ReplaceAllMetadata": "Zastępuj wszystkie metadane",
     "ReplaceExistingImages": "Zastępuj istniejące obrazy",
     "RequiredForAllRemoteConnections": "Wymagane dla wszystkich zdalnych połączeń",
-    "RestartPleaseWaitMessage": "Czekaj na zamknięcie i ponowne uruchomienie serwera Jellyfin. To może trwać ok. jednej, dwóch minut.",
     "ResumeAt": "Wznów odtwarzanie od {0}",
     "Rewind": "Do tyłu",
     "RunAtStartup": "Uruchamiaj po starcie",
@@ -1368,7 +1367,6 @@
     "HeaderFavoriteSongs": "Ulubione utwory",
     "HeaderFavoriteVideos": "Ulubione Filmy",
     "HeaderHome": "Strona główna",
-    "HeaderRestartingServer": "Ponowne uruchamianie serwera",
     "LabelAuthProvider": "Dostawca autentykacji:",
     "LabelDynamicExternalId": "{0} Id:",
     "LabelFormat": "Format:",
@@ -1436,15 +1434,15 @@
     "LabelVideoBitrate": "Szybkość transmisji wideo:",
     "LabelTranscodingProgress": "Postęp transkodowania:",
     "LabelTranscodingFramerate": "Transkodowanie w kl/s:",
-    "LabelSize": "Wielkość:",
+    "LabelSize": "Rozmiar:",
     "LabelPleaseRestart": "Zmiany zaczną obowiązywać po ręcznym przeładowaniu klienta WWW.",
-    "LabelPlayMethod": "Meroda odtwarzania:",
-    "LabelPlayer": "Gracz:",
-    "LabelBaseUrlHelp": "Możesz tutaj dodać niestandardowy podkatalog, aby uzyskać dostęp do serwera z bardziej unikalnego adresu URL.",
+    "LabelPlayMethod": "Metoda odtwarzania:",
+    "LabelPlayer": "Odtwarzacz:",
+    "LabelBaseUrlHelp": "Dodaje niestandardowy podkatalog do adresu URL serwera. Na przykład: <code>http://example.com/<b>&lt;baseurl&gt;</b></code>",
     "LabelBaseUrl": "Podstawowy adres URL:",
     "LabelBitrate": "Bitrate:",
     "LabelAudioSampleRate": "Częstotliwość próbkowania audio:",
-    "LabelAudioCodec": "Kodeki audio:",
+    "LabelAudioCodec": "Kodek audio:",
     "LabelAudioChannels": "Kanały audio:",
     "LabelAudioBitrate": "Audio bitrate:",
     "LabelAudioBitDepth": "Głębia bitowa audio:",
@@ -1461,13 +1459,11 @@
     "AskAdminToCreateLibrary": "Poproś administratora o stworzenie biblioteki.",
     "AllowFfmpegThrottlingHelp": "Kiedy transkodowanie lub remuxowanie dotrze wystarczająco daleko od aktualnej pozycji odtwarzania, zatrzymaj proces aby zużywać mniej zasobów. Jest to najbardziej użyteczne podczas oglądania bez częstego przeskakiwania. Wyłącz jeśli zaobserwujesz problemy z odtwarzaniem.",
     "AllowFfmpegThrottling": "Ograniczaj transkodowanie",
-    "PlaybackErrorNoCompatibleStream": "Wystąpił problem ze sprofilowaniem klienta i serwer nie wysyła kompatybilnego formatu mediów.",
+    "PlaybackErrorNoCompatibleStream": "Ten klient nie wspiera tego formatu mediów a serwer nie wysyła kompatybilnego formatu.",
     "OptionForceRemoteSourceTranscoding": "Wymuś transkodowanie zewnętrznych źródeł mediów (jak telewizja na żywo)",
     "NoCreatedLibraries": "Wygląda na to, że nie utworzyłeś jeszcze żadnych bibliotek. {0}Czy chcesz utworzyć jedną teraz?{1}",
     "LabelVideoResolution": "Rozdzielczość wideo:",
     "LabelStreamType": "Typ transmisji:",
-    "EnableFastImageFadeInHelp": "Włącz szybszą animację pojawiania się dla załadowanych obrazów",
-    "EnableFastImageFadeIn": "Szybkie pojawianie się obrazów",
     "Artist": "Artysta",
     "AlbumArtist": "Album artysty",
     "Album": "Album",
@@ -1483,5 +1479,98 @@
     "DeinterlaceMethodHelp": "Wybierz metodę usuwania przeplotu używaną podczas transkodowania.",
     "ClientSettings": "Ustawienia klienta",
     "ButtonTogglePlaylist": "Playlista",
-    "ButtonToggleContextMenu": "Więcej"
+    "ButtonToggleContextMenu": "Więcej",
+    "ButtonSyncPlay": "SyncPlay",
+    "ClearQueue": "Wyczyść kolejkę",
+    "StopPlayback": "Zatrzymaj odtwarzanie",
+    "ButtonPlayer": "Odtwarzacz",
+    "ButtonCast": "Obsada",
+    "EnableBlurhashHelp": "Obrazy które wciąż się ładują zostaną zastąpione rozmazanym symbolem",
+    "EnableBlurhash": "Włącz rozmazane zamienniki dla obrazów",
+    "UnsupportedPlayback": "Jellyfin nie może odszyfrować zawartości zabezpieczonej przy pomocy DRM, ale spróbuje pomimo tego. Niektóre pliki mogą pojawiać się jako zupełnie czarne z powodu szyfrowania lub innych nie wspieranych funkcji jak np. interaktywne tytuły.",
+    "OnApplicationStartup": "Przy starcie aplikacji",
+    "EveryXHours": "Co {0} godzin",
+    "EveryHour": "Co godzinę",
+    "EveryXMinutes": "Co {0} minut",
+    "OnWakeFromSleep": "Przy wybudzaniu",
+    "WeeklyAt": "{0} o {1}",
+    "DailyAt": "Codziennie o {0}",
+    "LastSeen": "Ostatnio widziany {0}",
+    "PersonRole": "jako {0}",
+    "ListPaging": "{0}-{1} z {2}",
+    "WriteAccessRequired": "Serwer Jellyfin wymaga praw zapisu do tego katalogu. Upewnij się, że prawa zapisu zostały przyznane i spróbuj ponownie.",
+    "PathNotFound": "Ścieżka nie została znaleziona. Upewnij się, że ścieżka jest poprawna i spróbuj ponownie.",
+    "YadifBob": "YADIF Bob",
+    "Yadif": "YADIF",
+    "Writers": "Scenariusz",
+    "ViewAlbumArtist": "Zobacz wykonawcę albumu",
+    "Track": "Utwór",
+    "TabDVR": "DVR",
+    "TabRepositories": "Repozytoria",
+    "SyncPlayAccessHelp": "Wybierz poziom dostępu do funkcji SyncPlay jaki posiada ten użytkownik. SyncPlay pozwala na synchronizację odtwarzania z innymi urządzeniami.",
+    "Filter": "Filtruj",
+    "New": "Nowy",
+    "ShowMore": "Pokaż więcej",
+    "ShowLess": "Pokaż mniej",
+    "Season": "Sezon",
+    "SaveChanges": "Zapisz zmiany",
+    "ReleaseGroup": "Zwolnij Grupę",
+    "PreferEmbeddedEpisodeInfosOverFileNames": "Preferuj wbudowane informacje o odcinku przed nazwami plików",
+    "PreferEmbeddedEpisodeInfosOverFileNamesHelp": "Używa informacji o odcinku z dołączonych metadanych jeśli są dostępne.",
+    "MessageSyncPlayErrorMedia": "Nie udało się uruchomić SyncPlay! Błąd mediów.",
+    "MessageSyncPlayErrorMissingSession": "Nie udało się uruchomić SyncPlay! Sesja niedostępna.",
+    "MessageSyncPlayErrorNoActivePlayer": "Nie znaleziono aktywnych odtwarzaczy. SyncPlay został wyłączony.",
+    "MessageSyncPlayErrorAccessingGroups": "Wystąpił błąd w trakcie odczytywania listy grup.",
+    "MessageSyncPlayLibraryAccessDenied": "Dostęp do tej zawartości jest ograniczony.",
+    "MessageSyncPlayJoinGroupDenied": "Zezwolenie na używanie SyncPlay wymagane.",
+    "MessageSyncPlayCreateGroupDenied": "Zezwolenie na tworzenie grup wymagane.",
+    "MessageSyncPlayGroupDoesNotExist": "Nie udało się dołączyć do grupy ponieważ grupa nie istnieje.",
+    "MessageSyncPlayPlaybackPermissionRequired": "Zezwolenie na odtwarzanie wymagane.",
+    "MessageSyncPlayNoGroupsAvailable": "Brak dostępnych grup. Najpierw zacznij coś odtwarzać.",
+    "MessageSyncPlayGroupWait": "<b>{0}</b> buforuje…",
+    "MessageSyncPlayUserLeft": "<b>{0}</b> opuścił grupę.",
+    "MessageSyncPlayUserJoined": "<b>{0}</b> dołączył do grupy.",
+    "MessageSyncPlayDisabled": "SyncPlay wyłączony.",
+    "MessageSyncPlayEnabled": "SyncPlay włączony.",
+    "MessageNoGenresAvailable": "Zezwól niektórym dostawcom metadanych na pobieranie gatunków z internetu.",
+    "MessageAddRepository": "Jeśli chcesz dodać repozytorium wciśnij przycisk obok nagłówka i wypełnij wymagane informacje.",
+    "LabelRepositoryNameHelp": "Własna nazwa pozwalająca odróżnić to repozytorium od innych dodanych na serwerze.",
+    "LabelRepositoryName": "Nazwa Repozytorium",
+    "LabelRepositoryUrlHelp": "Lokalizacja manifestu repozytorium, które chcesz dodać.",
+    "LabelRepositoryUrl": "Adres URL Repozytorium",
+    "HeaderNewRepository": "Nowe Repozytorium",
+    "MessageNoRepositories": "Brak repozytoriów.",
+    "LabelSyncPlayAccess": "Dostęp do SyncPlay",
+    "LabelSyncPlayAccessNone": "Wyłączone dla tego użytkownika",
+    "LabelSyncPlayAccessJoinGroups": "Zezwól użytkownikowi na dołączanie do grup",
+    "LabelSyncPlayAccessCreateAndJoinGroups": "Zezwól użytkownikowi na tworzenie i dołączanie do grup",
+    "LabelSyncPlayLeaveGroupDescription": "Wyłącz SyncPlay",
+    "LabelSyncPlayLeaveGroup": "Opuść grupę",
+    "LabelSyncPlayNewGroupDescription": "Stwórz nową grupę",
+    "LabelSyncPlayNewGroup": "Nowa grupa",
+    "LabelSyncPlaySyncMethod": "Metoda synchronizacji:",
+    "LabelSyncPlayPlaybackDiff": "Różnica w czasie odtwarzania:",
+    "MillisecondsUnit": "ms",
+    "LabelSyncPlayTimeOffset": "Różnica czasu z serwerem:",
+    "EnableFasterAnimationsHelp": "Używaj szybszych animacji i przejść",
+    "EnableFasterAnimations": "Szybsze animacje",
+    "LabelRequireHttpsHelp": "Jeśli zaznaczone, serwer automatycznie przekieruje wszystkie połączenia HTTP do HTTPS. Ta opcja nie zadziała jeśli serwer nie nasłuchuje na HTTPS.",
+    "LabelRequireHttps": "Wymagaj HTTPS",
+    "LabelNightly": "Nocny",
+    "LabelStable": "Stabilny",
+    "LabelChromecastVersion": "Wersja Chromecast",
+    "LabelEnableHttpsHelp": "Pozwala serwerowi na nasłuchiwanie na skonfigurowanym porcie HTTPS. Prawidłowy certyfikat musi być skonfigurowany by ta opcja zadziałała.",
+    "LabelEnableHttps": "Włącz HTTPS",
+    "HeaderSyncPlayEnabled": "SyncPlay włączony",
+    "HeaderSyncPlaySelectGroup": "Dołącz do grupy",
+    "HeaderServerAddressSettings": "Ustawienia Adresu Serwera",
+    "HeaderRemoteAccessSettings": "Ustawienia Zdalnego Dostępu",
+    "HeaderHttpsSettings": "Ustawienia HTTPS",
+    "HeaderDVR": "DVR",
+    "ApiKeysCaption": "Lista aktualnie włączonych kluczy API",
+    "EnableDetailsBannerHelp": "Wyświetl baner na szczycie strony ze szczegółami elementu.",
+    "EnableDetailsBanner": "Baner w szczegółach",
+    "EnableDecodingColorDepth10Vp9": "Włącz 10-bitowe dekodowanie sprzętowe dla VP9",
+    "EnableDecodingColorDepth10Hevc": "Włącz 10-bitowe dekodowanie sprzętowe dla HEVC",
+    "BoxSet": "Kolekcja"
 }
diff --git a/src/strings/pr.json b/src/strings/pr.json
index 91962aaa46..ea27024045 100644
--- a/src/strings/pr.json
+++ b/src/strings/pr.json
@@ -19,5 +19,11 @@
     "HeaderHome": "Poop Deck",
     "DisplayInOtherHomeScreenSections": "Show on Poop Deck such as latest booty and continue plundering",
     "ButtonHome": "Poop deck",
-    "HeaderCastCrew": "Mateys"
+    "HeaderCastCrew": "Mateys",
+    "Add": "Upend",
+    "Actor": "Privateer",
+    "AccessRestrictedTryAgainLater": "Ye arn't appearin' on the list o' the livin'!",
+    "ButtonSyncPlay": "SyncPlay",
+    "AddedOnValue": "Upended {0}",
+    "AddToCollection": "Add to ye collection"
 }
diff --git a/src/strings/pt-br.json b/src/strings/pt-br.json
index e1e8acfc31..1f3c160c12 100644
--- a/src/strings/pt-br.json
+++ b/src/strings/pt-br.json
@@ -564,7 +564,7 @@
     "LabelDynamicExternalId": "Id de {0}:",
     "LabelEasyPinCode": "Código pin fácil:",
     "LabelEmbedAlbumArtDidl": "Arte do álbum incorporada no Didl",
-    "LabelEmbedAlbumArtDidlHelp": "Alguns dispositivos preferem este método para obter a arte do álbum. Outros podem falhar ao reproduzir com esta opção ativada.",
+    "LabelEmbedAlbumArtDidlHelp": "Alguns dispositivos preferem este método para obter a arte do álbum. Outros podem falhar para reproduzir com esta opção ativada.",
     "LabelEnableAutomaticPortMap": "Ativar mapeamento automático de portas",
     "LabelEnableAutomaticPortMapHelp": "Tentar mapear automaticamente a porta pública para a porta local do seu servidor através de UPnP. Pode não funcionar em alguns modelos de roteadores. As mudanças não serão aplicadas até a reinicialização do servidor.",
     "LabelEnableBlastAliveMessages": "Mensagens ao vivo",
@@ -601,7 +601,7 @@
     "LabelH264Crf": "CRF de codificação H264:",
     "LabelEncoderPreset": "Preset de codificação H264:",
     "LabelHardwareAccelerationType": "Aceleração de hardware:",
-    "LabelHardwareAccelerationTypeHelp": "Aceleração por hardware requer configurações adicionais.",
+    "LabelHardwareAccelerationTypeHelp": "A aceleração de hardware requer configuração adicional.",
     "LabelHomeNetworkQuality": "Qualidade da rede local:",
     "LabelHomeScreenSectionValue": "Seção {0} da tela inicial:",
     "LabelHttpsPort": "Número da porta local de HTTPS:",
@@ -626,7 +626,7 @@
     "LabelKodiMetadataEnablePathSubstitution": "Ativar substituição de local",
     "LabelKodiMetadataEnablePathSubstitutionHelp": "Ativa a substituição do local das imagens usando as configurações de substituição de local do servidor.",
     "LabelKodiMetadataSaveImagePaths": "Salvar o local das imagens dentro dos arquivos nfo",
-    "LabelKodiMetadataSaveImagePathsHelp": "Isto é recomendado se os nomes dos arquivos de imagem não estão de acordo com as exigências do Kodi.",
+    "LabelKodiMetadataSaveImagePathsHelp": "Isto é recomendado se os nomes dos arquivos de imagem não estão de acordo com as recomendações do Kodi.",
     "LabelKodiMetadataUser": "Salvar informações do que o usuário assiste aos NFO's para:",
     "LabelKodiMetadataUserHelp": "Salva os dados para arquivos NFO para que outras aplicações possam usar.",
     "LabelLanNetworks": "Redes LAN:",
@@ -662,7 +662,7 @@
     "LabelMethod": "Método:",
     "LabelMinBackdropDownloadWidth": "Tamanho mínimo da imagem de fundo para download:",
     "LabelMinResumeDuration": "Duração mínima para retomar:",
-    "LabelMinResumeDurationHelp": "Tempo mínimo do vídeo em segundos que permitirá continuar a reprodução a partir do ponto que parou.",
+    "LabelMinResumeDurationHelp": "A menor duração de vídeo em segundos que salvará o local de reprodução e permitirá que retome.",
     "LabelMinResumePercentage": "Porcentagem mínima para retomar:",
     "LabelMinResumePercentageHelp": "Títulos são considerados como não reproduzidos se parados antes deste tempo.",
     "LabelMinScreenshotDownloadWidth": "Tamanho mínimo da captura de tela para download:",
@@ -676,7 +676,7 @@
     "LabelMoviePrefixHelp": "Se os títulos dos filmes devem ter um prefixo, digite-o aqui para que o servidor possa usá-lo corretamente.",
     "LabelMovieRecordingPath": "Local de gravação de filme (opcional):",
     "LabelMusicStreamingTranscodingBitrate": "Bitrate da transcodificação de músicas:",
-    "LabelMusicStreamingTranscodingBitrateHelp": "Especifique uma taxa de bits máxima ao transmitir músicas.",
+    "LabelMusicStreamingTranscodingBitrateHelp": "Define o bitrate máximo do streaming de músicas.",
     "LabelName": "Nome:",
     "LabelNewName": "Novo nome:",
     "LabelNewPassword": "Nova senha:",
@@ -882,7 +882,7 @@
     "MessageNoAvailablePlugins": "Não existem plugins disponíveis.",
     "MessageNoMovieSuggestionsAvailable": "Não existem sugestões de filmes disponíveis atualmente. Comece a assistir e avaliar seus filmes e então retorne para ver suas recomendações.",
     "MessageNoPluginsInstalled": "Você não tem plugins instalados.",
-    "MessageNoTrailersFound": "Nenhum trailer encontrado. Instale o canal Trailer para melhorar sua experiência com filmes, adicionando uma biblioteca de trailers da internet.",
+    "MessageNoTrailersFound": "Instale o canal de trailers para melhorar sua experiência com filmes, adicionando uma biblioteca de trailers da internet.",
     "MessageNothingHere": "Nada aqui.",
     "MessagePasswordResetForUsers": "As senhas foram removidas dos seguintes usuários. Para entrar, eles devem acessar com o código pin usado para fazer a redefinição de senha.",
     "MessagePlayAccessRestricted": "A reprodução para este conteúdo está atualmente restrita. Por favor, contate o administrador do servidor para mais informações.",
@@ -1132,7 +1132,6 @@
     "ReplaceAllMetadata": "Substituir todos os metadados",
     "ReplaceExistingImages": "Substituir imagens existentes",
     "RequiredForAllRemoteConnections": "Necessário para todas as conexões remotas",
-    "RestartPleaseWaitMessage": "Por favor, aguarde enquanto o Servidor Jellyfin reinicia. Isto pode levar um ou dois minutos.",
     "ResumeAt": "Retomar de {0}",
     "Rewind": "Retroceder",
     "RunAtStartup": "Executar ao iniciar",
@@ -1324,7 +1323,7 @@
     "Horizontal": "Horizontal",
     "LabelAbortedByServerShutdown": "(Abortado devido ao desligamento do servidor)",
     "LabelCache": "Cache:",
-    "LabelLogs": "Logs:",
+    "LabelLogs": "Registros:",
     "LabelProfileCodecs": "Codecs:",
     "LabelSkin": "Tema:",
     "LabelStatus": "Status:",
@@ -1350,7 +1349,6 @@
     "HeaderFavoriteSongs": "Músicas favoritas",
     "HeaderFavoriteVideos": "Videos favoritos",
     "HeaderHome": "Inicio",
-    "HeaderRestartingServer": "Reiniciando servidor",
     "LabelAuthProvider": "Provedor de autenticação:",
     "LabelServerName": "Nome do servidor:",
     "LabelTranscodePath": "Pasta de transcodificação:",
@@ -1456,7 +1454,6 @@
     "MessageConfirmAppExit": "Você quer sair?",
     "LabelVideoResolution": "Resolução de vídeo:",
     "LabelStreamType": "Tipo de stream:",
-    "EnableFastImageFadeIn": "Fade-in rápido da imagem",
     "LabelPlayerDimensions": "Dimensões do player:",
     "LabelCorruptedFrames": "Quadros corrompidos:",
     "HeaderNavigation": "Navegação",
@@ -1465,7 +1462,6 @@
     "AskAdminToCreateLibrary": "Peça a um administrador para criar uma biblioteca.",
     "AllowFfmpegThrottling": "Transcodes do Acelerador",
     "PlaybackErrorNoCompatibleStream": "Este cliente não é compatível com a media e o servidor não está enviando um formato de mídia compatível.",
-    "EnableFastImageFadeInHelp": "Mostrar pôsteres e outras imagens com uma animação mais rápida ao terminar de carregar.",
     "LabelDroppedFrames": "Quadros caídos:",
     "AllowFfmpegThrottlingHelp": "Quando uma transcodificação ou remux estiver suficientemente avançada da posição atual de reprodução, pause o processo para que consuma menos recursos. Isso é mais proveitoso para quando não há avanço ou retrocesso do vídeo com frequência. Desative se tiver problemas de reprodução.",
     "PreferEmbeddedEpisodeInfosOverFileNames": "Preferir informações dos episódios incorporadas nos arquivos ao invés dos nomes",
@@ -1515,14 +1511,14 @@
     "LabelNightly": "Nightly",
     "LabelStable": "Estável",
     "LabelChromecastVersion": "Versão do Chromecast",
-    "LabelEnableHttpsHelp": "Habilita que o servidor escute na porta HTTPS configurada. Um certificado válido também deve ser configurado para que isso entre em vigor.",
+    "LabelEnableHttpsHelp": "Permite que o servidor escute na porta HTTPS configurada. Um certificado válido também deve ser configurado para que isso entre em vigor.",
     "LabelEnableHttps": "Habilitar HTTPS",
     "HeaderServerAddressSettings": "Configurações da localização do servidor",
     "HeaderRemoteAccessSettings": "Configurações de acesso remoto",
     "HeaderHttpsSettings": "Configurações HTTPS",
     "HeaderDVR": "DVR",
     "LabelSyncPlayTimeOffset": "Diferença de tempo com o servidor:",
-    "SyncPlayAccessHelp": "Selecione o nível de acesso desse usuário aos recursos do SyncPlay. SyncPlay habilita a reprodução sincronizada com outros usuários.",
+    "SyncPlayAccessHelp": "Selecione o nível de acesso desse usuário aos recursos do SyncPlay. SyncPlay habilita a reprodução sincronizada com outros dispositivos.",
     "MessageSyncPlayErrorMedia": "Falha ao ativar SyncPlay! Erro de mídia.",
     "MessageSyncPlayErrorMissingSession": "Falha ao ativar SyncPlay! Sessão em falta.",
     "MessageSyncPlayErrorNoActivePlayer": "Nenhum reprodutor ativo encontrado. SyncPlay foi desativado.",
@@ -1533,7 +1529,7 @@
     "MessageSyncPlayGroupDoesNotExist": "Falha ao participar de grupo pois o mesmo não existe.",
     "MessageSyncPlayPlaybackPermissionRequired": "É necessária permissão de reprodução.",
     "MessageSyncPlayNoGroupsAvailable": "Nenhum grupo disponível. Comece a reproduzir algo primeiro.",
-    "MessageSyncPlayGroupWait": "<b>{0}</b> está carregando...",
+    "MessageSyncPlayGroupWait": "<b>{0}</b> está carregando. . .",
     "MessageSyncPlayUserLeft": "<b>{0}</b> deixou o grupo.",
     "MessageSyncPlayUserJoined": "<b>{0}</b> se juntou ao grupo.",
     "MessageSyncPlayDisabled": "SyncPlay desativado.",
@@ -1552,5 +1548,29 @@
     "HeaderSyncPlayEnabled": "SyncPlay ativado",
     "HeaderSyncPlaySelectGroup": "Entrar em um grupo",
     "EnableDetailsBanner": "Banner de detalhes",
-    "EnableDetailsBannerHelp": "Exibe um banner na parte superior da página de detalhes do item."
+    "EnableDetailsBannerHelp": "Exibe um banner na parte superior da página de detalhes do item.",
+    "EnableBlurhashHelp": "Imagens que ainda estão carregando vão mostrar em seu lugar representações",
+    "EnableBlurhash": "Habilitar efeito borrado para imagens previas",
+    "ShowMore": "Mostrar mais",
+    "ShowLess": "Mostrar menos",
+    "ButtonSyncPlay": "SyncPlay",
+    "ButtonCast": "Elenco",
+    "MessageNoGenresAvailable": "Habilitar alguns provedores de metadados a baixar gêneros da internet.",
+    "EnableFasterAnimationsHelp": "Usar animações e transições mais rápidas",
+    "EnableFasterAnimations": "Animações mais rápidas",
+    "EnableDecodingColorDepth10Vp9": "Habilitar decodificação de hardware de 10 bits para VP9",
+    "EnableDecodingColorDepth10Hevc": "Habilitar decodificação de hardware de 10 bits para HEVC",
+    "TabRepositories": "Repositórios",
+    "MessageAddRepository": "Se você deseja adicionar um repositório, clique no botão próximo ao cabeçalho e preencha as informações requisitadas.",
+    "LabelRepositoryNameHelp": "Um nome personalizado para distinguir esse repositório dos outros adicionados ao seu servidor.",
+    "LabelRepositoryName": "Nome do repositório",
+    "LabelRepositoryUrlHelp": "A localização do manifesto do repositório que você deseja incluir.",
+    "LabelRepositoryUrl": "URL do repositório",
+    "HeaderNewRepository": "Novo repositório",
+    "MessageNoRepositories": "Não há repositórios.",
+    "ButtonPlayer": "Reprodutor",
+    "Writers": "Escritores",
+    "ClearQueue": "Limpar fila",
+    "StopPlayback": "Parar reprodução",
+    "ViewAlbumArtist": "Ver artista do álbum"
 }
diff --git a/src/strings/pt-pt.json b/src/strings/pt-pt.json
index 981b7a7b41..b482189ffb 100644
--- a/src/strings/pt-pt.json
+++ b/src/strings/pt-pt.json
@@ -320,7 +320,7 @@
     "LabelEmbedAlbumArtDidl": "Incorporar a capa do álbum no DIDL",
     "LabelEmbedAlbumArtDidlHelp": "Alguns dispositivos preferem este método para obter a capa do álbum. Noutros pode falhar a reprodução com esta opção ativada.",
     "LabelEnableAutomaticPortMap": "Ativar mapeamento automático de portas",
-    "LabelEnableAutomaticPortMapHelp": "Tenta mapear automaticamente o porto público para o porto local através de UPnP. Isto poderá não funcionar em alguns modelos de routers.",
+    "LabelEnableAutomaticPortMapHelp": "Automaticamente encaminha o porto público para o porto local através de UPnP.  Isto poderá não funcionar em alguns modelos de routers ou devido às configurações da rede. As alterações só serão aplicadas após o reiniciar do servidor",
     "LabelEnableBlastAliveMessages": "Enviar mensagens de reconhecimento",
     "LabelEnableBlastAliveMessagesHelp": "Ativar esta opção se o servidor não for convenientemente detetado por outros dispositivos UPnP na rede.",
     "LabelEnableDlnaClientDiscoveryInterval": "Intervalo para descoberta de clientes (segundos)",
@@ -605,7 +605,7 @@
     "OptionMissingEpisode": "Episódios em Falta",
     "OptionMonday": "Segunda",
     "OptionNameSort": "Nome",
-    "OptionNew": "Nova...",
+    "OptionNew": "Nova…",
     "OptionNone": "Nenhum",
     "OptionOnAppStartup": "Ao iniciar a aplicação",
     "OptionOnInterval": "Num intervalo",
@@ -768,13 +768,13 @@
     "AllowMediaConversion": "Permitir conversão multimédia",
     "AllowMediaConversionHelp": "Permitir ou negar acesso à funcionalidade de conversão multimédia.",
     "AllowOnTheFlySubtitleExtraction": "Permitir a extração de legendas em tempo real",
-    "AllowOnTheFlySubtitleExtractionHelp": "Legendas integradas podem ser extraídas do vídeo e enviadas como texto simples para os clientes para evitar transcodificação. Em certos dispositivos, esta poderá ser uma operação demorada e pode causar paragens de reprodução durante o processo de extração. Desative esta opção para que as legendas sejam integradas no vídeo durante a conversão para um formato suportado pelo dispositivo de destino.",
+    "AllowOnTheFlySubtitleExtractionHelp": "Legendas integradas podem ser extraídas do vídeo e enviadas como texto simples para os clientes para evitar transcodificação. Em certos dispositivos, esta poderá ser uma operação demorada e pode causar interrupções de reprodução durante o processo de extração. Desative esta opção para que as legendas sejam integradas no vídeo durante a conversão para um formato suportado pelo dispositivo de destino.",
     "AllowRemoteAccess": "Permitir ligações remotas a este Jellyfin Server.",
     "AllowRemoteAccessHelp": "Se inativo, todas as ligações remotas serão bloqueadas.",
     "AllowedRemoteAddressesHelp": "Lista de IP ou IP/Máscara, separados por vírgulas, com permissão para se ligar remotamente. Se deixado em branco, todos os endereços remotos serão permitidos.",
-    "AlwaysPlaySubtitles": "Mostrar sempre legendas",
+    "AlwaysPlaySubtitles": "Reproduzir Sempre",
     "AlwaysPlaySubtitlesHelp": "Legendas correspondentes à língua preferencial vão ser sempre carregadas, independentemente do idioma do áudio.",
-    "AnyLanguage": "Qualquer idioma",
+    "AnyLanguage": "Qualquer linguagem",
     "Artists": "Artistas",
     "Ascending": "Crescente",
     "AspectRatio": "Proporção",
@@ -785,7 +785,7 @@
     "BirthPlaceValue": "Local de nascimento: {0}",
     "Blacklist": "Lista Negra",
     "Books": "Livros",
-    "BurnSubtitlesHelp": "Determina se o servidor deve integrar as legendas durante a conversão de vídeo, dependendo do formato da legenda. Evitar integração de legendas melhora o desempenho do servidor. Selecione Auto para que legendas baseadas em imagem (VOBSUB, PGS, SUB/IDX), e certos formatos ASS/SSA sejam integrados.",
+    "BurnSubtitlesHelp": "Determina se o servidor deve integrar as legendas durante a conversão de vídeo. Evitar a  integração de legendas melhora o desempenho do servidor. Selecione Auto para que legendas baseadas em imagem (VOBSUB, PGS, SUB/IDX), e certos formatos ASS/SSA sejam integrados.",
     "Channels": "Canais",
     "Collections": "Coleções",
     "Favorites": "Favoritos",
@@ -831,7 +831,7 @@
     "Browse": "Procurar",
     "BoxRear": "Caixa (verso)",
     "Box": "Caixa",
-    "BookLibraryHelp": "Livros de texto e áudio são suportados. Consulte o guia de nomenclatura de livros{1}.",
+    "BookLibraryHelp": "Livros digitais e áudio livros são suportados. Consulte o guia de nomenclatura de livros{1}.",
     "BirthLocation": "Local de nascimento",
     "AsManyAsPossible": "Tantos quanto possível",
     "Art": "Capa",
@@ -963,7 +963,7 @@
     "LabelAbortedByServerShutdown": "(Abortado - Servidor encerrado)",
     "Kids": "Crianças",
     "Items": "Itens",
-    "InstallingPackage": "A instalar {0}",
+    "InstallingPackage": "A instalar {0} (version {1})",
     "HttpsRequiresCert": "Para activar ligações seguras, é necessário fornecer um certificado SSL confiável. Forneça um certificado SSL ou desactive as ligações seguras.",
     "DirectStreamHelp1": "O tipo de multimédia (H.264, AC3, etc.) e a sua resolução são compatíveis com o dispositivo, no entanto, o formato (mkv, avi, wmv, etc.) não é. O conteúdo é reempacotado em tempo real antes de ser enviado para o dispositivo.",
     "DirectPlaying": "Reprodução direta",
@@ -997,7 +997,6 @@
     "Runtime": "Duração",
     "RunAtStartup": "Executar no arranque",
     "ResumeAt": "Retomar a partir de {0}",
-    "RestartPleaseWaitMessage": "Por favor aguarde enquanto o Servidor Jellyfin reinicia. Poderá demorar alguns minutos.",
     "RequiredForAllRemoteConnections": "Necessário para todas as ligações externas",
     "ReplaceAllMetadata": "Substituir todos os metadados",
     "RepeatOne": "Repetir este",
@@ -1042,7 +1041,7 @@
     "HeaderPlayOn": "Reproduzir Em",
     "HeaderNextVideoPlayingInValue": "Reprodução do próximo vídeo a iniciar em {0}",
     "HeaderNextEpisodePlayingInValue": "Reprodução do próximo episódio a iniciar em {0}",
-    "HardwareAccelerationWarning": "Ativar a aceleração por hardware pode causar instabilidade em alguns ambientes. Garanta que o sistema operativo e os controladores da placa gráfica estão completamente atualizados. Se tiver dificuldades em reproduzir vídeo depois de alterar esta opção, pode ser necessário repôr em \\\"Auto\\\".",
+    "HardwareAccelerationWarning": "Ativar a aceleração por hardware pode causar instabilidade em alguns ambientes. Garanta que o sistema operativo e os controladores da placa gráfica estão completamente atualizados. Se tiver dificuldades em reproduzir vídeo depois de alterar esta opção, pode ser necessário repôr as definições para o parâmetro \\\"Nenhum\\\".",
     "Display": "Visualização",
     "ManageLibrary": "Gerir biblioteca",
     "HeaderLibraryOrder": "Ordenação da Biblioteca",
@@ -1103,7 +1102,7 @@
     "HeaderNewDevices": "Novos Dispositivos",
     "HeaderRecordingOptions": "Opções de Gravação",
     "HeaderSortOrder": "Direção de Ordenação",
-    "LabelBaseUrlHelp": "Pode adicionar uma sub-pasta personalizada aqui para aceder ao servidor através de um URL mais direto.",
+    "LabelBaseUrlHelp": "Adiciona  uma sub-pasta personalizada ao URL do servidor. Por exemplo: <code>http://exemplo.com/<b>&lt;baseurl&gt;</b></code>",
     "LabelMoviePrefixHelp": "Se aplicar um prefixo aos títulos dos filmes, introduza-o aqui para que o servidor consiga tratá-los corretamente.",
     "LabelPleaseRestart": "As alterações produzirão efeito depois de recarregar a página web.",
     "LabelRecordingPathHelp": "Especifique a localização por defeito para guardar as gravações. Se for deixado em branco, será utilizada a pasta base do servidor.",
@@ -1113,7 +1112,7 @@
     "HeaderMusicQuality": "Qualidade da Música",
     "HeaderMyDevice": "O Meu Dispositivo",
     "HeaderSortBy": "Ordenar Por",
-    "LabelOptionalNetworkPathHelp": "Se esta pasta estiver partilhada na rede, fornecer o caminho de rede pode permitir aos clientes aceder diretamente aos ficheiros multimédia.",
+    "LabelOptionalNetworkPathHelp": "Se esta pasta estiver partilhada na rede, fornecer o caminho de rede pode permitir aos clientes aceder diretamente aos ficheiros multimédia. For example, {0} or {1}.",
     "LabelPersonRoleHelp": "Exemplo: motorista da carrinha de gelados",
     "LabelPlayer": "Reprodutor:",
     "LabelServerName": "Nome do servidor:",
@@ -1182,7 +1181,6 @@
     "CopyStreamURL": "Copiar URL da transmissão",
     "Disc": "Disco",
     "EnableBackdrops": "Imagens de Fundo",
-    "HeaderRestartingServer": "A reiniciar o Servidor",
     "HeaderTags": "Etiquetas",
     "LabelLogs": "Registos:",
     "LabelSortTitle": "Título para ordenação:",
@@ -1328,7 +1326,7 @@
     "No": "Não",
     "OptionRegex": "Expressão Regular",
     "OptionCaptionInfoExSamsung": "CaptionInfoEx (Samsung)",
-    "NoSubtitles": " Sem legendas",
+    "NoSubtitles": "Sem legendas",
     "NoSubtitleSearchResultsFound": "Sem resultados.",
     "NoNewDevicesFound": "Não foi encontrado nenhum dispositivo novo. Para adicionar um novo sintonizador, feche este diálogo e introduza manualmente as informações do dispositivo.",
     "NextUp": "A Seguir",
@@ -1339,7 +1337,7 @@
     "Name": "Nome",
     "MusicVideo": "Videoclip",
     "MusicArtist": "Artista de Música",
-    "MusicAlbum": " Álbum de Música",
+    "MusicAlbum": "Álbum de Música",
     "MoreMediaInfo": "Informações",
     "MediaInfoBitrate": "Taxa de Bits",
     "LabelUserAgent": "User-Agent:",
@@ -1454,5 +1452,55 @@
     "AllowFfmpegThrottlingHelp": "Suspende o processo de transcodificação assim que este avance o suficiente após o ponto de reprodução atual, para poupança de recursos. Esta funcionalidade é mais útil quando a reprodução é maioritariamente contínua, sem avançar ou recuar manualmente. Desative esta opção caso haja problemas de reprodução.",
     "AllowFfmpegThrottling": "Reduzir Taxa de Transcodificação",
     "PreferEmbeddedTitlesOverFileNamesHelp": "Determina o título a apresentar por defeito quando não é possível carregar metadados locais nem da Internet.",
-    "OptionSaveMetadataAsHiddenHelp": "Alterar esta definição apenas afetará metadados guardados futuramente. Ficheiros existentes serão atualizados assim que forem alterados pelo Servidor Jellyfin."
+    "OptionSaveMetadataAsHiddenHelp": "Alterar esta definição apenas afetará metadados guardados futuramente. Ficheiros existentes serão atualizados assim que forem alterados pelo Servidor Jellyfin.",
+    "ButtonSyncPlay": "SyncPlay",
+    "LabelRepositoryUrl": "URL do Repositório",
+    "HeaderNewRepository": "Novo Repositório",
+    "MessageNoRepositories": "Sem repositórios.",
+    "MessageUnauthorizedUser": "Não está autorizado a aceder ao servidor neste momento. Por favor contacte o administador deste servidor para informação mais detalhada.",
+    "LabelSyncPlayAccess": "Acesso \"SyncPlay\"",
+    "LabelSyncPlayAccessNone": "Desativar para este utilizador",
+    "LabelSyncPlayAccessJoinGroups": "Permitir utilizador a aderir a grupos",
+    "LabelSyncPlayAccessCreateAndJoinGroups": "Autorizar utilizadores a criar e aderir a grupos",
+    "LabelSyncPlayLeaveGroupDescription": "Desativar \"SyncPlay\"",
+    "LabelSyncPlayLeaveGroup": "Abandonar grupo",
+    "LabelSyncPlayNewGroupDescription": "Criar novo grupo",
+    "LabelSyncPlayNewGroup": "Novo grupo",
+    "LabelSyncPlaySyncMethod": "Método de Sincronização:",
+    "LabelSyncPlayPlaybackDiff": "Diferença no tempo de Reprodução:",
+    "MillisecondsUnit": "ms",
+    "LabelSyncPlayTimeOffset": "Diferença de tempo com o servidor:",
+    "EnableFasterAnimationsHelp": "Utilizar animações e transições mais rápidas",
+    "EnableFasterAnimations": "Animações Rápidas",
+    "LabelRequireHttpsHelp": "Se selecionado, o servidor irá automaticamente redirecionar todos os pedidos em HTTP para HTTPS. Isto não surte efeito caso o servidor não esteja configurado em HTTPS.",
+    "LabelRequireHttps": "Exigir HTTPS",
+    "LabelNightly": "\"Nightly\"",
+    "LabelStable": "Estável",
+    "LabelChromecastVersion": "Versão do \"Chromecast\"",
+    "LabelLibraryPageSizeHelp": "Define a quantidade de items a apresentar na página de uma Biblioteca. Para desativar a existência de paginação, introduza o valor 0.",
+    "LabelLibraryPageSize": "Tamanho da página da Biblioteca:",
+    "LabelEnableHttpsHelp": "Permite que o servidor escute na porta HTTPS configurada. Um certificado válido também deve ser configurado para que isso entre em vigor.",
+    "LabelEnableHttps": "Ativar HTTPS",
+    "LabelDeinterlaceMethod": "Método de desentrelaçamento:",
+    "HeaderSyncPlayEnabled": "SyncPlay ativado",
+    "HeaderSyncPlaySelectGroup": "Aderir a um grupo",
+    "HeaderServerAddressSettings": "Definições da Localização do Servidor",
+    "HeaderRemoteAccessSettings": "Definições do Acesso Remoto",
+    "HeaderHttpsSettings": "Definições de HTTPS",
+    "HeaderFavoritePlaylists": "Listas de Reprodução Favoritas",
+    "HeaderDVR": "Gravações (DVR)",
+    "ApiKeysCaption": "Lista das chaves de API atualmente ativadas",
+    "Episode": "Episódio",
+    "EnableDetailsBannerHelp": "Mostra uma imagem no topo da página dos detalhes do item.",
+    "EnableDetailsBanner": "Cartaz de Detalhes",
+    "EnableDecodingColorDepth10Vp9": "Ativar descodificação de hardware de 10-Bits para VP9",
+    "EnableDecodingColorDepth10Hevc": "Ativar descodificação de hardware de 10-Bits para HEVC",
+    "DeinterlaceMethodHelp": "Selecionar um método de desentrelaçamento para converter conteúdo entrelaçado.",
+    "ClientSettings": "Definições do Cliente",
+    "ButtonTogglePlaylist": "Lista de Reprodução",
+    "ButtonToggleContextMenu": "Mais",
+    "BoxSet": "Coleção",
+    "Artist": "Artista",
+    "AlbumArtist": "Artista do Álbum",
+    "Album": "Álbum"
 }
diff --git a/src/strings/pt.json b/src/strings/pt.json
index e05e5bf668..9d6f3faf37 100644
--- a/src/strings/pt.json
+++ b/src/strings/pt.json
@@ -1,7 +1,6 @@
 {
     "HeaderTypeImageFetchers": "{0} Pesquisadores de Imagens",
     "HeaderSubtitleDownloads": "Transferências de Legendas",
-    "HeaderRestartingServer": "A reiniciar o servidor",
     "HeaderKodiMetadataHelp": "Para ativar ou desativar metadados, editar uma biblioteca nas configurações e localizar a seção dos metadados.",
     "HeaderFetcherSettings": "Definições do Pesquisador",
     "HeaderFavoritePeople": "Pessoas Preferidas",
@@ -121,7 +120,6 @@
     "RunAtStartup": "Executar no arranque",
     "Rewind": "Retroceder",
     "ResumeAt": "Retomar a partir de {0}",
-    "RestartPleaseWaitMessage": "Por favor aguarde enquanto o Servidor Jellyfin reinicia. Isto poderá demorar alguns minutos.",
     "RequiredForAllRemoteConnections": "Necessário para todas as ligações externas",
     "ReplaceExistingImages": "Substituir imagens existentes",
     "ReplaceAllMetadata": "Substituir todos os metadados",
@@ -1102,13 +1100,13 @@
     "AllowedRemoteAddressesHelp": "Lista separada por vírgula de endereços IP ou entradas de máscara de IP/rede para redes que terão permissão para se conectar remotamente. Se deixado em branco, todos os endereços remotos serão permitidos.",
     "AllowRemoteAccessHelp": "Se desmarcada, todas as conexões remotas serão bloqueadas.",
     "AllowRemoteAccess": "Permitir ligações remotas a este Servidor Jellyfin.",
-    "AllowOnTheFlySubtitleExtractionHelp": "Legendas integradas podem ser extraídas do vídeo e enviadas como texto simples para os clientes para evitar transcodificação. Em certos dispositivos,  é uma operação demorada e pode causar paragens de reprodução durante o processo de extracção. Desactive esta opção para que as legendas sejam integradas no vídeo durante a conversão para um formato suportado pelo dispositivo de destino.",
+    "AllowOnTheFlySubtitleExtractionHelp": "Legendas integradas podem ser extraídas do vídeo e enviadas como texto simples para os clientes de forma a evitar transcodificação. Em certos dispositivos, esta operação pode demorar algum tempo e causar paragens de reprodução durante o processo de extração. Desative esta opção para que as legendas sejam integradas no vídeo durante a conversão para um formato suportado pelo dispositivo de destino.",
     "AllowOnTheFlySubtitleExtraction": "Permitir a extração de legendas em tempo real",
     "AllowHWTranscodingHelp": "Permita que o sintonizador transcodifique os fluxos em tempo real. Isso pode ajudar a reduzir a transcodificação exigida pelo servidor.",
     "AllLibraries": "Todas as bibliotecas",
     "AllLanguages": "Todos os idiomas",
     "AllEpisodes": "Todos os episódios",
-    "AllComplexFormats": "Todos os formatos complexos (ASS, SSA, VOBSUB, PGS, SUB/IDX, etc.)",
+    "AllComplexFormats": "Todos os formatos complexos (ASS, SSA, VOBSUB, PGS, SUB, IDX, etc.)",
     "AllChannels": "Todos os canais",
     "All": "Todos",
     "Alerts": "Alertas",
@@ -1314,8 +1312,6 @@
     "LabelSortOrder": "Ordem de classificação:",
     "LabelSortBy": "Ordenar por:",
     "LabelSkin": "Pele:",
-    "EnableFastImageFadeInHelp": "Habilite uma animação mais rápida para imagens carregadas",
-    "EnableFastImageFadeIn": "Efeito de imagem fade-in rápido",
     "LabelRemoteClientBitrateLimitHelp": "Um limite opcional de taxa de bits por fluxo para todos os dispositivos fora da rede. Isso é útil para impedir que os dispositivos solicitem uma taxa de bits mais alta do que a sua conexão à Internet pode suportar. Isso pode resultar no aumento da carga da CPU no servidor para transcodificar vídeos em tempo real para uma taxa de bits mais baixa.",
     "LabelPlayerDimensions": "Dimensões do reprodutor:",
     "LabelParentNumber": "Número pai:",
@@ -1420,5 +1416,6 @@
     "HeaderDVR": "DVR",
     "ApiKeysCaption": "Lista das chaves de API ativadas no momento",
     "ButtonTogglePlaylist": "Lista de leitura",
-    "ButtonToggleContextMenu": "Mais"
+    "ButtonToggleContextMenu": "Mais",
+    "ButtonSyncPlay": "SyncPlay"
 }
diff --git a/src/strings/ro.json b/src/strings/ro.json
index 89aeda2ef2..5ed9fda846 100644
--- a/src/strings/ro.json
+++ b/src/strings/ro.json
@@ -250,7 +250,7 @@
     "ButtonSubmit": "Trimite",
     "Collections": "Colecții",
     "AllowRemoteAccess": "Permite conexiuni externe către acest server Jellyfin.",
-    "AllowRemoteAccessHelp": "Dacă este nebifat, toate conexiunile externe vor fi blocate.",
+    "AllowRemoteAccessHelp": "Dacă este neselectat, toate conexiunile externe vor fi blocate.",
     "AlwaysPlaySubtitles": "Întotdeauna arată",
     "AnyLanguage": "Orice Limbă",
     "Anytime": "Oricând",
@@ -493,7 +493,6 @@
     "HeaderRemoveMediaLocation": "Eliminați locația Media",
     "HeaderResponseProfile": "Profilul de răspuns",
     "HeaderRestart": "Repornire",
-    "HeaderRestartingServer": "Se repornește serverul",
     "HeaderRevisionHistory": "Istoricul reviziilor",
     "HeaderRunningTasks": "În desfășurare",
     "HeaderScenes": "Scene",
@@ -1049,7 +1048,7 @@
     "MessagePleaseWait": "Te rog așteaptă. Poate dura un minut.",
     "MessagePlayAccessRestricted": "Redarea acestui conținut este în prezent restricționată. Vă rugăm să contactați administratorul serverului pentru mai multe informații.",
     "MessagePasswordResetForUsers": "Următorii utilizatori au resetat parolele. Acum se pot conecta cu codurile pin care au fost utilizate pentru a efectua resetarea.",
-    "MessageNoTrailersFound": "Nu s-au găsit trailere. Instalați canalul Trailer pentru a îmbunătăți experiența dvs. de film adăugând o bibliotecă de trailere din internet.",
+    "MessageNoTrailersFound": "Instalați canalul Trailer pentru a îmbunătăți experiența dvs. de film adăugând o bibliotecă de trailere din internet.",
     "MessageNoServersAvailable": "Nu au fost găsite servere folosind descoperirea automată de servere.",
     "MessageNoPluginsInstalled": "Nu aveți plugin-uri instalate.",
     "MessageNoMovieSuggestionsAvailable": "În prezent, nu există sugestii de film. Începeți să vizionați și să evaluați filmele, apoi reveniți pentru a vedea recomandările dvs.",
@@ -1227,7 +1226,6 @@
     "RunAtStartup": "Rulați la pornire",
     "Rewind": "Derulează",
     "ResumeAt": "Reluați de la {0}",
-    "RestartPleaseWaitMessage": "Vă rugăm să așteptați cât Jellyfin Server se închide și repornește. Acest lucru poate dura un minut sau două.",
     "RequiredForAllRemoteConnections": "Obligatoriu pentru toate conexiunile distante",
     "ReplaceExistingImages": "Înlocuiți toate imaginile",
     "ReplaceAllMetadata": "Înlocuiți toate metadatele",
@@ -1454,8 +1452,6 @@
     "HeaderNavigation": "Navigare",
     "MessageConfirmAppExit": "Vrei să ieși?",
     "CopyStreamURLError": "A apărut o eroare la copierea adresei URL.",
-    "EnableFastImageFadeInHelp": "Arătați postere și alte imagini cu o animație de tranziție rapidă când sunt deja încărcate.",
-    "EnableFastImageFadeIn": "Animație de Tranziție a Imaginii Rapidă",
     "LabelVideoResolution": "Rezoluția video:",
     "LabelStreamType": "Tipul streamului:",
     "LabelPlayerDimensions": "Dimensiunile soft redare:",
@@ -1531,7 +1527,7 @@
     "MessageSyncPlayGroupDoesNotExist": "Nu a reușit să se alăture grupului, deoarece nu există.",
     "MessageSyncPlayPlaybackPermissionRequired": "Este necesară permisiunea de redare.",
     "MessageSyncPlayNoGroupsAvailable": "Nu există grupuri disponibile. Începe să redai ceva mai întâi.",
-    "MessageSyncPlayGroupWait": "<b>{0}</b> se încarcă...",
+    "MessageSyncPlayGroupWait": "<b>{0}</b> se încarcă…",
     "MessageSyncPlayUserLeft": "<b>{0}</b> a părăsit grupul.",
     "MessageSyncPlayUserJoined": "<b>{0}</b> s-a alăturat grupului.",
     "MessageSyncPlayDisabled": "SyncPlay dezactivat.",
@@ -1551,5 +1547,29 @@
     "HeaderSyncPlayEnabled": "SyncPlay activat",
     "HeaderSyncPlaySelectGroup": "Alăturați-vă unui grup",
     "EnableDetailsBannerHelp": "Afișați o imagine de bandou în partea de sus a paginii cu detalii ale articolului.",
-    "EnableDetailsBanner": "Detalii Bandou"
+    "EnableDetailsBanner": "Detalii Bandou",
+    "EnableBlurhashHelp": "Imaginile care sunt în curs de încărcare vor fi afișate cu un marcaj întinat",
+    "EnableBlurhash": "Activați marcatoarele întinate pentru imagini",
+    "ShowMore": "Arată mai mult",
+    "ShowLess": "Arată mai puțin",
+    "ButtonCast": "Proiectează",
+    "ButtonSyncPlay": "SyncPlay",
+    "MessageNoGenresAvailable": "Permiteți unor furnizori de metadate să tragă genul media de pe internet.",
+    "EnableFasterAnimationsHelp": "Utilizați animații și tranziții mai rapide",
+    "EnableFasterAnimations": "Animații mai rapide",
+    "EnableDecodingColorDepth10Vp9": "Activați decodarea hardware pe 10 biți pentru VP9",
+    "EnableDecodingColorDepth10Hevc": "Activați decodarea hardware pe 10 biți pentru HEVC",
+    "LabelRepositoryName": "Nume Repertoriu",
+    "LabelRepositoryUrlHelp": "Locația manifestului repertoriului pe care doriți să o includeți.",
+    "LabelRepositoryUrl": "URL Repertoriu",
+    "HeaderNewRepository": "Repertoriu Nou",
+    "MessageNoRepositories": "Fără repertoriu.",
+    "ButtonPlayer": "Redare",
+    "Writers": "Scriitori",
+    "TabRepositories": "Repertorii",
+    "MessageAddRepository": "Dacă doriți să adăugați un repertoriu, faceți clic pe butonul de lângă antet și completați informațiile solicitate.",
+    "LabelRepositoryNameHelp": "Un nume personalizat pentru a distinge acest repertoriu de altele adăugate la serverul dvs.",
+    "ClearQueue": "Golește lista de redare",
+    "StopPlayback": "Oprește redarea",
+    "ViewAlbumArtist": "Vezi artistul albumului"
 }
diff --git a/src/strings/ru.json b/src/strings/ru.json
index 4a7e2aa8ab..9212ee4fb4 100644
--- a/src/strings/ru.json
+++ b/src/strings/ru.json
@@ -669,7 +669,7 @@
     "LabelMaxResumePercentageHelp": "Произведения предполагаются воспроизведёнными полностью, при остановке с данного момента.",
     "LabelMaxScreenshotsPerItem": "Макс. число снимков экрана на элемент:",
     "LabelMaxStreamingBitrate": "Макс. качество трансляции:",
-    "LabelMaxStreamingBitrateHelp": "Укажите макс. потоковую скорость трансляции.",
+    "LabelMaxStreamingBitrateHelp": "Укажите максимальный битрейт трансляции.",
     "LabelMessageText": "Текст сообщения:",
     "LabelMessageTitle": "Заголовок сообщения:",
     "LabelMetadata": "Метаданные:",
@@ -697,8 +697,8 @@
     "LabelMoviePrefix": "Префикс фильма:",
     "LabelMoviePrefixHelp": "При применении к названиям фильмов префикса, введите его здесь, чтобы он правильно обрабатывался на сервере.",
     "LabelMovieRecordingPath": "Путь к записываемым фильмам (необязательно):",
-    "LabelMusicStreamingTranscodingBitrate": "Поток. скорость перекодировки музыки:",
-    "LabelMusicStreamingTranscodingBitrateHelp": "Укажите максимальную потоковую скорость при трансляции музыки.",
+    "LabelMusicStreamingTranscodingBitrate": "Битрейт перекодировки музыки:",
+    "LabelMusicStreamingTranscodingBitrateHelp": "Укажите максимальный битрейт при трансляции музыки.",
     "LabelName": "Имя:",
     "LabelNewName": "Новое название:",
     "LabelNewPassword": "Новый пароль:",
@@ -752,8 +752,8 @@
     "LabelRecordingPathHelp": "Укажите стандартное расположение для сохранения записей. Если поле пусто, то используется папка program data сервера.",
     "LabelRefreshMode": "Режим обновления:",
     "LabelReleaseDate": "Дата выпуска:",
-    "LabelRemoteClientBitrateLimit": "Предел потоковой скорости интернет-трансляции, Мбит/с:",
-    "LabelRemoteClientBitrateLimitHelp": "Необязательный предел скорости на поток для каждого из сетевых устройств. Это целесообразно, чтобы не допускать запрашивание устройствами более высокой скорости, чем способно пропустить интернет-соединение. Это может привести к увеличению загрузки процессора на вашем сервере, при динамическом перекодировании видео до более низкой скорости.",
+    "LabelRemoteClientBitrateLimit": "Ограничение битрейта интернет-трансляции, Мбит/с:",
+    "LabelRemoteClientBitrateLimitHelp": "Необязательное ограничение битрейта для каждого из сетевых устройств. Может потребоваться, чтобы не допускать использования устройствами большего битрейта, чем способно пропустить интернет-соединение. Может привести к росту загрузки процессора на вашем сервере, так как потребуется динамическое перекодирование видео для снижения битрейта.",
     "LabelRuntimeMinutes": "Длительность, мин:",
     "LabelSaveLocalMetadata": "Сохранять иллюстрации внутри медиапапок",
     "LabelSaveLocalMetadataHelp": "При сохранении иллюстраций внутри медиапапок, те помещаются в месте, где их можно легко править.",
@@ -824,7 +824,7 @@
     "LabelUserAgent": "Агент пользователя:",
     "LabelUserLibrary": "Медиатека пользователя:",
     "LabelUserLibraryHelp": "Выберите, чью медиатеку отображать на устройстве. Не заполняйте, чтобы наследовать параметр по умолчанию.",
-    "LabelUserRemoteClientBitrateLimitHelp": "Переопределияются глобальные значения по умолчанию, установленные в параметрах воспроизведения сервера.",
+    "LabelUserRemoteClientBitrateLimitHelp": "Переопределяются глобальные значения по умолчанию, установленные в параметрах воспроизведения сервера.",
     "LabelUsername": "Имя пользователя:",
     "LabelVaapiDevice": "Устройство VA-API:",
     "LabelVaapiDeviceHelp": "Это является узлом отрисовки, который используется для аппаратного ускорения.",
@@ -864,7 +864,7 @@
     "MediaInfoAnamorphic": "Анаморфность",
     "MediaInfoAspectRatio": "Соотношение сторон",
     "MediaInfoBitDepth": "Глубина цвета",
-    "MediaInfoBitrate": "Поток. ск-ть",
+    "MediaInfoBitrate": "Битрейт",
     "MediaInfoChannels": "Каналы",
     "MediaInfoCodec": "Кодек",
     "MediaInfoCodecTag": "Тег кодека",
@@ -919,7 +919,7 @@
     "MessageNoAvailablePlugins": "Плагинов не имеется.",
     "MessageNoMovieSuggestionsAvailable": "В настоящее время предложений фильмов не имеются. Начните смотреть и оценивать свои фильмы, а затем вернитесь, чтобы просмотреть рекомендации.",
     "MessageNoPluginsInstalled": "Нет установленных плагинов.",
-    "MessageNoTrailersFound": "Трейлеры не найдены. Установите канал трейлеров, чтобы повысить своё впечатление от фильма путём добавления собрания интернет-трейлеров.",
+    "MessageNoTrailersFound": "Установите канал трейлеров, чтобы повысить своё впечатление от фильма путём добавления собрания интернет-трейлеров.",
     "MessageNothingHere": "Здесь ничего нет.",
     "MessagePasswordResetForUsers": "Следующие пользователи сбросили свои пароли. Теперь они могут войти с помощью PIN-кодов, которые использовались для сброса.",
     "MessagePlayAccessRestricted": "Воспроизведение данного содержания в настоящее время ограничено. За дополнительными сведениями обратитесь к администратору сервера.",
@@ -1183,7 +1183,6 @@
     "ReplaceAllMetadata": "Замена всех метаданных",
     "ReplaceExistingImages": "Замена имеющихся изображений",
     "RequiredForAllRemoteConnections": "Требуется для всех внешних подключений",
-    "RestartPleaseWaitMessage": "Подождите, пока Jellyfin Server выключится и перезапустится. Это может занять минуту или две.",
     "ResumeAt": "Возобновить с {0}",
     "Rewind": "Отмотать",
     "RunAtStartup": "Запускать при старте системы",
@@ -1388,7 +1387,6 @@
     "HeaderFavoriteSongs": "Избранные композиции",
     "HeaderFavoriteVideos": "Избранные видео",
     "HeaderHome": "Главное",
-    "HeaderRestartingServer": "Перезапустить сервер",
     "LabelAuthProvider": "Поставщик аутентификации:",
     "LabelPasswordResetProvider": "Поставщик сброса пароля:",
     "LabelServerName": "Имя сервера:",
@@ -1433,7 +1431,7 @@
     "LabelPlayer": "Проигрыватель:",
     "MoreMediaInfo": "О медиаданных",
     "LabelVideoCodec": "Видео кодек:",
-    "LabelVideoBitrate": "Потоковая скорость аудио:",
+    "LabelVideoBitrate": "Битрейт видео:",
     "LabelTranscodingProgress": "Прогресс перекодировки:",
     "LabelTranscodingFramerate": "Частота кадров перекодировки:",
     "LabelSize": "Размер:",
@@ -1444,7 +1442,7 @@
     "LabelAudioSampleRate": "Частота дискретизации аудио:",
     "LabelAudioCodec": "Аудио кодек:",
     "LabelAudioChannels": "Аудио каналы:",
-    "LabelAudioBitrate": "Потоковая скорость аудио:",
+    "LabelAudioBitrate": "Битрейт аудио:",
     "LabelAudioBitDepth": "Битовая глубина аудио:",
     "HeaderFavoriteBooks": "Избранные книги",
     "CopyStreamURL": "Копировать URL потока",
@@ -1460,8 +1458,6 @@
     "HeaderNavigation": "Навигация",
     "LabelVideoResolution": "Разрешение видео:",
     "LabelStreamType": "Тип потока:",
-    "EnableFastImageFadeInHelp": "Показывать постеры и другие рисунки анимацией побыстрее , когда они закончат загружаться.",
-    "EnableFastImageFadeIn": "Быстрое анимация рисунка",
     "LabelPlayerDimensions": "Размеры проигрывателя:",
     "LabelDroppedFrames": "Пропущенные кадры:",
     "LabelCorruptedFrames": "Испорченные кадры:",
@@ -1508,7 +1504,7 @@
     "MessageUnauthorizedUser": "В настоящее время у вас нет доступа к серверу. Пожалуйста, свяжитесь с администратором сервера для получения дополнительной информации.",
     "HeaderFavoritePlaylists": "Избранные плей-листы",
     "LabelRequireHttpsHelp": "Если этот флажок установлен, сервер будет автоматически перенаправлять все запросы через HTTP на HTTPS. Это не имеет никакого эффекта, если сервер не слушает HTTPS.",
-    "LabelEnableHttpsHelp": "Позволяет серверу слушать сконфигурированный HTTPS-порт. Действительный сертификат также должен быть сконфигурирован для того, чтобы это вступило в силу.",
+    "LabelEnableHttpsHelp": "Позволяет серверу слушать HTTPS-порт. Для работы необходим действующий сертификат.",
     "ApiKeysCaption": "Список действующих текущих API-ключей",
     "TabDVR": "DVR",
     "SaveChanges": "Сохранить изменения",
@@ -1536,7 +1532,7 @@
     "MessageSyncPlayGroupDoesNotExist": "Не удалось присоединиться к группе, поскольку она не существует.",
     "MessageSyncPlayPlaybackPermissionRequired": "Требуется разрешение на воспроизведение.",
     "MessageSyncPlayNoGroupsAvailable": "Никакие группы не доступны. Сначала начните воспроизводить что-нибудь.",
-    "MessageSyncPlayGroupWait": "<b>{0}</b> буферизуется...",
+    "MessageSyncPlayGroupWait": "<b>{0}</b> буферизуется…",
     "MessageSyncPlayUserLeft": "<b>{0}</b> покинул группу.",
     "MessageSyncPlayUserJoined": "<b>{0}</b> присоединил группу.",
     "LabelSyncPlayAccessNone": "Отключено для данного пользователя",
@@ -1549,8 +1545,32 @@
     "LabelSyncPlayPlaybackDiff": "Разница времени воспроизведения:",
     "MillisecondsUnit": "мс",
     "LabelSyncPlayTimeOffset": "Сдвиг времени относительно сервера:",
-    "SyncPlayAccessHelp": "Выберите уровень доступа данного пользователя к функциональности SyncPlay. SyncPlay позволяет синхронизировать воспроизведение с другими устройствами.",
+    "SyncPlayAccessHelp": "Выберите уровень доступа данного пользователя к функции SyncPlay. SyncPlay позволяет синхронизировать воспроизведение с другими устройствами.",
     "MessageSyncPlayErrorMedia": "Не удалось включить SyncPlay! Ошибка медиаданных.",
     "MessageSyncPlayErrorMissingSession": "Не удалось включить SyncPlay! Отсутствует сеанс.",
-    "MessageSyncPlayErrorNoActivePlayer": "Активный проигрыватель не найден. SyncPlay был отключен."
+    "MessageSyncPlayErrorNoActivePlayer": "Активный проигрыватель не найден. SyncPlay был отключен.",
+    "ShowMore": "Показать больше",
+    "ShowLess": "Показать меньше",
+    "EnableBlurhashHelp": "Рисунки, которые всё ещё загружаются, будут отображаться с размытым заполнением",
+    "EnableBlurhash": "Включить размытые заполнители для изображений",
+    "ButtonSyncPlay": "SyncPlay",
+    "ButtonCast": "В ролях",
+    "TabRepositories": "Репозитории",
+    "MessageNoGenresAvailable": "Разрешить поставщикам метаданных получать жанры из интернета.",
+    "MessageAddRepository": "Если вы хотите добавить репозиторий, нажмите кнопку рядом с заголовком и заполните необходимую информацию.",
+    "LabelRepositoryNameHelp": "Имя репозитория для показа на этом сервере.",
+    "LabelRepositoryName": "Название репозитория",
+    "LabelRepositoryUrlHelp": "Расположение манифеста добавляемого репозитория.",
+    "LabelRepositoryUrl": "URL репозитория",
+    "HeaderNewRepository": "Новый репозиторий",
+    "MessageNoRepositories": "Репозитории отсутствуют.",
+    "EnableFasterAnimationsHelp": "Использовать ускоренную анимацию и переходы",
+    "EnableFasterAnimations": "Ускоренная анимация",
+    "EnableDecodingColorDepth10Vp9": "Включить аппаратный декодер VP9 10-Bit",
+    "EnableDecodingColorDepth10Hevc": "Включить аппаратный декодер HEVC 10-Bit",
+    "StopPlayback": "Остановить проигрывание",
+    "Writers": "Сценаристы",
+    "ViewAlbumArtist": "Посмотреть альбом исполнителя",
+    "ClearQueue": "Очистить очередь",
+    "ButtonPlayer": "Проигрыватель"
 }
diff --git a/src/strings/sk.json b/src/strings/sk.json
index e99883d24e..a99d686523 100644
--- a/src/strings/sk.json
+++ b/src/strings/sk.json
@@ -236,7 +236,7 @@
     "HeaderMedia": "Médiá",
     "HeaderMediaInfo": "Informácie o médiu",
     "HeaderMetadataSettings": "Nastavenia metadát",
-    "HeaderMoreLikeThis": "Podobné ako toto",
+    "HeaderMoreLikeThis": "Podobné položky",
     "HeaderMovies": "Filmy",
     "HeaderMusicQuality": "Kvalita hudby",
     "HeaderMusicVideos": "Hudobné videá",
@@ -293,7 +293,7 @@
     "HeaderTypeText": "Vložte text",
     "HeaderUploadImage": "Nahrať obrázok",
     "HeaderUser": "Používateľ",
-    "HeaderUsers": "Užívatelia",
+    "HeaderUsers": "Používatelia",
     "HeaderVideoQuality": "Kvalita videa",
     "HeaderVideos": "Videá",
     "HeaderXmlSettings": "Nastavenia XML",
@@ -728,7 +728,6 @@
     "RepeatOne": "Opakovať jedno",
     "ReplaceAllMetadata": "Nahradiť všetky metadáta",
     "ReplaceExistingImages": "Nahradiť existujúce obrázky",
-    "RestartPleaseWaitMessage": "Počkajte prosím kým sa Jellyfin Server vypne a znova naštartuje. Môže to trvať minútu alebo dve.",
     "ResumeAt": "Pokračovať od {0}",
     "RunAtStartup": "Spustiť pri štarte",
     "Saturday": "Sobota",
@@ -777,7 +776,7 @@
     "TabCatalog": "Katalóg",
     "TabChannels": "Kanály",
     "TabCodecs": "Kodeky",
-    "TabCollections": "Zbierky",
+    "TabCollections": "Kolekcie",
     "TabContainers": "Kontajnery",
     "TabDashboard": "Dashboard",
     "TabDevices": "Zariadenia",
@@ -1045,7 +1044,6 @@
     "HideWatchedContentFromLatestMedia": "Skryť pozreté položky zo zoznamu najnovších médií",
     "HeaderTranscodingProfile": "Profil prekódovania",
     "HeaderSeriesOptions": "Nastavenia seriálov",
-    "HeaderRestartingServer": "Server sa reštartuje",
     "HeaderParentalRatings": "Rodičovské hodnotenia",
     "HeaderEnabledFields": "Povolené polia",
     "HeaderAudioLanguages": "Jazyk zvuku",
@@ -1269,7 +1267,7 @@
     "OptionAllowVideoPlaybackRemuxing": "Povoliť prehrávanie videa, ktoré vyžaduje konverziu bez opätovného enkódovania",
     "OptionAllowSyncTranscoding": "Povoliť sťahovanie a synchronizáciu medií, ktoré vyžadujú transkódovanie",
     "OptionAllowMediaPlaybackTranscodingHelp": "Obmedzenie prístupu ku transkódovaniu môže spôsobiť zlyhania prehrávania v Jellyfin aplikáciách kvôli nepodporovaným formátom medií.",
-    "MessageNoTrailersFound": "Neboli nájdené žiadne trailery. Nainštalujte Trailer kanál pre rozšírenie vášho filmového zážitku pridaním knižnice trailerov z internetu.",
+    "MessageNoTrailersFound": "Nainštalujte Trailer kanál pre rozšírenie vášho filmového zážitku pridaním knižnice trailerov z internetu.",
     "LanNetworksHelp": "Zoznam IP adries alebo IP/netmask záznamov pre všetky siete oddelené čiarkami ktoré budú považované za lokálnu sieť pri vynucovaní obmedzenia šírky pásma. Pokiaľ je toto nastavené, všetky ostatné IP adresy budú považované za vonkajšiu sieť a budú podliehať obmedzeniam šírky pásma vonkajšej siete. Pokiaľ pole ostane prázdne, podsieť serveru bude považovaná za lokálnu sieť.",
     "LabelUserAgent": "User agent:",
     "LabelEnableBlastAliveMessagesHelp": "Povolte v prípade, že server nie je viditeľný inými UPnP zariadeniami na vašej sieti.",
@@ -1292,7 +1290,7 @@
     "MessagePlayAccessRestricted": "Prehrávanie tohoto obsahuje je aktuálne obmedzené. Prosím, kontaktujte svojho administrátora servera pre viac informácií.",
     "MessagePasswordResetForUsers": "Nasledujúci používatelia si nechali obnoviť heslo. Teraz sa môžu prihlásiť s PIN kódom, ktorý použijú k vykonaniu obnovy hesla.",
     "MessageNoServersAvailable": "Žiadne servery neboli nájdené pomocou automatického objavovania serverov.",
-    "MessageNoMovieSuggestionsAvailable": "Žiadne filmové návrhy nie sú v súčastnosti k dispozícií. Začnite pozerať a hodnotiť vaše filmy, potom sa sem vráťte pre vaše odporúčania.",
+    "MessageNoMovieSuggestionsAvailable": "V súčastnosti nie sú k dispozícií žiadne filmové návrhy. Začnite pozerať a hodnotiť vaše filmy, potom sa sem vráťte pre Vaše odporúčania.",
     "MessageNoCollectionsAvailable": "Kolekcie vám umožnia užiť si vlastné zoskupenia filmov, seriálov a albumov. Kliknite na tlačítko + pre začatie vytvárania kolekcie.",
     "MessageInstallPluginFromApp": "Tento zásuvný modul musí byť nainštalovaný z aplikácie, ktorú chcete používať.",
     "MessageImageTypeNotSelected": "Prosím, vyberte typ obrázku z rozbalovacieho menu.",
@@ -1457,8 +1455,6 @@
     "MessageConfirmAppExit": "Chceli by ste odísiť?",
     "LabelVideoResolution": "Rozlíšenie videa:",
     "LabelStreamType": "Typ streamu:",
-    "EnableFastImageFadeInHelp": "Zobrazí plagát a ostatné obrázky s rýchlejšou animáciou prechodu po dokončení načítania.",
-    "EnableFastImageFadeIn": "Rýchla animácia prechodu obrázku",
     "LabelPlayerDimensions": "Rozmery prehrávača:",
     "LabelDroppedFrames": "Vynechané snímky:",
     "LabelCorruptedFrames": "Poškodené snímky:",
@@ -1522,26 +1518,26 @@
     "HeaderHttpsSettings": "Nastavenia HTTPS",
     "HeaderDVR": "DVR",
     "SaveChanges": "Uložiť zmeny",
-    "MessageSyncPlayErrorMedia": "Povolenie synchronizácie prehrávania zlyhalo! Chyba média.",
-    "MessageSyncPlayErrorMissingSession": "Zapnutie synchronizácie prehrávania zlyhalo! Aktívna relácia nebola nájdená.",
-    "MessageSyncPlayErrorNoActivePlayer": "Nebol nájdený žiadny aktívny prehrávač. Synchronizácia prehrávania bola vypnutá.",
+    "MessageSyncPlayErrorMedia": "Povolenie funkcie SyncPlay zlyhalo! Chyba média.",
+    "MessageSyncPlayErrorMissingSession": "Zapnutie funkcie SyncPlay zlyhalo! Aktívna relácia nebola nájdená.",
+    "MessageSyncPlayErrorNoActivePlayer": "Nebol nájdený žiadny aktívny prehrávač. Funkcia SyncPlay bola vypnutá.",
     "MessageSyncPlayErrorAccessingGroups": "Pri načítaní zoznamu skupín sa vyskytla chyba.",
     "MessageSyncPlayLibraryAccessDenied": "Prístup k tomuto obsahuje je obmedzený.",
-    "MessageSyncPlayJoinGroupDenied": "K použitiu synchronizácie prehrávania je vyžadované povolenie.",
+    "MessageSyncPlayJoinGroupDenied": "K použitiu funkcie SyncPlay je požadované povolenie.",
     "MessageSyncPlayCreateGroupDenied": "K vytvoreniu skupiny je požadované povolenie.",
     "MessageSyncPlayGroupDoesNotExist": "Pripojenie ku skupine zlyhalo, pretože skupina neexistuje.",
     "MessageSyncPlayPlaybackPermissionRequired": "K prehrávaniu je potrebné povolenie.",
     "MessageSyncPlayNoGroupsAvailable": "Nie je dostupná žiadna skupina. Skúste najskôr začať niečo prehrávať.",
-    "MessageSyncPlayGroupWait": "Prehrávanie používateľa <b>{0}</b> sa načítava...",
+    "MessageSyncPlayGroupWait": "<b>{0}</b> sa načítava…",
     "MessageSyncPlayUserLeft": "Používateľ <b>{0}</b> opustil skupinu.",
     "MessageSyncPlayUserJoined": "Používateľ <b>{0}</b> sa pripojil k skupine.",
-    "MessageSyncPlayDisabled": "Synchronizácia prehrávania zakázana.",
-    "MessageSyncPlayEnabled": "Synchronizácia prehrávania povolená.",
-    "LabelSyncPlayAccess": "Prístup k synchronizácií prehrávania",
+    "MessageSyncPlayDisabled": "SyncPlay zakázaný.",
+    "MessageSyncPlayEnabled": "SyncPlay povolený.",
+    "LabelSyncPlayAccess": "Prístup k funkcií SyncPlay",
     "LabelSyncPlayAccessNone": "Zakázať pre tohoto používateľa",
     "LabelSyncPlayAccessJoinGroups": "Povoliť použivateľovi pripájať sa do skupín",
     "LabelSyncPlayAccessCreateAndJoinGroups": "Povoliť používateľovi vytvárať a pripájať sa do skupín",
-    "LabelSyncPlayLeaveGroupDescription": "Zakázať synchronizáciu prehrávania",
+    "LabelSyncPlayLeaveGroupDescription": "Zakázať SyncPlay",
     "LabelSyncPlayLeaveGroup": "Opustiť skupinu",
     "LabelSyncPlayNewGroupDescription": "Vytvoriť novú skupinu",
     "LabelSyncPlayNewGroup": "Nová skupina",
@@ -1549,9 +1545,33 @@
     "LabelSyncPlayPlaybackDiff": "Rozdiel v dobe prehrávania:",
     "MillisecondsUnit": "ms",
     "LabelSyncPlayTimeOffset": "Časový rozdiel so serverom:",
-    "HeaderSyncPlayEnabled": "Synchronizácia prehrávania je povolená",
+    "HeaderSyncPlayEnabled": "SyncPlay je povolené",
     "HeaderSyncPlaySelectGroup": "Pripojiť sa k skupine",
-    "SyncPlayAccessHelp": "Vyberte úroveň prístupu pre tohto používateľa k funkcií synchronizácie prehrávania. Synchronizácia prehrávania umožňuje zosynchronizovať prehrávanie s ostatnými zariadeniami.",
+    "SyncPlayAccessHelp": "Vyberte úroveň prístupu pre tohto používateľa k funkcií SyncPlay. SyncPlay umožňuje zosynchronizovať prehrávanie s ostatnými zariadeniami.",
     "EnableDetailsBannerHelp": "Zobrazí banner na vrchnej časti detailu položky.",
-    "EnableDetailsBanner": "Detail banneru"
+    "EnableDetailsBanner": "Detail banneru",
+    "EnableBlurhashHelp": "Obrázky, ktoré sa stále načítavajú budú zobrazené ako dočasný obrázok s rozmazaným pozadím",
+    "EnableBlurhash": "Povoliť obrázok s rozmazaným pozadím pre chýbajúce obrázky",
+    "ShowMore": "Zobraziť viac",
+    "ShowLess": "Zobraziť menej",
+    "ButtonCast": "Prenášať",
+    "ButtonSyncPlay": "SyncPlay",
+    "MessageNoGenresAvailable": "Povoliť vybraným metadáta poskytovateľom stiahnuť žánre z internetu.",
+    "EnableFasterAnimationsHelp": "Použiť rýchlejšiu animáciu a prechody",
+    "EnableFasterAnimations": "Rýchlejšia animácia",
+    "EnableDecodingColorDepth10Vp9": "Povoliť 10-Bitové hardvérové dekódovanie pre VP9",
+    "EnableDecodingColorDepth10Hevc": "Povoliť 10-Bitové hardvérové dekódovanie pre HEVC",
+    "LabelRepositoryUrl": "URL adresa repozitára",
+    "HeaderNewRepository": "Nový repozitár",
+    "MessageNoRepositories": "Neexistujú žiadne repozitáre.",
+    "TabRepositories": "Repozitáre",
+    "MessageAddRepository": "Pokiaľ chcete pridať repozitár, kliknite na tlačidlo vedľa hlavičky a vyplňte požadované informácie.",
+    "LabelRepositoryNameHelp": "Vlastné pomenovanie, ktoré slúži na odlíšenie tohto repozitára od ostatných repozitárov pridaných na vašom serveri.",
+    "LabelRepositoryName": "Názov repozitára",
+    "LabelRepositoryUrlHelp": "Umiestnenie manifestu repozitára, ktorý chcete zahrnúť.",
+    "ButtonPlayer": "Prehrávač",
+    "Writers": "Scenáristi",
+    "ClearQueue": "Vymazať frontu",
+    "StopPlayback": "Zastaviť prehrávanie",
+    "ViewAlbumArtist": "Zobraziť interpreta albumu"
 }
diff --git a/src/strings/sl-si.json b/src/strings/sl-si.json
index dde5007a51..b6059809be 100644
--- a/src/strings/sl-si.json
+++ b/src/strings/sl-si.json
@@ -77,7 +77,7 @@
     "Alerts": "Alarmi",
     "All": "Vse",
     "AllChannels": "Vsi kanali",
-    "AllComplexFormats": "Vsi kompleksni formati (ASS, SSA, VOBSUB, PGS, SUB/IDX, itd.)",
+    "AllComplexFormats": "Vsi kompleksni formati (ASS, SSA, VOBSUB, PGS, SUB, IDX, itd.)",
     "AllEpisodes": "Vse epizode",
     "AllLanguages": "Vsi jeziki",
     "AllLibraries": "Vse knjižnice",
@@ -85,7 +85,7 @@
     "AllowMediaConversion": "Dovoli pretvarjanje predstavnosti",
     "AllowMediaConversionHelp": "Dovoli ali zavrni dostop do pretvarjanja predstavnosti.",
     "AllowOnTheFlySubtitleExtraction": "Dovoli sprotno izluščenje podnapisov",
-    "AllowOnTheFlySubtitleExtractionHelp": "Vdelani podnapisi so lahko izluščeni iz videa in poslani odjemalcem kot navaden tekst, kar zmanjša potrebo po prekodiranju. Na nekaterih napravah lahko to traja dalj časa in povzroča zatikanje med predvajanjem. Onemogočite, za vžig vdelanih podnapisov v video med prekodiranjem, za naprave ki ne podpirajo podnapisov.",
+    "AllowOnTheFlySubtitleExtractionHelp": "Vdelani podnapisi so lahko izluščeni iz videa in poslani odjemalcem kot navaden tekst, kar zmanjša potrebo po prekodiranju. Na nekaterih napravah lahko to traja dalj časa in povzroča zatikanje med predvajanjem. Onemogočite to možnost, za vžig vdelanih podnapisov v video s prekodiranjem, za naprave ki sicer ne podpirajo podnapisov.",
     "AllowRemoteAccess": "Dovoli oddaljene povezave s tem Jellyfin strežnikom.",
     "AllowRemoteAccessHelp": "Če ni označeno, bodo vse oddaljene povezave blokirane.",
     "Artists": "Izvajalci",
@@ -105,12 +105,12 @@
     "Movies": "Filmi",
     "AddItemToCollectionHelp": "Dodajte elemente v zbirke tako, da jih poiščete in jih z desnim klikom ali dotikom menija dodate v zbirko.",
     "AllowedRemoteAddressesHelp": "Z vejico ločen seznam IP naslovov ali IP/maska omrežij, ki jim je dovoljen oddaljeni dostop. Če pustite prazno, bodo dovoljeni vsi oddaljeni naslovi.",
-    "AlwaysPlaySubtitles": "Vedno predvajaj podnapise",
+    "AlwaysPlaySubtitles": "Vedno prikaži",
     "AlwaysPlaySubtitlesHelp": "Podnapisi, ki se ujemajo s prednostnim jezikom bodo naloženi ne glede na jezik zvoka.",
     "AnamorphicVideoNotSupported": "Anamorfni video ni podprt",
     "AnyLanguage": "Poljubni jezik",
     "Anytime": "Kadarkoli",
-    "AroundTime": "Okrog {0}",
+    "AroundTime": "Okrog",
     "Art": "Umetnost",
     "AsManyAsPossible": "Kolikor je mogoče",
     "Ascending": "Naraščajoče",
@@ -131,12 +131,12 @@
     "BirthDateValue": "Rojen: {0}",
     "BirthLocation": "Kraj rojstva",
     "BirthPlaceValue": "Kraj rojstva: {0}",
-    "BookLibraryHelp": "Zvočne in e-knjige so podprte. Preglej {0}navodila za poimenovanje knjig{0}.",
+    "BookLibraryHelp": "Zvočne in e-knjige so podprte. Preglejte {0} napotke za poimenovanje knjig {1}.",
     "Box": "Ovitek",
     "BoxRear": "Ovitek (zadnja stran)",
     "Browse": "Brskaj",
     "BrowsePluginCatalogMessage": "Poišči razpoložljive dodatke v našem katalogu.",
-    "BurnSubtitlesHelp": "Na podlagi formata podnapisov določi, ali naj strežnik vžge podnapise pri pretvarjanju videa. Izogibanje vžiganju podnapisov izboljša delovanje strežnika. Izberi Samodejno za vžig slikovnih formatov podnapisov (VOBSUB, PGS, SUB/IDX, itd.) in nekaterih ASS/SSA podnapisov.",
+    "BurnSubtitlesHelp": "Določi ali naj strežnik vžge podnapise pri prekodiranju videa. Izogibanje temu lahko občutno izboljša delovanje strežnika. Izberite Samodejno za vžig slikovnih formatov podnapisov (VOBSUB, PGS, SUB, IDX, ...) in nekaterih ASS oziroma SSA podnapisov.",
     "ButtonAccept": "Sprejmi",
     "ButtonAdd": "Dodaj",
     "MessageNamedServerConfigurationUpdatedWithValue": "Oddelek nastavitve strežnika {0} je bil posodobljen",
@@ -288,7 +288,7 @@
     "ValueSpecialEpisodeName": "Poseben - {0}",
     "Shows": "Serije",
     "DoNotRecord": "Ne snemaj",
-    "DisplayModeHelp": "Izberite tip zaslona na katerem uporabljate Jellyfin.",
+    "DisplayModeHelp": "Izberite želeno razporeditev uporabniškega vmesnika.",
     "DisplayMissingEpisodesWithinSeasonsHelp": "To mora biti omogočeno tudi za TV knjižnice v nastavitvah strežnika.",
     "DisplayMissingEpisodesWithinSeasons": "Prikaži manjkajoče epizode znotraj sezon",
     "DisplayInOtherHomeScreenSections": "Prikaži na razdelkih domačega zaslona kot so najnovejše in nadaljuj gledanje",
@@ -311,8 +311,7 @@
     "HeaderSeasons": "Sezone",
     "HeaderSchedule": "Urnik",
     "HeaderScenes": "Scene",
-    "HeaderRunningTasks": "Aktivni procesi",
-    "HeaderRestartingServer": "Ponovno zaganjanje",
+    "HeaderRunningTasks": "Aktivna opravila",
     "HeaderRestart": "Ponovni zagon",
     "HeaderResponseProfileHelp": "Profili odziva omogočajo prilagoditev informacij poslanih sprejemniku pri predvajanju določenih vrst predstavnosti.",
     "HeaderResponseProfile": "Profil odziva",
@@ -337,7 +336,7 @@
     "HeaderPasswordReset": "Ponastavi geslo",
     "HeaderPassword": "Geslo",
     "HeaderParentalRatings": "Ocena za starše",
-    "HeaderOnNow": "Zdaj",
+    "HeaderOnNow": "Trenutno",
     "HeaderNextVideoPlayingInValue": "Naslednji video se bo predvajal čez {0}",
     "HeaderNextEpisodePlayingInValue": "Naslednja epizoda se bo predvajala čez {0}",
     "HeaderNewDevices": "Nove naprave",
@@ -372,7 +371,7 @@
     "HeaderInstall": "Namesti",
     "HeaderImageSettings": "Nastavitve slike",
     "HeaderImageOptions": "Možnosti slike",
-    "HeaderIdentifyItemHelp": "Vnesite vsaj en kriterij iskanja. Odstranitr kriterije za več rezultatov.",
+    "HeaderIdentifyItemHelp": "Vnesite vsaj en kriterij iskanja. Odstranite kriterije za več rezultatov.",
     "HeaderIdentificationCriteriaHelp": "Vnesite vsaj en kriterij za identifikacijo.",
     "HeaderIdentification": "Identifikacija",
     "HeaderHome": "Domov",
@@ -394,21 +393,21 @@
     "HeaderEditImages": "Uredi slike",
     "HeaderDownloadSync": "Prenos in sinhronizacija",
     "HeaderDisplay": "Prikaz",
-    "HeaderDirectPlayProfileHelp": "Dodaj profil za neposredno predvajanje in določi katere formate naprava podpira",
+    "HeaderDirectPlayProfileHelp": "Dodaj profil za neposredno predvajanje in določi katere formate naprava podpira.",
     "HeaderDirectPlayProfile": "Profil za neposredno predvajanje",
     "HeaderDevices": "Naprave",
     "HeaderDeveloperInfo": "Informacije o razvijalcu",
     "HeaderDetectMyDevices": "Zaznaj moje naprave",
     "HeaderDeleteTaskTrigger": "Izbriši sprožilec opravila",
     "HeaderDeleteProvider": "Izbriši ponudnika",
-    "HeaderDeleteItems": "Izbriši predmete",
-    "HeaderDeleteItem": "Izbriši predmet",
+    "HeaderDeleteItems": "Izbriši",
+    "HeaderDeleteItem": "Izbriši",
     "HeaderDeleteDevice": "Izbriši napravo",
     "HeaderDefaultRecordingSettings": "Privzete nastavitve snemanja",
     "HeaderDateIssued": "Datum izdaje",
     "HeaderCustomDlnaProfiles": "Profili po meri",
     "HeaderContinueListening": "Nadaljuj s poslušanjem",
-    "HeaderConnectionFailure": "Napaka pri povezovanju",
+    "HeaderConnectionFailure": "Napaka povezave",
     "HeaderConnectToServer": "Poveži s strežnikom",
     "HeaderConfirmRevokeApiKey": "Prekliči API ključ",
     "HeaderConfirmProfileDeletion": "Potrdi brisanje profila",
@@ -650,7 +649,7 @@
     "LabelEnableDlnaClientDiscoveryInterval": "Interval odkrivanja sprejemnikov (sekunde)",
     "LabelEnableBlastAliveMessagesHelp": "Omogočite, če imajo UPnP naprave težave z zaznavanjem strežnika v omrežju.",
     "LabelEnableBlastAliveMessages": "Oddajaj sporočila o dostopnosti",
-    "LabelEnableAutomaticPortMapHelp": "Poskuša avtomatično povezati javna vrata z lokalnimi preko UPnP. To ne deluje z nekaterimi usmerjevalniki. Spremembe bodo uveljavljene po ponovnem zagonu strežnika.",
+    "LabelEnableAutomaticPortMapHelp": "Avtomatično posreduje javna vrata na vašem usmerjevalnuku z lokalnimi vrati strežnika preko UPnP. To ne deluje z nekaterimi usmerjevalniki ali omrežnimi nastavitvami. Spremembe bodo uveljavljene po ponovnem zagonu strežnika.",
     "LabelEnableAutomaticPortMap": "Omogoči avtomatično mapiranje vrat",
     "LabelEmbedAlbumArtDidl": "Vdelaj grafike albuma v Didl",
     "LabelEasyPinCode": "Enostavna PIN koda:",
@@ -663,7 +662,7 @@
     "LabelDisplayName": "Prikazano ime:",
     "LabelDisplayMode": "Način prikaza:",
     "LabelBindToLocalNetworkAddressHelp": "Neobvezno. Preglasi lokalni IP naslov za povezavo s HTTP strežnikom. V kolikor pustite prazno se strežnik poveže z vsemi možnimi naslovi. Sprememba vrednosti zahteva ponovni zagon Jellyfin strežnika.",
-    "InstallingPackage": "Nameščanje {0}",
+    "InstallingPackage": "Nameščanje {0} (različica {1})",
     "ImportMissingEpisodesHelp": "Če je omogočeno, bodo podatki o manjkajočih epizodah dodani v Jellyfin bazo podatkov in prikazani znotraj sezon in serij. To lahko občutno podaljša uvoz v knjižnjico.",
     "ImportFavoriteChannelsHelp": "Če je omogočeno, bodo uvoženi zgolj kanali, ki so na sprejemniku označeni kot priljubljeni.",
     "LabelEnableDlnaServerHelp": "Omogoči UPnP napravam v omrežju da brskajo in predvajajo vsebine.",
@@ -763,7 +762,7 @@
     "LabelKodiMetadataEnablePathSubstitutionHelp": "Omogoči zamenjavo poti za poti slik glede na nastavitve zamenjave poti strežnika.",
     "LabelKodiMetadataSaveImagePaths": "Shrani poti slik znotraj nfo datotek",
     "LabelMetadataDownloadersHelp": "Omogoči in uredi želene vire metapodatkov po prioriteti. Viri z nižjo prioriteto bodo uporabljeni zgolj za dopolnjevanje manjkajočih informacij.",
-    "LabelBaseUrlHelp": "Tukaj lahko dodate podmapo po meri, za dostop do strežnika z bolj unikatnega URL naslova.",
+    "LabelBaseUrlHelp": "Doda podnaslov po meri na konec URL-ja strežnika. Na primer: <code>http://example.com/<b>&lt;baseurl&gt;</b></code>",
     "LabelExtractChaptersDuringLibraryScanHelp": "Ustvari slike poglavij med uvozom videov pri preiskovanju knjižnjice. Sicer bodo ustvarjene med načrtovanim opravilom, kar omogoča hitrejše preiskovanje knjižnjice.",
     "LabelForgotPasswordUsernameHelp": "Vpišite svoje uporabniško ime, v kolikor se ga spomnite.",
     "LabelInNetworkSignInWithEasyPasswordHelp": "Uporabi enostavno PIN kodo za prijavo v naprave znotraj lokalnega omrežja. Vaše geslo bo potrebno zgolj za prijave zunaj domačega omrežja. Če pustite prazno, za prijavo v domačem omrežju omrežju ne boste potrebovali gesla.",
@@ -790,9 +789,9 @@
     "LabelDropShadow": "Senca:",
     "LabelHomeScreenSectionValue": "Razdelek domačega zaslona {0}:",
     "LabelPreferredSubtitleLanguage": "Prednostni jezik podnapisov:",
-    "NoSubtitles": "Brez podnapisov",
-    "OnlyImageFormats": "Samo slikovni formati (VOBSUB, PGS, SUB, itd.)",
-    "OnlyForcedSubtitles": "Samo prisiljeni podnapisi",
+    "NoSubtitles": "Nič",
+    "OnlyImageFormats": "Samo slikovni formati (VOBSUB, PGS, SUB)",
+    "OnlyForcedSubtitles": "Samo prisiljeni",
     "OptionAllowAudioPlaybackTranscoding": "Dovoli predvajanje zvoka, ki zahteva prekodiranje",
     "OptionAllowVideoPlaybackTranscoding": "Dovoli predvajanje videoposnetkov, ki zahtevajo prekodiranje",
     "OptionBlockLiveTvChannels": "TV kanali v živo",
@@ -854,7 +853,7 @@
     "Quality": "Kvaliteta",
     "PlaceFavoriteChannelsAtBeginning": "Postavi priljubljene kanale na začetek",
     "LabelOptionalNetworkPath": "(Neobvezno) Omrežna mapa:",
-    "LabelOptionalNetworkPathHelp": "V primeru, da je mapa deljena v vašem omrežju, lahko Jellyfin deli omrežno pot z ostalimi napravami in jim omogoči neposreden dostop do predstavnosti.",
+    "LabelOptionalNetworkPathHelp": "V primeru, da je mapa deljena v vašem omrežju, lahko Jellyfin deli omrežno pot z ostalimi napravami in jim omogoči neposreden dostop do vsebin. Na primer {0} ali {1}.",
     "LabelRemoteClientBitrateLimitHelp": "Neobvezna omejitev bitne hitrosti na posamezno predvajanje za vse naprave izven domačega omrežja. S tem lahko preprečite, da bi naprave zahtevale višjo bitno hitrost predvajanja, kot jo lahko prenese vaše omrežje. To lahko poveča obremenitev CPU-ja, saj bo morda potrebno sprotno prekodiranje za zmanjšanje bitne hitrosti.",
     "LanNetworksHelp": "Z vejico ločen seznam IP naslovov ali IP/maska omrežji, ki bodo upoštevana kot lokalna pri uveljavljanju omejitev pasovne širine. Če nastavite, se bodo vsi ostali naslovi upoštevali kot zunanji in bodo predmet omejitve pasovne širine. Če pustite prazno, bo kot lokalno omrežje upoštevano zgolj omrežje strežnika.",
     "MessageDirectoryPickerInstruction": "Omrežne poti lahko vnesete ročno, v kolikor gumb Omrežje ne uspe najti vaših naprav. Primer {0} ali {1}.",
@@ -973,7 +972,7 @@
     "MessageTheFollowingLocationWillBeRemovedFromLibrary": "Naslednja mesta predstavnosti bodo odstranjena iz vaše knjižnice:",
     "MessageSettingsSaved": "Nastavitve so bile shranjene.",
     "MessagePluginInstallDisclaimer": "Dodatki ustvarjeni s strani članov Jellyfin skupnosti so odličen način za izboljšanje vaše izkušnje z Jellyfin z dodatnimi funkcijami in prednostmi. Preden namestite dodatke se zavedajte, da imajo lahko ti različne vplive na vaš Jellyfin strežnik, kot na primer počasnejše preiskovanje knjižnic, dodatna obdelava podatkov v ozadju in zmanjšana stabilnost sistema.",
-    "MessagePleaseWait": "Prosimo počakajte. To lahko traja nekaj minut.",
+    "MessagePleaseWait": "Prosimo, počakajte. To lahko traja nekaj minut.",
     "MessagePleaseEnsureInternetMetadata": "Prosimo poskrbite, da je prenašanje spletnih metapodatkov omogočeno.",
     "MessageNothingHere": "Tu ni nič.",
     "MessageNoTrailersFound": "Napovednikov ni bilo mogoče najti. Namestite kanal napovednikov in izboljšajte svojo filmsko izkušnjo s knjižnico spletnih napovednikov.",
@@ -981,7 +980,7 @@
     "MessageNoPluginsInstalled": "Nameščenih nimate nobenih dodatkov.",
     "MessageNoAvailablePlugins": "Dodatki niso na voljo.",
     "MessageInvalidUser": "Napačno uporabniško ime ali geslo. Prosimo poskusite znova.",
-    "MessageInvalidForgotPasswordPin": "Vnesena je bila napačna ali potekla PIN koda. Prosimo poskusite znova.",
+    "MessageInvalidForgotPasswordPin": "Vnesena je bila napačna ali pretečena PIN koda. Prosimo, poskusite znova.",
     "MessageInstallPluginFromApp": "Ta dodatek mora biti nameščen znotraj aplikacije, v kateri ga nameravate uporabljati.",
     "MessageImageTypeNotSelected": "Prosimo izberite tip slike v spustnem meniju.",
     "MessageImageFileTypeAllowed": "Podprte so zgolj JPEG in PNG datoteke.",
@@ -1069,7 +1068,7 @@
     "OptionPremiereDate": "Datum premiere",
     "OptionOnInterval": "V intervalu",
     "OptionOnAppStartup": "Ob zagonu aplikacije",
-    "OptionNew": "Novo...",
+    "OptionNew": "Novo…",
     "OptionMonday": "Ponedeljek",
     "OptionMissingEpisode": "Manjkajoče epizode",
     "OptionLoginAttemptsBeforeLockoutHelp": "Vrednost nič (0) pomeni  3 poskuse za običajne uporabnike in 5 za skrbnike. Nastavite na -1 za onemogočanje te funkcije.",
@@ -1119,7 +1118,7 @@
     "LabelServerHost": "Naslov:",
     "LabelSeriesRecordingPath": "Pot za snemanje serij (neobvezno):",
     "LabelSerialNumber": "Serijska številka",
-    "LabelSendNotificationToUsers": "Pošlji obvestila na:",
+    "LabelSendNotificationToUsers": "Pošlji obvestilo na:",
     "LabelSecureConnectionsMode": "Način varne povezave:",
     "LabelSeasonNumber": "Številka sezone:",
     "LabelScreensaver": "Ohranjevalnik zaslona:",
@@ -1127,7 +1126,7 @@
     "LabelSaveLocalMetadata": "Shrani slike v mape predstavnosti",
     "LabelRuntimeMinutes": "Čas trajanja (minute):",
     "LabelRemoteClientBitrateLimit": "Omejitev bitne hitrosti pretakanja preko interneta (Mbps):",
-    "LabelRecordingPathHelp": "Določite privzeto lokacijo za shranjevanje posnetkov. Če pustite prazno bo uporabljena mapa namestitve strežnika.",
+    "LabelRecordingPathHelp": "Določite privzeto lokacijo za shranjevanje posnetkov. Če pustite prazno, bo uporabljena mapa namestitve strežnika.",
     "LabelRecordingPath": "Privzeta pot posnetkov:",
     "LabelRecord": "Snemaj:",
     "LabelReasonForTranscoding": "Razlog za prekodiranje:",
@@ -1211,5 +1210,188 @@
     "TitleHardwareAcceleration": "Strojno pospeševanje",
     "Thursday": "Četrtek",
     "TabUsers": "Uporabniki",
-    "TabTrailers": "Napovedniki"
+    "TabTrailers": "Napovedniki",
+    "ClientSettings": "Nastavitve odjemalca",
+    "ButtonTogglePlaylist": "Seznam predvajanja",
+    "ButtonToggleContextMenu": "Več",
+    "Artist": "Izvajalec",
+    "AlbumArtist": "Izvajalec albuma",
+    "Album": "Album",
+    "LibraryAccessHelp": "Izberite knjižnice, ki bodo deljenje s tem uporabnikom. Upravitelji bodo lahko urejali metapodatke z upraviteljem metapodatkov.",
+    "LeaveBlankToNotSetAPassword": "To polje lahko pustite prazno za uporabo brez gesla.",
+    "LearnHowYouCanContribute": "Poglejte, kako lahko pomagate.",
+    "LaunchWebAppOnStartupHelp": "Ob prvem zagonu strežnika se bo v privzetem brskalniku odprl spletni vmesnik. To se ne bo zgodilo pri uporabi možnosti za ponovni zagon.",
+    "LaunchWebAppOnStartup": "Ob zagonu strežnika zaženi spletni vmesnik",
+    "LabelffmpegPathHelp": "Pot do datoteke aplikacije ffmpeg ali mape, ki jo vsebuje.",
+    "LabelffmpegPath": "Pot FFmpeg:",
+    "LabelZipCode": "Poštna številka:",
+    "LabelYear": "Leto:",
+    "LabelVideoResolution": "Ločljivost videa:",
+    "LabelVideoCodec": "Video kodek:",
+    "LabelVideoBitrate": "Bitna hitrost videa:",
+    "LabelVideo": "Video",
+    "DashboardArchitecture": "Arhitektura: {0}",
+    "DashboardOperatingSystem": "Operacijski sistem: {0}",
+    "DashboardServerName": "Strežnik: {0}",
+    "LabelVersionInstalled": "{0} nameščeno",
+    "LabelValue": "Vrednost:",
+    "LabelVaapiDeviceHelp": "To je vozlišče naprave, ki bo uporabljena za strojno pospeševanje.",
+    "LabelVaapiDevice": "Naprava VAAPI:",
+    "LabelUsername": "Uporabniško ime:",
+    "LabelUserRemoteClientBitrateLimitHelp": "Povozi privzeto globalno nastavitev v nastavitvah strežnika.",
+    "LabelUserLoginAttemptsBeforeLockout": "Število spodletelih prijav preden bo profil uporabnika zaklenjen:",
+    "LabelUserLibraryHelp": "Izberite katera uporabniška knjižnica naj bo prikazana na napravi. Pustite prazno za uporabo privzetih nastavitev.",
+    "LabelUserLibrary": "Uporabniška knjižnica:",
+    "LabelUser": "Uporabnik:",
+    "LabelUseNotificationServices": "Uporabi naslednje storitve:",
+    "LabelTypeText": "Tekst",
+    "LabelTypeMetadataDownloaders": "{0} prenašalci metapodatkov:",
+    "LabelType": "Vrsta:",
+    "LabelTunerType": "Vrsta sprejemnika:",
+    "LabelSyncPlayAccess": "Dostop do SyncPlay",
+    "LabelSyncPlayAccessNone": "Onemogočeno za tega uporabnika",
+    "LabelSyncPlayAccessJoinGroups": "Dovoli uporabniku pridružitev skupinam",
+    "LabelSyncPlayAccessCreateAndJoinGroups": "Dovoli uporabniku ustvarjanje in pridružitev skupinam",
+    "LabelSyncPlayLeaveGroupDescription": "Onemogoči SyncPlay",
+    "LabelSyncPlayLeaveGroup": "Zapusti skupino",
+    "LabelSyncPlayNewGroupDescription": "Ustvari novo skupino",
+    "LabelSyncPlayNewGroup": "Nova skupina",
+    "LabelSyncPlaySyncMethod": "Način sinhronizacije:",
+    "LabelSyncPlayPlaybackDiff": "Razlika v času predvajanja:",
+    "MillisecondsUnit": "ms",
+    "LabelSyncPlayTimeOffset": "Zamik časa na strežniku:",
+    "EnableFastImageFadeInHelp": "Uporabi hitrejše animacije in prehode",
+    "EnableFastImageFadeIn": "Hitrejše animacije",
+    "LabelRequireHttpsHelp": "Če je označeno, bo strežnik samodejno preusmeril vse HTTP zahteva na HTTPS. Nima vpliva, če strežnik ne posluša na HTTPS.",
+    "LabelRequireHttps": "Zahtevaj HTTPS",
+    "HeaderInstantMix": "Hitri miks",
+    "HeaderIdentificationHeader": "Identifikacija zaglavja",
+    "HeaderHttpsSettings": "Nastavitve HTTPS",
+    "HeaderHttpHeaders": "HTTP zaglavje",
+    "HeaderFavoritePlaylists": "Priljubljeni seznami predvajanja",
+    "HeaderDVR": "DVR",
+    "HeaderBlockItemsWithNoRating": "Blokiraj vsebine brez oziroma z neprepoznanimi starševskimi ocenami:",
+    "ApiKeysCaption": "Seznam trenutno uporabljenih API ključev",
+    "Episode": "Epizoda",
+    "EnableDetailsBannerHelp": "Prikaži sliko pasice na vrhu strani podrobnosti.",
+    "EnableDetailsBanner": "Pasica s podrobnostmi",
+    "DeinterlaceMethodHelp": "Izberite način razpletanja pri prekodiranju prepletenih vsebin.",
+    "ButtonSyncPlay": "SyncPlay",
+    "LabelDynamicExternalId": "{0} Id:",
+    "LabelDroppedFrames": "Izpuščene sličice:",
+    "LabelDeinterlaceMethod": "Način razpletanja:",
+    "LabelCorruptedFrames": "Poškodovane sličice:",
+    "LabelBlockContentWithTags": "Blokiraj vsebine z oznakami:",
+    "LabelAlbumArtHelp": "PN se uporablja za grafiko albuma znotraj atributa dlna:profileID na upnp:albumArtURI. Nekatere naprave zahtevajo specifično vrednost, ne gledena velikost slike.",
+    "InstantMix": "Hitri miks",
+    "HeaderSyncPlayEnabled": "SyncPlay je omogočen",
+    "HeaderSyncPlaySelectGroup": "Pridruži se skupini",
+    "HeaderServerAddressSettings": "Nastavitve naslova strežnika",
+    "HeaderRemoteAccessSettings": "Nastavitve oddaljenega dostopa",
+    "HeaderOtherItems": "Ostale vsebine",
+    "HeaderNavigation": "Navigacija",
+    "HeaderItems": "Vsebine",
+    "EnableDecodingColorDepth10Vp9": "Omogoči strojno dekodiranje za 10-bit VP9",
+    "EnableDecodingColorDepth10Hevc": "Omogoči strojno dekodiranje za 10-bit HEVC",
+    "LabelEnableHttpsHelp": "Omogoči strežniku, da posluša na nastavljenih HTTPS vratih. Za uveljavitev te možnosti mora biti nastavljen tudi veljaven certifikat.",
+    "LabelEnableHttps": "Omogoči HTTPS",
+    "LabelEmbedAlbumArtDidlHelp": "Nekatere naprave delujejo bolje s tem načinom pridobivanja grafike albuma. Pri drugih predvajanje morda ne bo delovalo v tem načinu.",
+    "MessageReenableUser": "Za ponovno omogočanje poglejte spodaj",
+    "MessageNoGenresAvailable": "Omogočite nekatere ponudnike metapodatkov za pridobivanje žanrov s spleta.",
+    "MessageAddRepository": "Če želite dodati repozitorij, kliknite gumb poleg glave in vnesite zahtevane podatke.",
+    "LabelRepositoryNameHelp": "Ime po meri za razlikovanje od drugih repozitorijev v vašem strežniku.",
+    "LabelRepositoryName": "Ime repozitorija",
+    "LabelRepositoryUrlHelp": "Lokacija manifesta repozitorija, ki ga želite dodati.",
+    "LabelRepositoryUrl": "URL repozitorija",
+    "HeaderNewRepository": "Nov repozitorij",
+    "MessageNoRepositories": "Ni repozitorijev.",
+    "MessageUnauthorizedUser": "Trenutno nimate dovoljenja za dostop do tega strežnika. Kontaktirajte skrbnika strežnika za več informacij.",
+    "MediaInfoAspectRatio": "Razmerje stranic",
+    "MediaInfoAnamorphic": "Anamorfno",
+    "MaxParentalRatingHelp": "Vsebine z višjo oceno bodo za tega uporabnika skrite.",
+    "MarkUnplayed": "Označi kot nepredvajano",
+    "MarkPlayed": "Označi kot predvajano",
+    "MapChannels": "Uredi programe",
+    "ManageRecording": "Upravljaj posnetke",
+    "ManageLibrary": "Upravljaj knjižnico",
+    "Logo": "Logo",
+    "LiveBroadcasts": "Prenosi v živo",
+    "Live": "V živo",
+    "List": "Seznam",
+    "LabelUserAgent": "Uporabniški agent:",
+    "EnableFasterAnimationsHelp": "Uporabi hitrejše animacije in prehode",
+    "EnableFasterAnimations": "Hitrejše animacije",
+    "LabelNightly": "Nestabilna",
+    "LabelStable": "Stabilna",
+    "LabelChromecastVersion": "Različica Chromecast",
+    "LabelLibraryPageSizeHelp": "Nastavi število prikazanih vsebin na strani knjižnice. Nastavite na 0 za neskončno dolgo stran.",
+    "LabelLibraryPageSize": "Velikost strani knjižnice:",
+    "LabelKodiMetadataEnableExtraThumbsHelp": "Pri prenašanju slik so le te lahko shranjene v tako extrafanart in extrathumbs polji za največjo kompatibilnost s Kodi preoblekami.",
+    "LabelKodiMetadataEnableExtraThumbs": "Kopiraj extrafanart v polje extrathumbs",
+    "ShowYear": "Pokaži leto",
+    "ShowTitle": "Pokaži naslov",
+    "ShowLess": "Pokaži manj",
+    "ShowMore": "Pokaži več",
+    "SeriesCancelled": "Serija preklicana.",
+    "Series": "Serija",
+    "SendMessage": "Pošlji sporočilo",
+    "SelectAdminUsername": "Prosimo, izberite uporabniško ime za administratorski račun.",
+    "Season": "Sezona",
+    "SearchResults": "Rezultati iskanja",
+    "SearchForMissingMetadata": "Išči manjkajoče metapodatke",
+    "SearchForSubtitles": "Išči podnapise",
+    "Schedule": "Urnik",
+    "SaveChanges": "Shrani spremembe",
+    "Save": "Shrani",
+    "Saturday": "sobota",
+    "RunAtStartup": "Zaženi ob zagonu",
+    "Rewind": "Previj nazaj",
+    "ReplaceExistingImages": "Zamenjaj obstoječe slike",
+    "ReplaceAllMetadata": "Zamenjaj vse metapodatke",
+    "RepeatOne": "Ponovi enega",
+    "RepeatAll": "Ponovi vse",
+    "Repeat": "Ponovi",
+    "RemoveFromPlaylist": "Odstrani s seznama predvajanja",
+    "RememberMe": "Zapomni si me",
+    "RecommendationDirectedBy": "Režija",
+    "Person": "Oseba",
+    "OtherArtist": "Drugi izvajalci",
+    "OptionProfileVideo": "Video",
+    "OptionPoster": "Plakat",
+    "OptionNone": "Nič",
+    "OptionNameSort": "Ime",
+    "OptionMax": "Maks.",
+    "OptionList": "Seznam",
+    "OptionHasThemeSong": "Uvodna špica",
+    "OptionDownloadPrimaryImage": "Primarno",
+    "OptionDownloadDiscImage": "Zgoščenka",
+    "OptionDownloadBoxImage": "Ovitek",
+    "OptionDownloadBannerImage": "Pasica",
+    "OptionDownloadBackImage": "Nazaj",
+    "OptionAutomatic": "Samodejno",
+    "OptionAuto": "Samodejno",
+    "NextUp": "Sledi",
+    "Next": "Naslednji",
+    "MusicVideo": "Videospot",
+    "MusicArtist": "Izvajalec",
+    "MusicAlbum": "Album",
+    "Movie": "Film",
+    "MoreFromValue": "Več od {0}",
+    "Monday": "ponedeljek",
+    "MinutesBefore": "minut pred",
+    "MinutesAfter": "minut po",
+    "Metadata": "Metapodatki",
+    "MessageSyncPlayLibraryAccessDenied": "Dostop do te vsebine je omejen.",
+    "MessageSyncPlayCreateGroupDenied": "Za ustvarjanje skupine je potrebno dovoljenje.",
+    "MessageSyncPlayPlaybackPermissionRequired": "Potrebno je dovoljenje za predvajanje.",
+    "MessageSyncPlayGroupWait": "<b>{0}</b> se nalaga…",
+    "MessageSyncPlayUserLeft": "<b>{0}</b> je zapustil skupino.",
+    "MessageSyncPlayUserJoined": "<b>{0}</b> se je pridružil skupini.",
+    "MessageUnableToConnectToServer": "Povezava s strežnikom trenutno ni mogoča. Preverite, da je strežnik zagnan in poskusite ponovno.",
+    "MessageItemSaved": "Shranjeno.",
+    "MessageItemsAdded": "Dodano.",
+    "MessageConfirmAppExit": "Ali želite končati?",
+    "LabelWeb": "Splet:",
+    "LabelLineup": "Postava:",
+    "BoxSet": "Komplet"
 }
diff --git a/src/strings/sr.json b/src/strings/sr.json
index dc329c1309..d1ed50e87b 100644
--- a/src/strings/sr.json
+++ b/src/strings/sr.json
@@ -194,5 +194,6 @@
     "AlbumArtist": "Извођач албума",
     "Album": "Албум",
     "AirDate": "Премијера",
-    "AdditionalNotificationServices": "Прегледајте каталог додатака да бисте инсталирали сервисе за обавештења."
+    "AdditionalNotificationServices": "Прегледајте каталог додатака да бисте инсталирали сервисе за обавештења.",
+    "ButtonSyncPlay": "SyncPlay"
 }
diff --git a/src/strings/sv.json b/src/strings/sv.json
index 282fec7b7e..621172f7ea 100644
--- a/src/strings/sv.json
+++ b/src/strings/sv.json
@@ -19,7 +19,7 @@
     "AllLibraries": "Alla bibliotek",
     "AllowHWTranscodingHelp": "Tillåt TV-mottagaren att omkoda strömmar. Det kan minska behovet av omkodning på Jellyfin Servern.",
     "AllowOnTheFlySubtitleExtraction": "Tillåt undertextsextrahering under uppspelning",
-    "AllowOnTheFlySubtitleExtractionHelp": "Inbäddade undertexter kan extraheras ur videor och skickas till klienter i textformat för att förhindra omkodning. I vissa system kan detta ta en lång tid och stoppa videouppspelningen under extraheringsprocessen. Avaktivera detta för att bränna in inbäddade undertexter genom omkodning när de inte stöds av klienten.",
+    "AllowOnTheFlySubtitleExtractionHelp": "Inbäddade undertexter kan extraheras ur videor och skickas till klienter i textformat för att förhindra omkodning. I vissa system kan detta ta en lång tid och förhindra videouppspelningen under extraheringsprocessen. Avaktivera detta för att bränna in inbäddade undertexter genom omkodning när de inte stöds av klienten.",
     "AllowRemoteAccess": "Tillåt fjärranslutningar till denna Jellyfin-server.",
     "AllowRemoteAccessHelp": "Om avaktiverat så blockeras alla fjärranslutningar.",
     "AlwaysPlaySubtitles": "Visa alltid",
@@ -540,7 +540,7 @@
     "LabelEmbedAlbumArtDidl": "Bädda in omslagsbilder i Didl",
     "LabelEmbedAlbumArtDidlHelp": "Vissa enheter föredrar den här metoden att ta fram omslagsbilder. Andra kanske avbryter avspelningen om detta val är aktiverat.",
     "LabelEnableAutomaticPortMap": "Aktivera automatisk koppling av portar",
-    "LabelEnableAutomaticPortMapHelp": "Automatisk länkning av publik och lokal port via UPnP. Detta kanske inte fungerar med alla routrar. Obs. Ingenting kommer att ändras förrän servern startats om.",
+    "LabelEnableAutomaticPortMapHelp": "Automatisk länkning av publik port på routern och lokal port på servern via UPnP. Detta kanske inte fungerar med alla routrar och nätverks konfigurationer. Obs. Ingenting kommer att ändras förrän servern startats om.",
     "LabelEnableBlastAliveMessages": "Skicka ut \"jag lever\"-meddelanden",
     "LabelEnableBlastAliveMessagesHelp": "Aktivera detta om andra UPnP-enheter på nätverket har problem att upptäcka servern.",
     "LabelEnableDlnaClientDiscoveryInterval": "Intervall för upptäckt av klienter (i sekunder)",
@@ -1097,7 +1097,6 @@
     "RepeatOne": "Upprepa en gång",
     "ReplaceAllMetadata": "Ersätt all metadata",
     "ReplaceExistingImages": "Skriv över befintliga bilder",
-    "RestartPleaseWaitMessage": "Vänligen vänta medan Jellyfin-servern stängs av och startar om. Detta kan ta en minut eller två.",
     "ResumeAt": "Återuppta från {0}",
     "RunAtStartup": "Kör vid uppstart",
     "Runtime": "Speltid",
@@ -1317,7 +1316,6 @@
     "HeaderImageOptions": "Bildalternativ",
     "Absolute": "Komplett",
     "HeaderFavoritePeople": "Favoritmänniskor",
-    "HeaderRestartingServer": "Startar om server",
     "HeaderStatus": "Status",
     "LabelPostProcessor": "Program för efterbehandling:",
     "LabelPleaseRestart": "Ändringar genomförs efter att webbklienten manuellt har laddats om .",
@@ -1344,8 +1342,6 @@
     "LabelSize": "Storlek:",
     "LabelServerName": "Servernamn:",
     "LabelSecureConnectionsMode": "Säker uppkopplings läge:",
-    "EnableFastImageFadeInHelp": "Aktivera snabbare fade-in animationer för laddade bilder",
-    "EnableFastImageFadeIn": "Snabb bild fade-in",
     "LabelPostProcessorArgumentsHelp": "Använd {path} som sökväg till inspelade filen.",
     "LabelPostProcessorArguments": "Post-processor kommandoradsargument:",
     "LabelDroppedFrames": "Tappade ramar:",
@@ -1517,5 +1513,13 @@
     "HeaderServerAddressSettings": "Serveradressinställningar",
     "HeaderRemoteAccessSettings": "Inställningar för fjärråtkomst",
     "HeaderHttpsSettings": "HTTPS-inställningar",
-    "HeaderDVR": "PVR"
+    "HeaderDVR": "PVR",
+    "ButtonSyncPlay": "SyncPlay",
+    "LabelStable": "Stabil",
+    "HeaderSyncPlaySelectGroup": "Gå med i en grupp",
+    "EnableDecodingColorDepth10Vp9": "Aktivera 10-Bitars hårdvaru avcodning för VP9",
+    "EnableDecodingColorDepth10Hevc": "Aktivera 10-Bitars hårdvaru avcodning för HEVC",
+    "HeaderSyncPlayEnabled": "SyncPlay  påslaget",
+    "EnableDetailsBannerHelp": "Visa en bannerbild högst upp på sidan för detaljsidan .",
+    "EnableDetailsBanner": "Information banner"
 }
diff --git a/src/strings/tr.json b/src/strings/tr.json
index d69391ce9a..3e3c94d742 100644
--- a/src/strings/tr.json
+++ b/src/strings/tr.json
@@ -124,8 +124,8 @@
     "LabelSelectUsers": "Kullanıcıları seç:",
     "LabelSerialNumber": "Seri Numarası",
     "LabelStatus": "Durum:",
-    "LabelTime": "Zaman:",
-    "LabelTimeLimitHours": "Zaman limiti (saat):",
+    "LabelTime": "Süre:",
+    "LabelTimeLimitHours": "Süre limiti (saat):",
     "LabelType": "Tür:",
     "LabelUser": "Kullanıcı:",
     "LabelUserLibrary": "Kullanıcı Kütüphanesi:",
@@ -569,7 +569,6 @@
     "HeaderSchedule": "Zamanla",
     "HeaderRunningTasks": "Çalışan Görevler",
     "HeaderRevisionHistory": "Revizyon Geçmişi",
-    "HeaderRestartingServer": "Sunucu Yeniden Başlıyor",
     "HeaderRestart": "Yeniden Başlat",
     "HeaderRemoveMediaLocation": "Medya Konumunu Kaldır",
     "HeaderRemoveMediaFolder": "Medya Klasörünü Kaldır",
@@ -738,5 +737,37 @@
     "AlbumArtist": "Sanatçı",
     "HeaderTuners": "Alıcılar",
     "HeaderTranscodingProfileHelp": "Kodlama gerekince hangi formatın kullanılacağını belirtmek için kodlama profili ekle.",
-    "ButtonTogglePlaylist": "Liste"
+    "ButtonTogglePlaylist": "Liste",
+    "OptionAllowRemoteSharedDevices": "Paylaşılan cihazların uzaktan kontrolüne izin ver",
+    "OptionAllowRemoteControlOthers": "Diğer kullanıcıların uzaktan kontrolüne izin ver",
+    "LabelTitle": "Başlık:",
+    "LabelTheme": "Tema:",
+    "LabelTextSize": "Metin boyutu:",
+    "LabelTextColor": "Metin rengi:",
+    "LabelTextBackgroundColor": "Metin arkaplan rengi:",
+    "LabelTag": "Etiket:",
+    "LabelSyncPlayAccessNone": "Bu kullanıcı için devre dışı",
+    "LabelSyncPlayAccessJoinGroups": "Kullanıcının gruplara katılmasına izin ver",
+    "LabelSyncPlayAccessCreateAndJoinGroups": "Kullanıcının gruplar oluşturmasına ve gruplara katılmasına izin ver",
+    "LabelSyncPlayLeaveGroup": "Gruptan ayrıl",
+    "LabelSyncPlayNewGroupDescription": "Yeni grup oluştur",
+    "LabelSyncPlayNewGroup": "Yeni grup",
+    "LabelSyncPlaySyncMethod": "Senkronizasyon yöntemi:",
+    "MillisecondsUnit": "ms",
+    "LabelSupportedMediaTypes": "Desteklenen Ortam Türleri:",
+    "LabelSubtitlePlaybackMode": "Altyazı biçimi:",
+    "LabelSubtitleFormatHelp": "Örnek: srt",
+    "LabelSubtitles": "Altyazılar",
+    "LabelStreamType": "Akış türü:",
+    "LabelSubtitleDownloaders": "Altyazı indiriciler:",
+    "LabelStopping": "Durduruluyor",
+    "LabelSoundEffects": "Ses efektleri:",
+    "LabelSortOrder": "Sıralama düzeni:",
+    "LabelSortBy": "Sıralama türü:",
+    "LabelSkipIfGraphicalSubsPresent": "Video halihazırda gömülü altyazı barındırıyorsa atla",
+    "LabelSkipIfAudioTrackPresent": "Varsayılan ses izi indirme diliyle uyuşuyorsa atla",
+    "LabelSize": "Boyut:",
+    "LabelSimultaneousConnectionLimit": "Eşzamanlı yayın limiti:",
+    "LabelServerName": "Sunucu adı:",
+    "ButtonSyncPlay": "SyncPlay"
 }
diff --git a/src/strings/uk.json b/src/strings/uk.json
index 5a859a4aee..0b93964474 100644
--- a/src/strings/uk.json
+++ b/src/strings/uk.json
@@ -159,5 +159,6 @@
     "AllowOnTheFlySubtitleExtractionHelp": "Вбудовані субтитри можуть бути експортовані з відео і надіслані, по черзі, клієнтам у вигляді тексту. Це допоможе уникнути перекодування відео. На деяких системах, перекодування може зайняти тривалий час і зупинити відтворення відео, для того щоб забезпечити експортування. Вимкнення цієї функції дозволить вбудованим субтитрам бути інтегрованим у відео, під час перекодування, якщо вбудовані субтитри не підтримуються на стороні клієнта.",
     "AllowOnTheFlySubtitleExtraction": "Дозволити експортування субтитрів «на льоту»",
     "AllowHWTranscodingHelp": "Дозволити клієнту перекодування на «на льоту». Це дозволить відмикати перекодування, якщо вона вимагається сервером.",
-    "AllComplexFormats": "Усі складні формати (ASS, SSA, VOBSUB, PGS, SUB, IDX, …)"
+    "AllComplexFormats": "Усі складні формати (ASS, SSA, VOBSUB, PGS, SUB, IDX, …)",
+    "ButtonSyncPlay": "SyncPlay"
 }
diff --git a/src/strings/ur_PK.json b/src/strings/ur_PK.json
index 0967ef424b..2942bba2a6 100644
--- a/src/strings/ur_PK.json
+++ b/src/strings/ur_PK.json
@@ -1 +1,3 @@
-{}
+{
+    "ButtonSyncPlay": "SyncPlay"
+}
diff --git a/src/strings/vi.json b/src/strings/vi.json
index c7e5c61d84..a5b319a86f 100644
--- a/src/strings/vi.json
+++ b/src/strings/vi.json
@@ -553,7 +553,6 @@
     "HeaderScenes": "Phân Cảnh",
     "HeaderRunningTasks": "Những Tác Vụ Hoạt Động",
     "HeaderRevisionHistory": "Lịch Sử Chỉnh Sửa",
-    "HeaderRestartingServer": "Đang Khởi Động Lại Máy Chủ",
     "HeaderRestart": "Khởi Động Lại",
     "HeaderResponseProfileHelp": "Hồ sơ phản hồi là phương thức tuỳ chỉnh thông tin gửi về thiết bị phát khi phát một số nội dung nhất định.",
     "HeaderResponseProfile": "Hồ Sơ Phản Hồi",
@@ -784,5 +783,48 @@
     "LabelFont": "Kiểu chữ:",
     "LabelFolder": "Thư mục:",
     "LabelFileOrUrl": "Tệp hoặc URL:",
-    "LabelFailed": "Thất bại"
+    "LabelFailed": "Thất bại",
+    "LabelMaxResumePercentage": "Phần trăm tối đa có thể phát tiếp tục:",
+    "LabelMaxParentalRating": "Xếp hạng tối đa cho phép của phụ huynh:",
+    "LabelMaxChromecastBitrate": "Chất lượng truyền tải Chromecast:",
+    "LabelMaxBackdropsPerItem": "Số lượng phông nền tối đa mỗi mục:",
+    "LabelMatchType": "Loại tương thích:",
+    "LabelManufacturerUrl": "URL của nhà sản xuất",
+    "LabelManufacturer": "Nhà sản xuất:",
+    "LabelLogs": "Logs:",
+    "HeaderSyncPlayEnabled": "Kích hoạt SyncPlay",
+    "HeaderSyncPlaySelectGroup": "Tham gia nhóm",
+    "EnableDetailsBannerHelp": "Hiển thị một ảnh bìa ở đầu trang chi tiết.",
+    "EnableDetailsBanner": "Ảnh Bìa Chi Tiết",
+    "LabelMoviePrefixHelp": "Nếu một tiếp đầu ngữ được áp dụng cho tựa đề phim, nhập nó ở mục này để máy chủ có thể xử lý một cách phù hợp.",
+    "LabelMoviePrefix": "Tiếp đầu ngữ của tựa phim:",
+    "LabelMovieCategories": "Loại phim:",
+    "LabelMonitorUsers": "Theo dõi hoạt động từ:",
+    "LabelModelUrl": "Model URL",
+    "LabelModelNumber": "Mã số model",
+    "LabelModelName": "Tên model",
+    "LabelModelDescription": "Mô tả model",
+    "LabelMinScreenshotDownloadWidth": "Chiều ngang tối thiểu của hình ảnh tải xuống:",
+    "LabelMinResumePercentageHelp": "Nội dung sẽ được cho là chưa phát nếu dừng lại trước thời gian này.",
+    "LabelMinResumePercentage": "Phần trăm tối thiểu để phát tiếp tục:",
+    "LabelMinResumeDurationHelp": "Thời lượng ngắn nhất tính bằng giây mà vị trí phát sẽ được lưu và cho phép bạn phát tiếp tục.",
+    "LabelMinResumeDuration": "Thời lượng phát tiếp tục tối thiểu:",
+    "LabelMinBackdropDownloadWidth": "Chiều rộng tối thiểu của phông nền tải xuống:",
+    "LabelMethod": "Phương pháp:",
+    "LabelMetadataSaversHelp": "Chọn định dạng tập tin dữ liệu bổ trợ.",
+    "LabelMetadataSavers": "Định dạng dữ liệu bổ trợ:",
+    "LabelMetadataReadersHelp": "Sắp xếp thứ tự ưu tiên của những nguồn dữ liệu bổ trợ. Tập tin đầu tiên được tìm thấy sẽ được sử dụng.",
+    "LabelMetadataReaders": "Bộ đọc dữ liệu bổ trợ:",
+    "LabelMetadataPathHelp": "Thiết lập một đường dẫn tuỳ ý cho những hình ảnh và dữ liệu bổ trợ.",
+    "LabelMetadataPath": "Đường dẫn dữ liệu bổ trợ:",
+    "LabelMetadataDownloadersHelp": "Kích hoạt và sắp xếp thứ tự ưu tiên của các trình tải dữ liệu bổ trợ. Trình tải có thứ tự ưu tiên thấp sẽ chỉ sử dụng để tải những thông tin bị thiếu.",
+    "LabelMetadataDownloadLanguage": "Ngôn ngữ tải ưu tiên:",
+    "LabelMetadata": "Dữ liệu bổ trợ:",
+    "LabelMessageTitle": "Tiêu đề tin nhắn:",
+    "LabelMessageText": "Nội dung tin nhắn:",
+    "LabelMaxStreamingBitrateHelp": "Thiết lập bitrate tối đa khi truyền tải.",
+    "LabelMaxStreamingBitrate": "Chất lượng phát tối đa:",
+    "LabelMaxScreenshotsPerItem": "Số lượng ảnh chụp tối đa mỗi mục:",
+    "LabelMaxResumePercentageHelp": "Nội dung sẽ được cho là đã kết thúc nếu ngừng phát sau thời gian này.",
+    "ButtonSyncPlay": "SyncPlay"
 }
diff --git a/src/strings/zh-cn.json b/src/strings/zh-cn.json
index 0b51170196..0b2767fda3 100644
--- a/src/strings/zh-cn.json
+++ b/src/strings/zh-cn.json
@@ -1,5 +1,5 @@
 {
-    "AccessRestrictedTryAgainLater": "目前访问受限。请稍后再试。",
+    "AccessRestrictedTryAgainLater": "目前访问受限，请稍后再试。",
     "Actor": "演员",
     "Add": "添加",
     "AddItemToCollectionHelp": "通过搜索项目并右键或轻触得到的弹出菜单来将项目添加到集合中。",
@@ -871,7 +871,7 @@
     "MessageNoAvailablePlugins": "没有可用的插件。",
     "MessageNoMovieSuggestionsAvailable": "没有可用的电影建议。开始观看你的电影并进行评分，再回过头来查看你的建议。",
     "MessageNoPluginsInstalled": "你没有安装插件。",
-    "MessageNoTrailersFound": "未发现任何预告片。安装 Trailer channel 以通过添加一个网络预告片媒体库来增强你的电影体验。",
+    "MessageNoTrailersFound": "安装 Trailer channel 以通过添加一个网络预告片媒体库来增强你的电影体验。",
     "MessageNothingHere": "这里没有可显示的内容。",
     "MessagePasswordResetForUsers": "下列用户的密码已被重置。他们现在可以用执行复位的pin码登录。",
     "MessagePleaseEnsureInternetMetadata": "请确认已启用从网络上下载媒体资料的选项。",
@@ -1134,7 +1134,7 @@
     "RunAtStartup": "开机时启动",
     "Runtime": "播放时长",
     "Saturday": "星期六",
-    "Save": "储存",
+    "Save": "保存",
     "SaveSubtitlesIntoMediaFolders": "保存字幕到媒体所在文件夹",
     "SaveSubtitlesIntoMediaFoldersHelp": "将字幕存储在视频文件旁边可以跟方便的管理他们。",
     "ScanForNewAndUpdatedFiles": "扫描新的和有修改的文件",
@@ -1313,7 +1313,7 @@
     "Directors": "导演",
     "ColorTransfer": "色彩转换",
     "ConfirmDeleteItem": "这将同时在磁盘和媒体库中删除这个项目。确认删除？",
-    "ConfirmDeleteItems": "这将同时在磁盘和媒体库中删除这些项目。确认删除？",
+    "ConfirmDeleteItems": "从媒体库中删除这些项目时，也会同时从文件系统中删除。确定要删除吗？",
     "ConfirmEndPlayerSession": "确认要关闭位于{0}的Jellyfin吗？",
     "ValueSeconds": "{0}秒",
     "Features": "功能",
@@ -1350,7 +1350,6 @@
     "HeaderNextEpisodePlayingInValue": "下一集在 {0} 后播放",
     "HeaderNextVideoPlayingInValue": "下一部影片在 {0} 后播放",
     "HeaderPlayOn": "播放在",
-    "HeaderRestartingServer": "服务器重启中",
     "HeaderSeriesStatus": "系列状态",
     "HeaderStopRecording": "停止录制",
     "Horizontal": "横向",
@@ -1358,7 +1357,7 @@
     "LabelKeepUpTo": "保持：",
     "LabelPasswordResetProvider": "密码重置提供者：",
     "LabelPersonRoleHelp": "示例：冰淇淋卡车司机",
-    "LabelSelectFolderGroups": "自动将下列文件夹中的内容分组到视图中，如电影、音乐、剧集：",
+    "LabelSelectFolderGroups": "自动将来自下列文件夹的内容分组至电影、音乐、电视等视图中：",
     "LabelSelectFolderGroupsHelp": "未选中的文件夹将显示在自身的视图中。",
     "LabelUserLoginAttemptsBeforeLockout": "用户被封禁前可尝试的次数：",
     "DashboardVersionNumber": "版本：{0}",
@@ -1398,7 +1397,6 @@
     "Recordings": "录音",
     "RefreshDialogHelp": "元数据根据设置和Jellyfin服务器中启用的网络服务进行刷新。",
     "RepeatEpisodes": "重复剧集",
-    "RestartPleaseWaitMessage": "请等待Jellyfin服务关闭和重启，这将花费几分钟时间。",
     "Schedule": "日程",
     "Screenshot": "屏幕截图",
     "SeriesDisplayOrderHelp": "按播出日期、DVD 顺序或编号对剧集进行排序。",
@@ -1464,8 +1462,6 @@
     "HeaderNavigation": "导航",
     "CopyStreamURLError": "复制URL地址时发生错误。",
     "MessageConfirmAppExit": "你要退出吗？",
-    "EnableFastImageFadeIn": "快速图片淡入",
-    "EnableFastImageFadeInHelp": "为已加载的图片启用更快的图片淡入动画",
     "OptionForceRemoteSourceTranscoding": "强制远程转码（像电视直播一样）",
     "NoCreatedLibraries": "看上去您还未创建任何资料库。{0} 您想现在创建一个吗？ {1}",
     "AskAdminToCreateLibrary": "请联系管理员以创建一个新的资料库。",
@@ -1520,9 +1516,67 @@
     "LabelRequireHttpsHelp": "开启后服务器将自动将所有 HTTP 请求重定向到 HTTPS。如果服务器没有启用 HTTPS 则不生效。",
     "LabelRequireHttps": "强制 HTTPS",
     "LabelStable": "稳定版",
-    "LabelEnableHttpsHelp": "开启服务器对所配置HTTPS 端口的监听。必须配置有效的证书才会生效。",
+    "LabelEnableHttpsHelp": "开启服务器对所配置 HTTPS 端口的监听。必须配置有效的证书才会生效。",
     "LabelEnableHttps": "启用 HTTPS",
     "LabelChromecastVersion": "Chromecast版本",
     "HeaderDVR": "DVR",
-    "LabelNightly": "Nightly"
+    "LabelNightly": "开发版",
+    "MessageSyncPlayErrorAccessingGroups": "访问群组列表时发生错误。",
+    "MessageSyncPlayLibraryAccessDenied": "对此内容的访问受到限制。",
+    "MessageSyncPlayCreateGroupDenied": "需要权限以创建群组。",
+    "MessageSyncPlayGroupDoesNotExist": "无法加入群组，因为该群组不存在。",
+    "MessageSyncPlayPlaybackPermissionRequired": "需要播放权限。",
+    "MessageSyncPlayGroupWait": "<b>{0}</b> 正在缓冲…",
+    "MessageSyncPlayUserLeft": "<b>{0}</b> 已离开群组。",
+    "MessageSyncPlayUserJoined": "<b>{0}</b> 已加入该群组。",
+    "LabelSyncPlayAccessNone": "禁用此用户",
+    "LabelSyncPlayAccessJoinGroups": "允许用户加入群组",
+    "LabelSyncPlayAccessCreateAndJoinGroups": "允许用户创建和加入群组",
+    "LabelSyncPlayLeaveGroup": "离开群组",
+    "LabelSyncPlayNewGroupDescription": "创建一个新的群组",
+    "LabelSyncPlayNewGroup": "新建群组",
+    "LabelSyncPlaySyncMethod": "同步方式：",
+    "MillisecondsUnit": "毫秒",
+    "LabelSyncPlayTimeOffset": "服务器时间偏移：",
+    "HeaderSyncPlayEnabled": "同步播放已启用",
+    "HeaderSyncPlaySelectGroup": "加入群组",
+    "EnableDetailsBannerHelp": "在项目详细信息页面的顶部显示横幅图片。",
+    "EnableDecodingColorDepth10": "启用 10-Bit 硬件解码",
+    "EnableDecodingColorDepth10Help": "在支持的硬件上启用 10-Bit 硬件解码。仅对 HEVC 和 VP9 格式起作用。如果你遇到了播放问题，请关闭这个选项。",
+    "LabelSyncPlayLeaveGroupDescription": "关闭同步播放",
+    "EnableDetailsBanner": "详细信息页面的横幅",
+    "ButtonCast": "投射",
+    "ButtonSyncPlay": "SyncPlay",
+    "EnableBlurhashHelp": "仍在加载的图片将显示带有模糊的占位符",
+    "EnableBlurhash": "为图片启用模糊的占位符",
+    "SyncPlayAccessHelp": "为此用户选择对同步播放功能的访问级别。同步播放让你可以和其他设备同步播放进度。",
+    "ShowMore": "显示更多",
+    "ShowLess": "显示更少",
+    "MessageSyncPlayErrorMedia": "同步播放启用失败！媒体错误。",
+    "MessageSyncPlayErrorMissingSession": "同步播放启用失败！找不到 Session。",
+    "MessageSyncPlayErrorNoActivePlayer": "未找到活动的用户。同步播放已被关闭。",
+    "MessageSyncPlayJoinGroupDenied": "需要权限以使用同步播放。",
+    "MessageSyncPlayNoGroupsAvailable": "暂无可用的群组。先播放点什么吧。",
+    "MessageSyncPlayDisabled": "同步播放已关闭。",
+    "MessageSyncPlayEnabled": "同步播放已开启。",
+    "LabelSyncPlayPlaybackDiff": "播放时间差距：",
+    "EnableFasterAnimationsHelp": "使用更快的动画和转场效果",
+    "EnableFasterAnimations": "更快的动画",
+    "EnableDecodingColorDepth10Vp9": "启用 VP9 10-Bit 硬件解码",
+    "EnableDecodingColorDepth10Hevc": "启用 HEVC 10-Bit 硬件解码",
+    "HeaderNewRepository": "新建存储库",
+    "TabRepositories": "存储库",
+    "MessageNoGenresAvailable": "启用一些元数据提供程序以便从互联网获取媒体风格。",
+    "MessageAddRepository": "如果要添加存储库，请单击标题旁边的按钮，然后填写所需的信息。",
+    "LabelRepositoryNameHelp": "一个自定义名称，用于区分该存储库和添加到服务器的任何其他存储库。",
+    "LabelRepositoryName": "存储库名称",
+    "LabelRepositoryUrlHelp": "您要添加的存储库清单的位置。",
+    "LabelRepositoryUrl": "存储库 URL",
+    "MessageNoRepositories": "暂无存储库。",
+    "LabelSyncPlayAccess": "同步播放访问控制",
+    "ButtonPlayer": "播放器",
+    "ClearQueue": "清空队列",
+    "StopPlayback": "停止播放",
+    "Writers": "作者",
+    "ViewAlbumArtist": "查看专辑艺术家"
 }
diff --git a/src/strings/zh-hk.json b/src/strings/zh-hk.json
index 97b2d2d1f7..551f6ec1ae 100644
--- a/src/strings/zh-hk.json
+++ b/src/strings/zh-hk.json
@@ -1,7 +1,7 @@
 {
     "Add": "添加",
-    "ButtonAdd": "新增",
-    "ButtonAddScheduledTaskTrigger": "新增觸發",
+    "ButtonAdd": "增加",
+    "ButtonAddScheduledTaskTrigger": "新增觸發點",
     "ButtonAddUser": "添加用戶",
     "ButtonCancel": "取消",
     "ButtonDelete": "删除",
@@ -10,12 +10,12 @@
     "ButtonFilter": "過濾",
     "ButtonHelp": "幫助",
     "ButtonManualLogin": "手動登入",
-    "ButtonNew": "最新",
+    "ButtonNew": "新增",
     "ButtonOk": "確定",
     "ButtonPlay": "播放",
     "ButtonQuickStartGuide": "快速入門指南",
     "ButtonRefresh": "重新整理",
-    "ButtonRefreshGuideData": "重新整理電視指南資料",
+    "ButtonRefreshGuideData": "重新整理指南資料",
     "ButtonRemove": "清除",
     "ButtonRename": "重新命名",
     "ButtonResetPassword": "重設密碼",
@@ -378,17 +378,17 @@
     "Ascending": "上升",
     "Artist": "藝人",
     "Art": "藝術",
-    "AroundTime": "大約{0}",
+    "AroundTime": "大約",
     "AlwaysPlaySubtitlesHelp": "無論語言是哪種音頻，都將加載與語言首選項匹配的字幕。",
     "AllowedRemoteAddressesHelp": "IP地址或IP /網絡掩碼條目的逗號分隔列表，用於允許遠程連接的網絡。 如果保留為空白，將允許所有遠程地址。",
     "AllowRemoteAccessHelp": "如果未選中，則將阻止所有遠程連接。",
     "AllowRemoteAccess": "允許與此Jellyfin服務器的遠程連接。",
-    "AllowFfmpegThrottlingHelp": "當轉碼或remux距離當前播放位置足夠遠時，請暫停該過程，以減少資源消耗。 在不經常觀看的情況下，此功能最為有用。 如果遇到播放問題，請關閉此功能。",
+    "AllowFfmpegThrottlingHelp": "當轉碼或無損複製進度遠超於當前播放位置，暫停進程可減少資源消耗。 在不經常觀看的情況下，此功能最為有用。 如果遇到播放問題，請關閉此功能。",
     "AllowOnTheFlySubtitleExtractionHelp": "可以從視頻中提取嵌入式字幕，然後以純文本格式將其交付給客戶端，以幫助防止視頻轉碼。 在某些系統上，這可能需要很長時間，並且會導致提取過程中視頻播放停止。 如果客戶端設備本身不支持嵌入的字幕，則可以禁用此選項以通過視頻轉碼刻錄字幕。",
     "AllowOnTheFlySubtitleExtraction": "允許即時提取字幕",
     "AllowMediaConversionHelp": "授予或拒絕訪問轉換媒體功能的權限。",
     "AllowMediaConversion": "允許媒體轉換",
-    "AllowHWTranscodingHelp": "允許調諧器即時轉碼流。 這可以幫助減少服務器所需的代碼轉換。",
+    "AllowHWTranscodingHelp": "允許調諧器即時轉碼。 這可減少使用伺服器轉碼。",
     "AllLibraries": "所有媒體庫",
     "AllEpisodes": "所有劇集",
     "AllComplexFormats": "所有格式（ASS，SSA，VOBSUB，PGS，SUB，IDX等）",
@@ -399,8 +399,112 @@
     "Aired": "已播出",
     "AirDate": "播出日期",
     "AdditionalNotificationServices": "瀏覽插件目錄以安裝其他通知服務。",
-    "AddToPlayQueue": "添加到播放列",
+    "AddToPlayQueue": "添加到播放隊列",
     "AddToCollection": "添加到收藏",
-    "AddItemToCollectionHelp": "通過搜索項目並使用右鍵單擊或點擊菜單將其添加到集合中，從而將它們添加到集合中。",
-    "AccessRestrictedTryAgainLater": "目前限制訪問。 請稍後再試。"
+    "AddItemToCollectionHelp": "搜尋物件並使用右鍵點擊或點擊菜單將他們添加到收藏中。",
+    "AccessRestrictedTryAgainLater": "目前存取受限。 請稍後再試。",
+    "AllowFfmpegThrottling": "轉碼調節器",
+    "Dislike": "不喜歡",
+    "Disconnect": "中斷連接",
+    "Disc": "片",
+    "Disabled": "已停用",
+    "Directors": "導演",
+    "Director": "導演",
+    "DirectStreaming": "直接直播",
+    "DirectPlaying": "直接播放",
+    "DetectingDevices": "偵測裝置中",
+    "Desktop": "桌面",
+    "Descending": "倒序",
+    "DeleteUserConfirmation": "你確定要刪除此用戶嗎?",
+    "DeleteUser": "刪除用戶",
+    "DeleteMedia": "刪除媒體",
+    "DeleteImageConfirmation": "你確定要刪除此圖片嗎?",
+    "DeleteImage": "刪除圖片",
+    "DefaultErrorMessage": "處理此請求時發生錯誤，請稍後再嘗試。",
+    "Default": "預設",
+    "DateAdded": "日期已新增",
+    "CopyStreamURLError": "複製URL時發生錯誤。",
+    "CopyStreamURLSuccess": "成功複製URL。",
+    "CopyStreamURL": "複製直播URL",
+    "ContinueWatching": "繼續觀看",
+    "Connect": "連接",
+    "ConfirmEndPlayerSession": "你要關閉 {0} 的Jellyfin嗎?",
+    "ConfirmDeleteImage": "刪除圖片?",
+    "CommunityRating": "社群分數",
+    "ClientSettings": "客戶端設定",
+    "ChannelNumber": "頻道號碼",
+    "ChannelNameOnly": "只有頻道 {0}",
+    "Categories": "分類",
+    "CancelSeries": "取消片集",
+    "CancelRecording": "取消錄影",
+    "ButtonWebsite": "網頁",
+    "ButtonViewWebsite": "瀏覽網頁",
+    "ButtonUninstall": "解除安裝",
+    "ButtonTrailer": "預告",
+    "ButtonTogglePlaylist": "播放清單",
+    "ButtonToggleContextMenu": "更多",
+    "ButtonSplit": "分開",
+    "ButtonStop": "停止",
+    "ButtonStart": "開始",
+    "ButtonShutdown": "關閉",
+    "ButtonSettings": "設定",
+    "ButtonSend": "傳送",
+    "ButtonSelectServer": "選擇伺服器",
+    "ButtonSearch": "搜尋",
+    "ButtonScanAllLibraries": "掃瞄所有媒體櫃",
+    "ButtonRevoke": "撤銷",
+    "ButtonResume": "恢復",
+    "ButtonResetEasyPassword": "重設PIN碼",
+    "ButtonRepeat": "重複",
+    "ButtonProfile": "檔案",
+    "ButtonPause": "暫停",
+    "ButtonParentalControl": "家長控制",
+    "ButtonOpen": "開啟",
+    "ButtonNetwork": "網絡",
+    "ButtonMore": "更多",
+    "ButtonLearnMore": "了解更多",
+    "ButtonInfo": "資訊",
+    "ButtonHome": "主頁",
+    "ButtonGuide": "教學",
+    "ButtonGotIt": "了解",
+    "ButtonFullscreen": "全螢幕",
+    "ButtonForgotPassword": "忘記密碼",
+    "ButtonEditOtherUserPreferences": "更改用戶個人檔案，圖片及個人偏好。",
+    "ButtonEditImages": "更改圖片",
+    "ButtonDownload": "下載",
+    "ButtonConnect": "連接",
+    "ButtonChangeServer": "更換伺服器",
+    "ButtonBack": "返回",
+    "ButtonAudioTracks": "音軌",
+    "ButtonArrowUp": "箭咀上",
+    "ButtonArrowRight": "箭咀右",
+    "ButtonArrowLeft": "箭咀左",
+    "ButtonArrowDown": "箭咀下",
+    "ButtonAddServer": "新增伺服器",
+    "ButtonAddMediaLibrary": "新增媒體櫃",
+    "ButtonAddImage": "新增圖片",
+    "Browse": "瀏覽",
+    "Blacklist": "黑名單",
+    "BirthPlaceValue": "出生地點",
+    "BirthDateValue": "出生日期",
+    "Banner": "橫幅",
+    "Backdrops": "背景",
+    "Backdrop": "背景",
+    "AlwaysPlaySubtitles": "經常播放",
+    "Display": "顯示",
+    "EnableBackdrops": "背景",
+    "EditImages": "更改圖片",
+    "DownloadsValue": "下載數目 {0}",
+    "Download": "下載",
+    "DisplayInMyMedia": "在主頁顯示",
+    "ButtonSyncPlay": "SyncPlay",
+    "ButtonDown": "向下",
+    "BurnSubtitlesHelp": "確定若服務器對視頻進行轉碼時是否嵌入字幕。 關閉這功能將使用更少時間。 選擇'自動'可嵌入基於圖像的格式字幕（VOBSUB，PGS，SUB，IDX等）和某些ASS或SSA字幕。",
+    "BrowsePluginCatalogMessage": "瀏覽我們的插件目錄以查看可用的插件。",
+    "BoxRear": "盒裝(背面)",
+    "BoxSet": "套裝",
+    "Box": "盒裝",
+    "Composer": "作曲家",
+    "ButtonPreviousTrack": "上一曲",
+    "ButtonNextTrack": "下一曲"
 }
diff --git a/src/strings/zh-tw.json b/src/strings/zh-tw.json
index ae086d08cc..4c090dcf25 100644
--- a/src/strings/zh-tw.json
+++ b/src/strings/zh-tw.json
@@ -827,7 +827,6 @@
     "HeaderProfileServerSettingsHelp": "這些數值將控制 Jellyfin 伺服器如何呈現給設備。",
     "HeaderResponseProfile": "回覆設定檔",
     "HeaderResponseProfileHelp": "當播放某些類型的媒體時，回覆設定檔提供一種方法來發送自定訊息到設備。",
-    "HeaderRestartingServer": "重新啟動伺服器",
     "HeaderSchedule": "日程表",
     "HeaderSelectCertificatePath": "選擇證書路徑",
     "HeaderSelectMetadataPath": "選擇數據路徑",
@@ -1016,7 +1015,7 @@
     "LabelEnableDlnaServerHelp": "允許網絡上的 UPnP 設備瀏覽和播放內容。",
     "LabelEnableHardwareDecodingFor": "為以下啟用硬體解碼：",
     "LabelEpisodeNumber": "集：",
-    "LabelBaseUrlHelp": "您可以在此處新增自訂路徑來進入伺服器。",
+    "LabelBaseUrlHelp": "您可以在此處自訂伺服器URL路徑的子目錄。",
     "LabelExtractChaptersDuringLibraryScan": "於媒體庫掃描時擷取章節圖片",
     "LabelHttpsPort": "本地 HTTPS 端口：",
     "LabelFailed": "失敗",
@@ -1465,7 +1464,6 @@
     "OptionRequirePerfectSubtitleMatchHelp": "僅下載經過測試並確認跟此影片檔案完美匹配的字幕。取消勾選這個項目可以增加找到並下載字幕的可能性，但可能會下載時間軸、翻譯不正確的字幕。",
     "PluginInstalledMessage": "這個模組安裝成功，但 Jellyfin 伺服器需要重啟以使模組生效。",
     "RecordingPathChangeMessage": "更改錄製資料夾不會將現有錄製從舊位置遷移到新的，您需要手動移動它們。",
-    "RestartPleaseWaitMessage": "Jellyfin 伺服器將重新啟動，這將花費幾分鐘時間。",
     "LabelEmbedAlbumArtDidl": "於 Didl 中嵌入專輯封面",
     "LabelEnableAutomaticPortMapHelp": "自動嘗試映射公共連接埠到 UPnP 本地連接埠。這可能無法用於某些路由器。需重新啓動伺服器。",
     "LabelEmbedAlbumArtDidlHelp": "有些裝置使用這個方式來取得專輯封面，啟用這個選項可能導致其他設備播放失敗。",
@@ -1610,8 +1608,6 @@
     "LaunchWebAppOnStartupHelp": "伺服器啓動時在默認游覽器中打開網頁端。使用重啓伺服器功能時此項不生效。",
     "LabelVideoResolution": "視頻解析度：",
     "LabelStreamType": "串流類型：",
-    "EnableFastImageFadeInHelp": "對已載入的圖片啟用更快的淡入動畫",
-    "EnableFastImageFadeIn": "圖片快速淡入效果",
     "LabelPlayerDimensions": "播放器尺寸：",
     "LabelDroppedFrames": "丟棄的幀：",
     "LabelCorruptedFrames": "損壞的幀：",
@@ -1659,5 +1655,22 @@
     "New": "新增",
     "ApiKeysCaption": "目前已啟用的API金鑰列表",
     "ButtonTogglePlaylist": "播放清單",
-    "ButtonToggleContextMenu": "更多"
+    "ButtonToggleContextMenu": "更多",
+    "ButtonSyncPlay": "SyncPlay",
+    "LabelRequireHttpsHelp": "如果選中，伺服器將自動將所有通過HTTP的請求重定向到HTTPS。 如果伺服器未在HTTPS上偵聽則此項無效。",
+    "EnableFasterAnimationsHelp": "使用更快的動畫和過渡效果",
+    "EnableFasterAnimations": "更快的動畫",
+    "LabelRequireHttps": "要求HTTPS",
+    "LabelNightly": "每日更新版",
+    "LabelStable": "穩定版",
+    "LabelChromecastVersion": "Chromecast版本",
+    "LabelEnableHttpsHelp": "使伺服器能夠偵聽已配置的HTTPS端口。 要使其生效，必須配置一個有效的證書。",
+    "LabelEnableHttps": "啟用HTTPS",
+    "HeaderServerAddressSettings": "伺服器地址設定",
+    "HeaderRemoteAccessSettings": "遠程訪問設定",
+    "HeaderHttpsSettings": "HTTPS設定",
+    "EnableDetailsBannerHelp": "在項目詳細信息頁面的頂部顯示橫幅圖像。",
+    "EnableDetailsBanner": "詳情橫幅",
+    "EnableDecodingColorDepth10Vp9": "啟用10比特VP9硬體解碼",
+    "EnableDecodingColorDepth10Hevc": "啟用10比特HEVC硬體解碼"
 }
diff --git a/src/themes/appletv/theme.css b/src/themes/appletv/theme.css
index b3ce2c7e92..41540ce0dd 100644
--- a/src/themes/appletv/theme.css
+++ b/src/themes/appletv/theme.css
@@ -122,9 +122,10 @@ html {
 }
 
 .paperList,
-.visualCardBox {
-    background-color: #fff;
+.visualCardBox,
+.cardBox:not(.visualCardBox) .cardPadder {
     background-color: rgba(0, 0, 0, 0.1);
+    border-radius: 0.5rem;
 }
 
 .defaultCardBackground1 {
@@ -173,6 +174,10 @@ html {
     opacity: 0.5;
 }
 
+.cardImageContainer {
+    border-radius: 0.5rem;
+}
+
 .formDialogHeader a,
 .toast {
     color: #fff;
@@ -227,7 +232,7 @@ html {
     color: #fff !important;
 }
 
-.detailSticky {
+.detailRibbon {
     background: #303030;
     background: -webkit-gradient(linear, left top, right top, from(#bcbcbc), color-stop(#a7b4b7), color-stop(#beb5a5), color-stop(#adbec2), to(#b9c7cb));
     background: -webkit-linear-gradient(left, #bcbcbc, #a7b4b7, #beb5a5, #adbec2, #b9c7cb);
@@ -257,11 +262,6 @@ html {
     background: #fff;
 }
 
-.mediaInfoTimerIcon,
-.starIcon {
-    color: #cb272a;
-}
-
 .emby-input,
 .emby-textarea {
     color: inherit;
@@ -291,7 +291,10 @@ html {
     border-color: #fff;
 }
 
-.emby-checkbox:checked + span + .checkboxOutline,
+.emby-checkbox:checked + span + .checkboxOutline {
+    background-color: #00a4dc;
+}
+
 .itemProgressBarForeground {
     background: linear-gradient(90deg, rgba(0, 210, 201, 1) 0%, rgba(13, 194, 98, 1) 28%, rgba(0, 75, 185, 1) 100%);
 }
@@ -446,16 +449,25 @@ html {
     color: #c33;
 }
 
-.repeatButton-active {
-    color: #4285f4;
+.buttonActive {
+    color: #00a4dc !important;
 }
 
 .card:focus .cardBox.visualCardBox,
 .card:focus .cardBox:not(.visualCardBox) .cardScalable {
+    border-radius: 0.5rem;
     border-color: #00a4dc !important;
 }
 
-.cardContent-button,
+.card.show-focus:not(.show-animation) .cardBox.visualCardBox,
+.card.show-focus:not(.show-animation) .cardBox:not(.visualCardBox) .cardScalable {
+    border-radius: 1rem;
+}
+
+.blurhash-canvas {
+    border-radius: 0.5rem;
+}
+
 .itemDetailImage,
 .cardOverlayContainer {
     border-radius: 0.5rem;
diff --git a/src/themes/blueradiance/theme.css b/src/themes/blueradiance/theme.css
index 3e86782f37..7ecc4a74a5 100644
--- a/src/themes/blueradiance/theme.css
+++ b/src/themes/blueradiance/theme.css
@@ -131,23 +131,23 @@ html {
 }
 
 .defaultCardBackground1 {
-    background-color: #d2b019;
+    background-color: #213440;
 }
 
 .defaultCardBackground2 {
-    background-color: #338abb;
+    background-color: #8c6565;
 }
 
 .defaultCardBackground3 {
-    background-color: #6b689d;
+    background-color: #57778c;
 }
 
 .defaultCardBackground4 {
-    background-color: #dd452b;
+    background-color: #8c8c49;
 }
 
 .defaultCardBackground5 {
-    background-color: #5ccea9;
+    background-color: #404024;
 }
 
 .cardText-secondary,
@@ -223,7 +223,7 @@ html {
     color: #fff !important;
 }
 
-.detailSticky {
+.detailRibbon {
     background: #303030;
     background: -webkit-gradient(linear, left top, right top, from(#291a31), color-stop(#033664), color-stop(#011432), color-stop(#141a3a), to(#291a31));
     background: -webkit-linear-gradient(left, #291a31, #033664, #011432, #141a3a, #291a31);
@@ -261,11 +261,6 @@ html {
     background: rgba(170, 170, 190, 0.2);
 }
 
-.mediaInfoTimerIcon,
-.starIcon {
-    color: #cb272a;
-}
-
 .emby-input,
 .emby-textarea {
     color: inherit;
@@ -446,8 +441,12 @@ html {
     color: #c33;
 }
 
-.repeatButton-active {
-    color: #4285f4;
+.buttonActive {
+    color: #00a4dc !important;
+}
+
+.cardBox:not(.visualCardBox) .cardPadder {
+    background-color: rgba(0, 0, 0, 0.5);
 }
 
 .card:focus .cardBox.visualCardBox,
diff --git a/src/themes/dark/theme.css b/src/themes/dark/theme.css
index f9163d82f5..be2b9269af 100644
--- a/src/themes/dark/theme.css
+++ b/src/themes/dark/theme.css
@@ -109,27 +109,27 @@ html {
 .formDialogHeader:not(.formDialogHeader-clear),
 .paperList,
 .visualCardBox {
-    background-color: #242424;
+    background-color: #202020;
 }
 
 .defaultCardBackground1 {
-    background-color: #d2b019;
+    background-color: #00455c;
 }
 
 .defaultCardBackground2 {
-    background-color: #338abb;
+    background-color: #44bae1;
 }
 
 .defaultCardBackground3 {
-    background-color: #6b689d;
+    background-color: #00a4db;
 }
 
 .defaultCardBackground4 {
-    background-color: #dd452b;
+    background-color: #1c4c5c;
 }
 
 .defaultCardBackground5 {
-    background-color: #5ccea9;
+    background-color: #007ea8;
 }
 
 .cardText-secondary,
@@ -203,11 +203,11 @@ html {
     background: rgba(30, 30, 30, 0.9);
 }
 
-.detailSticky {
+.detailRibbon {
     background: rgba(32, 32, 32, 0.8);
 }
 
-.noBackdrop .detailSticky {
+.noBackdrop .detailRibbon {
     background: #202020;
 }
 
@@ -236,11 +236,6 @@ html {
     background: rgba(170, 170, 190, 0.2);
 }
 
-.mediaInfoTimerIcon,
-.starIcon {
-    color: #cb272a;
-}
-
 .emby-input,
 .emby-textarea {
     color: inherit;
@@ -417,8 +412,8 @@ html {
     color: #c33;
 }
 
-.repeatButton-active {
-    color: #4285f4;
+.buttonActive {
+    color: #00a4dc !important;
 }
 
 .card:focus .cardBox.visualCardBox,
@@ -437,6 +432,7 @@ html {
 
 .layout-desktop ::-webkit-scrollbar {
     width: 0.4em;
+    height: 0.4em;
 }
 
 ::-webkit-scrollbar-thumb:horizontal,
@@ -453,3 +449,8 @@ html {
 .metadataSidebarIcon {
     color: #00a4dc;
 }
+
+.emby-button.detailFloatingButton {
+    background-color: #00a4dc;
+    color: #fff;
+}
diff --git a/src/themes/light/theme.css b/src/themes/light/theme.css
index 114ef7c3b1..c5161985cd 100644
--- a/src/themes/light/theme.css
+++ b/src/themes/light/theme.css
@@ -57,6 +57,10 @@ html {
     background-color: #f0f0f0;
 }
 
+.emby-scrollbuttons .paper-icon-button-light {
+    color: #000;
+}
+
 .paper-icon-button-light:hover:not(:disabled) {
     color: #00a4dc;
     background-color: rgba(0, 164, 220, 0.2);
@@ -221,7 +225,7 @@ html {
     color: #fff !important;
 }
 
-.detailSticky {
+.detailRibbon {
     background-color: #303030;
     color: #ccc;
     color: rgba(255, 255, 255, 0.87);
@@ -234,7 +238,7 @@ html {
 }
 
 .listItem-border {
-    border-color: #f0f0f0 !important;
+    border-color: #a7a7a7 !important;
 }
 
 .listItem:focus {
@@ -250,11 +254,6 @@ html {
     background: #fff;
 }
 
-.mediaInfoTimerIcon,
-.starIcon {
-    color: #cb272a;
-}
-
 .emby-input,
 .emby-textarea {
     color: inherit;
@@ -428,8 +427,12 @@ html {
     color: #c33;
 }
 
-.repeatButton-active {
-    color: #4285f4;
+.buttonActive {
+    color: #00a4dc !important;
+}
+
+.cardBox:not(.visualCardBox) .cardPadder {
+    background-color: #fff;
 }
 
 .card:focus .cardBox.visualCardBox,
diff --git a/src/themes/purplehaze/theme.css b/src/themes/purplehaze/theme.css
index 82b774a736..1d82afc23a 100644
--- a/src/themes/purplehaze/theme.css
+++ b/src/themes/purplehaze/theme.css
@@ -199,7 +199,7 @@ a[data-role=button] {
 }
 
 .cardContent {
-    border-radius: 1em;
+    border-radius: 0.8em;
 }
 
 .collapseContent,
@@ -208,36 +208,40 @@ a[data-role=button] {
 .paperList,
 .visualCardBox {
     background-color: rgba(0, 0, 0, 0.5);
-    border-radius: 1em;
+    border-radius: 0.8em;
 }
 
 .cardOverlayContainer {
     border-radius: 0.8em;
 }
 
+.blurhash-canvas {
+    border-radius: 0.8em;
+}
+
 .visualCardBox .cardOverlayContainer {
     border-bottom-right-radius: 0;
     border-bottom-left-radius: 0;
 }
 
 .defaultCardBackground1 {
-    background-color: #d2b019;
+    background-color: #9c20ab;
 }
 
 .defaultCardBackground2 {
-    background-color: #338abb;
+    background-color: #d799de;
 }
 
 .defaultCardBackground3 {
-    background-color: #6b689d;
+    background-color: #412378;
 }
 
 .defaultCardBackground4 {
-    background-color: #dd452b;
+    background-color: #857b48;
 }
 
 .defaultCardBackground5 {
-    background-color: #5ccea9;
+    background-color: #ab8820;
 }
 
 .cardText-secondary,
@@ -307,7 +311,7 @@ a[data-role=button] {
     color: #f8f8fe !important;
 }
 
-.detailSticky {
+.detailRibbon {
     background: #000420;
     background: -moz-linear-gradient(left, #000420 0%, #06256f 18%, #2b052b 38%, #2b052b 68%, #06256f 81%, #000420 100%);
     background: -webkit-linear-gradient(left, #000420 0%, #06256f 18%, #2b052b 38%, #2b052b 68%, #06256f 81%, #000420 100%);
@@ -344,11 +348,6 @@ a[data-role=button] {
     background: rgba(170, 170, 190, 0.2);
 }
 
-.mediaInfoTimerIcon,
-.starIcon {
-    color: #f2b01e;
-}
-
 .emby-input,
 .emby-textarea {
     color: inherit;
@@ -543,20 +542,30 @@ a[data-role=button] {
     color: #c33;
 }
 
-.repeatButton-active {
-    color: #4285f4;
+.buttonActive {
+    color: #00a4dc !important;
 }
 
 .personCard .cardScalable {
-    border-radius: 50%;
+    border-radius: 50% !important;
     border: 1px solid rgb(255, 255, 255);
 }
 
+.cardBox:not(.visualCardBox) .cardPadder {
+    background-color: rgba(0, 0, 0, 0.5);
+    border-radius: 0.8em;
+}
+
 .card:focus .cardBox.visualCardBox,
 .card:focus .cardBox:not(.visualCardBox) .cardScalable {
     border-color: #ff77f1 !important;
 }
 
+.card.show-focus:not(.show-animation) .cardBox.visualCardBox,
+.card.show-focus:not(.show-animation) .cardBox:not(.visualCardBox) .cardScalable {
+    border-radius: 1.3em;
+}
+
 .layout-desktop,
 .scrollY {
     scrollbar-width: thin;
@@ -602,12 +611,6 @@ a[data-role=button] {
     width: 40vw;
 }
 
-.personCard .cardPadder-overflowPortrait,
-.personCard .cardPadder-portrait {
-    padding-bottom: 100%;
-    contain: strict;
-}
-
 .personCard .coveredImage {
     clip-path: circle(50% at 50% 50%);
 }
@@ -619,3 +622,10 @@ a[data-role=button] {
 .personCard .cardOverlayButton-br {
     right: 20%;
 }
+
+.personCard .cardPadder-overflowPortrait,
+.personCard .cardPadder-portrait {
+    padding-bottom: 100%;
+    contain: strict;
+    border-radius: 50% !important;
+}
diff --git a/src/themes/wmc/theme.css b/src/themes/wmc/theme.css
index e7d4c0371b..4a7375a129 100644
--- a/src/themes/wmc/theme.css
+++ b/src/themes/wmc/theme.css
@@ -209,7 +209,7 @@ html {
     color: #fff !important;
 }
 
-.detailSticky {
+.detailRibbon {
     background-color: #081b3b;
 }
 
@@ -243,11 +243,6 @@ html {
     background: rgba(170, 170, 190, 0.2);
 }
 
-.mediaInfoTimerIcon,
-.starIcon {
-    color: #cb272a;
-}
-
 .emby-input,
 .emby-textarea {
     color: inherit;
@@ -426,8 +421,12 @@ html {
     color: #c33;
 }
 
-.repeatButton-active {
-    color: #4285f4;
+.buttonActive {
+    color: #00a4dc !important;
+}
+
+.cardBox:not(.visualCardBox) .cardPadder {
+    background-color: #0f3562;
 }
 
 .card:focus .cardBox.visualCardBox,
diff --git a/webpack.common.js b/webpack.common.js
index 03beb63a73..d870b1046e 100644
--- a/webpack.common.js
+++ b/webpack.common.js
@@ -16,6 +16,7 @@ const Assets = [
 module.exports = {
     context: path.resolve(__dirname, 'src'),
     entry: './bundle.js',
+    stats: 'errors-only',
     resolve: {
         modules: [
             path.resolve(__dirname, 'node_modules')
diff --git a/webpack.dev.js b/webpack.dev.js
index 0bb2f1fdb5..3d0c2a48a0 100644
--- a/webpack.dev.js
+++ b/webpack.dev.js
@@ -15,7 +15,7 @@ module.exports = merge(common, {
         rules: [
             {
                 test: /\.js$/,
-                exclude: /node_modules[\\/](?!date-fns|jellyfin-apiclient|query-string|split-on-first|strict-uri-encode)/,
+                exclude: /node_modules[\\/](?!date-fns|epubjs|jellyfin-apiclient|query-string|split-on-first|strict-uri-encode|xmldom)/,
                 use: {
                     loader: 'babel-loader',
                     options: {
diff --git a/webpack.prod.js b/webpack.prod.js
index 82f1d4d2f9..52d6d0a865 100644
--- a/webpack.prod.js
+++ b/webpack.prod.js
@@ -8,7 +8,7 @@ module.exports = merge(common, {
         rules: [
             {
                 test: /\.js$/,
-                exclude: /node_modules[\\/](?!date-fns|jellyfin-apiclient|query-string|split-on-first|strict-uri-encode)/,
+                exclude: /node_modules[\\/](?!date-fns|epubjs|jellyfin-apiclient|query-string|split-on-first|strict-uri-encode|xmldom)/,
                 use: {
                     loader: 'babel-loader',
                     options: {
diff --git a/yarn.lock b/yarn.lock
index 20fdef5de1..e7881d1608 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,322 +2,349 @@
 # yarn lockfile v1
 
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.8.3.tgz#33e25903d7481181534e12ec0a25f16b6fcf419e"
-  integrity sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.4.tgz#168da1a36e90da68ae8d49c0f1b48c7c6249213a"
+  integrity sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==
   dependencies:
-    "@babel/highlight" "^7.8.3"
+    "@babel/highlight" "^7.10.4"
 
-"@babel/compat-data@^7.9.6":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.9.6.tgz#3f604c40e420131affe6f2c8052e9a275ae2049b"
-  integrity sha512-5QPTrNen2bm7RBc7dsOmcA5hbrS4O2Vhmk5XOL4zWW/zD/hV0iinpefDlkm+tBBy8kDtFaaeEvmAqt+nURAV2g==
+"@babel/compat-data@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.10.4.tgz#706a6484ee6f910b719b696a9194f8da7d7ac241"
+  integrity sha512-t+rjExOrSVvjQQXNp5zAIYDp00KjdvGl/TpDX5REPr0S9IAIPQMTilcfG6q8c0QFmj9lSTVySV2VTsyggvtNIw==
   dependencies:
-    browserslist "^4.11.1"
+    browserslist "^4.12.0"
     invariant "^2.2.4"
     semver "^5.5.0"
 
-"@babel/core@>=7.2.2", "@babel/core@>=7.9.0", "@babel/core@^7.9.6":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.9.6.tgz#d9aa1f580abf3b2286ef40b6904d390904c63376"
-  integrity sha512-nD3deLvbsApbHAHttzIssYqgb883yU/d9roe4RZymBCDaZryMJDbptVpEpeQuRh4BJ+SYI8le9YGxKvFEvl1Wg==
+"@babel/core@>=7.2.2", "@babel/core@>=7.9.0", "@babel/core@^7.10.5":
+  version "7.10.5"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.10.5.tgz#1f15e2cca8ad9a1d78a38ddba612f5e7cdbbd330"
+  integrity sha512-O34LQooYVDXPl7QWCdW9p4NR+QlzOr7xShPPJz8GsuCU3/8ua/wqTr7gmnxXv+WBESiGU/G5s16i6tUvHkNb+w==
   dependencies:
-    "@babel/code-frame" "^7.8.3"
-    "@babel/generator" "^7.9.6"
-    "@babel/helper-module-transforms" "^7.9.0"
-    "@babel/helpers" "^7.9.6"
-    "@babel/parser" "^7.9.6"
-    "@babel/template" "^7.8.6"
-    "@babel/traverse" "^7.9.6"
-    "@babel/types" "^7.9.6"
+    "@babel/code-frame" "^7.10.4"
+    "@babel/generator" "^7.10.5"
+    "@babel/helper-module-transforms" "^7.10.5"
+    "@babel/helpers" "^7.10.4"
+    "@babel/parser" "^7.10.5"
+    "@babel/template" "^7.10.4"
+    "@babel/traverse" "^7.10.5"
+    "@babel/types" "^7.10.5"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.1"
     json5 "^2.1.2"
-    lodash "^4.17.13"
+    lodash "^4.17.19"
     resolve "^1.3.2"
     semver "^5.4.1"
     source-map "^0.5.0"
 
-"@babel/generator@^7.9.6":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.9.6.tgz#5408c82ac5de98cda0d77d8124e99fa1f2170a43"
-  integrity sha512-+htwWKJbH2bL72HRluF8zumBxzuX0ZZUFl3JLNyoUjM/Ho8wnVpPXM6aUz8cfKDqQ/h7zHqKt4xzJteUosckqQ==
+"@babel/generator@^7.10.5":
+  version "7.10.5"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.10.5.tgz#1b903554bc8c583ee8d25f1e8969732e6b829a69"
+  integrity sha512-3vXxr3FEW7E7lJZiWQ3bM4+v/Vyr9C+hpolQ8BGFr9Y8Ri2tFLWTixmwKBafDujO1WVah4fhZBeU1bieKdghig==
   dependencies:
-    "@babel/types" "^7.9.6"
+    "@babel/types" "^7.10.5"
     jsesc "^2.5.1"
-    lodash "^4.17.13"
     source-map "^0.5.0"
 
-"@babel/helper-annotate-as-pure@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.8.3.tgz#60bc0bc657f63a0924ff9a4b4a0b24a13cf4deee"
-  integrity sha512-6o+mJrZBxOoEX77Ezv9zwW7WV8DdluouRKNY/IR5u/YTMuKHgugHOzYWlYvYLpLA9nPsQCAAASpCIbjI9Mv+Uw==
+"@babel/helper-annotate-as-pure@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.4.tgz#5bf0d495a3f757ac3bda48b5bf3b3ba309c72ba3"
+  integrity sha512-XQlqKQP4vXFB7BN8fEEerrmYvHp3fK/rBkRFz9jaJbzK0B1DSfej9Kc7ZzE8Z/OnId1jpJdNAZ3BFQjWG68rcA==
   dependencies:
-    "@babel/types" "^7.8.3"
+    "@babel/types" "^7.10.4"
 
-"@babel/helper-builder-binary-assignment-operator-visitor@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.8.3.tgz#c84097a427a061ac56a1c30ebf54b7b22d241503"
-  integrity sha512-5eFOm2SyFPK4Rh3XMMRDjN7lBH0orh3ss0g3rTYZnBQ+r6YPj7lgDyCvPphynHvUrobJmeMignBr6Acw9mAPlw==
+"@babel/helper-builder-binary-assignment-operator-visitor@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.4.tgz#bb0b75f31bf98cbf9ff143c1ae578b87274ae1a3"
+  integrity sha512-L0zGlFrGWZK4PbT8AszSfLTM5sDU1+Az/En9VrdT8/LmEiJt4zXt+Jve9DCAnQcbqDhCI+29y/L93mrDzddCcg==
   dependencies:
-    "@babel/helper-explode-assignable-expression" "^7.8.3"
-    "@babel/types" "^7.8.3"
+    "@babel/helper-explode-assignable-expression" "^7.10.4"
+    "@babel/types" "^7.10.4"
 
-"@babel/helper-compilation-targets@^7.9.6":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.9.6.tgz#1e05b7ccc9d38d2f8b40b458b380a04dcfadd38a"
-  integrity sha512-x2Nvu0igO0ejXzx09B/1fGBxY9NXQlBW2kZsSxCJft+KHN8t9XWzIvFxtPHnBOAXpVsdxZKZFbRUC8TsNKajMw==
+"@babel/helper-compilation-targets@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.10.4.tgz#804ae8e3f04376607cc791b9d47d540276332bd2"
+  integrity sha512-a3rYhlsGV0UHNDvrtOXBg8/OpfV0OKTkxKPzIplS1zpx7CygDcWWxckxZeDd3gzPzC4kUT0A4nVFDK0wGMh4MQ==
   dependencies:
-    "@babel/compat-data" "^7.9.6"
-    browserslist "^4.11.1"
+    "@babel/compat-data" "^7.10.4"
+    browserslist "^4.12.0"
     invariant "^2.2.4"
     levenary "^1.1.1"
     semver "^5.5.0"
 
-"@babel/helper-create-regexp-features-plugin@^7.8.3", "@babel/helper-create-regexp-features-plugin@^7.8.8":
-  version "7.8.8"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.8.8.tgz#5d84180b588f560b7864efaeea89243e58312087"
-  integrity sha512-LYVPdwkrQEiX9+1R29Ld/wTrmQu1SSKYnuOk3g0CkcZMA1p0gsNxJFj/3gBdaJ7Cg0Fnek5z0DsMULePP7Lrqg==
+"@babel/helper-create-class-features-plugin@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.4.tgz#2d4015d0136bd314103a70d84a7183e4b344a355"
+  integrity sha512-9raUiOsXPxzzLjCXeosApJItoMnX3uyT4QdM2UldffuGApNrF8e938MwNpDCK9CPoyxrEoCgT+hObJc3mZa6lQ==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.8.3"
-    "@babel/helper-regex" "^7.8.3"
+    "@babel/helper-function-name" "^7.10.4"
+    "@babel/helper-member-expression-to-functions" "^7.10.4"
+    "@babel/helper-optimise-call-expression" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-replace-supers" "^7.10.4"
+    "@babel/helper-split-export-declaration" "^7.10.4"
+
+"@babel/helper-create-regexp-features-plugin@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.10.4.tgz#fdd60d88524659a0b6959c0579925e425714f3b8"
+  integrity sha512-2/hu58IEPKeoLF45DBwx3XFqsbCXmkdAay4spVr2x0jYgRxrSNp+ePwvSsy9g6YSaNDcKIQVPXk1Ov8S2edk2g==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.10.4"
+    "@babel/helper-regex" "^7.10.4"
     regexpu-core "^4.7.0"
 
-"@babel/helper-define-map@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.8.3.tgz#a0655cad5451c3760b726eba875f1cd8faa02c15"
-  integrity sha512-PoeBYtxoZGtct3md6xZOCWPcKuMuk3IHhgxsRRNtnNShebf4C8YonTSblsK4tvDbm+eJAw2HAPOfCr+Q/YRG/g==
+"@babel/helper-define-map@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.10.4.tgz#f037ad794264f729eda1889f4ee210b870999092"
+  integrity sha512-nIij0oKErfCnLUCWaCaHW0Bmtl2RO9cN7+u2QT8yqTywgALKlyUVOvHDElh+b5DwVC6YB1FOYFOTWcN/+41EDA==
   dependencies:
-    "@babel/helper-function-name" "^7.8.3"
-    "@babel/types" "^7.8.3"
+    "@babel/helper-function-name" "^7.10.4"
+    "@babel/types" "^7.10.4"
     lodash "^4.17.13"
 
-"@babel/helper-explode-assignable-expression@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.8.3.tgz#a728dc5b4e89e30fc2dfc7d04fa28a930653f982"
-  integrity sha512-N+8eW86/Kj147bO9G2uclsg5pwfs/fqqY5rwgIL7eTBklgXjcOJ3btzS5iM6AitJcftnY7pm2lGsrJVYLGjzIw==
+"@babel/helper-explode-assignable-expression@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.10.4.tgz#40a1cd917bff1288f699a94a75b37a1a2dbd8c7c"
+  integrity sha512-4K71RyRQNPRrR85sr5QY4X3VwG4wtVoXZB9+L3r1Gp38DhELyHCtovqydRi7c1Ovb17eRGiQ/FD5s8JdU0Uy5A==
   dependencies:
-    "@babel/traverse" "^7.8.3"
-    "@babel/types" "^7.8.3"
+    "@babel/traverse" "^7.10.4"
+    "@babel/types" "^7.10.4"
 
-"@babel/helper-function-name@^7.8.3", "@babel/helper-function-name@^7.9.5":
-  version "7.9.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz#2b53820d35275120e1874a82e5aabe1376920a5c"
-  integrity sha512-JVcQZeXM59Cd1qanDUxv9fgJpt3NeKUaqBqUEvfmQ+BCOKq2xUgaWZW2hr0dkbyJgezYuplEoh5knmrnS68efw==
+"@babel/helper-function-name@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz#d2d3b20c59ad8c47112fa7d2a94bc09d5ef82f1a"
+  integrity sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==
   dependencies:
-    "@babel/helper-get-function-arity" "^7.8.3"
-    "@babel/template" "^7.8.3"
-    "@babel/types" "^7.9.5"
+    "@babel/helper-get-function-arity" "^7.10.4"
+    "@babel/template" "^7.10.4"
+    "@babel/types" "^7.10.4"
 
-"@babel/helper-get-function-arity@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz#b894b947bd004381ce63ea1db9f08547e920abd5"
-  integrity sha512-FVDR+Gd9iLjUMY1fzE2SR0IuaJToR4RkCDARVfsBBPSP53GEqSFjD8gNyxg246VUyc/ALRxFaAK8rVG7UT7xRA==
+"@babel/helper-get-function-arity@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz#98c1cbea0e2332f33f9a4661b8ce1505b2c19ba2"
+  integrity sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==
   dependencies:
-    "@babel/types" "^7.8.3"
+    "@babel/types" "^7.10.4"
 
-"@babel/helper-hoist-variables@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.8.3.tgz#1dbe9b6b55d78c9b4183fc8cdc6e30ceb83b7134"
-  integrity sha512-ky1JLOjcDUtSc+xkt0xhYff7Z6ILTAHKmZLHPxAhOP0Nd77O+3nCsd6uSVYur6nJnCI029CrNbYlc0LoPfAPQg==
+"@babel/helper-hoist-variables@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.4.tgz#d49b001d1d5a68ca5e6604dda01a6297f7c9381e"
+  integrity sha512-wljroF5PgCk2juF69kanHVs6vrLwIPNp6DLD+Lrl3hoQ3PpPPikaDRNFA+0t81NOoMt2DL6WW/mdU8k4k6ZzuA==
   dependencies:
-    "@babel/types" "^7.8.3"
+    "@babel/types" "^7.10.4"
 
-"@babel/helper-member-expression-to-functions@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.8.3.tgz#659b710498ea6c1d9907e0c73f206eee7dadc24c"
-  integrity sha512-fO4Egq88utkQFjbPrSHGmGLFqmrshs11d46WI+WZDESt7Wu7wN2G2Iu+NMMZJFDOVRHAMIkB5SNh30NtwCA7RA==
+"@babel/helper-member-expression-to-functions@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.10.4.tgz#7cd04b57dfcf82fce9aeae7d4e4452fa31b8c7c4"
+  integrity sha512-m5j85pK/KZhuSdM/8cHUABQTAslV47OjfIB9Cc7P+PvlAoBzdb79BGNfw8RhT5Mq3p+xGd0ZfAKixbrUZx0C7A==
   dependencies:
-    "@babel/types" "^7.8.3"
+    "@babel/types" "^7.10.4"
 
-"@babel/helper-module-imports@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.8.3.tgz#7fe39589b39c016331b6b8c3f441e8f0b1419498"
-  integrity sha512-R0Bx3jippsbAEtzkpZ/6FIiuzOURPcMjHp+Z6xPe6DtApDJx+w7UYyOLanZqO8+wKR9G10s/FmHXvxaMd9s6Kg==
+"@babel/helper-module-imports@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz#4c5c54be04bd31670a7382797d75b9fa2e5b5620"
+  integrity sha512-nEQJHqYavI217oD9+s5MUBzk6x1IlvoS9WTPfgG43CbMEeStE0v+r+TucWdx8KFGowPGvyOkDT9+7DHedIDnVw==
   dependencies:
-    "@babel/types" "^7.8.3"
+    "@babel/types" "^7.10.4"
 
-"@babel/helper-module-transforms@^7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.9.0.tgz#43b34dfe15961918707d247327431388e9fe96e5"
-  integrity sha512-0FvKyu0gpPfIQ8EkxlrAydOWROdHpBmiCiRwLkUiBGhCUPRRbVD2/tm3sFr/c/GWFrQ/ffutGUAnx7V0FzT2wA==
+"@babel/helper-module-transforms@^7.10.4", "@babel/helper-module-transforms@^7.10.5":
+  version "7.10.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.10.5.tgz#120c271c0b3353673fcdfd8c053db3c544a260d6"
+  integrity sha512-4P+CWMJ6/j1W915ITJaUkadLObmCRRSC234uctJfn/vHrsLNxsR8dwlcXv9ZhJWzl77awf+mWXSZEKt5t0OnlA==
   dependencies:
-    "@babel/helper-module-imports" "^7.8.3"
-    "@babel/helper-replace-supers" "^7.8.6"
-    "@babel/helper-simple-access" "^7.8.3"
-    "@babel/helper-split-export-declaration" "^7.8.3"
-    "@babel/template" "^7.8.6"
-    "@babel/types" "^7.9.0"
-    lodash "^4.17.13"
+    "@babel/helper-module-imports" "^7.10.4"
+    "@babel/helper-replace-supers" "^7.10.4"
+    "@babel/helper-simple-access" "^7.10.4"
+    "@babel/helper-split-export-declaration" "^7.10.4"
+    "@babel/template" "^7.10.4"
+    "@babel/types" "^7.10.5"
+    lodash "^4.17.19"
 
-"@babel/helper-optimise-call-expression@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.8.3.tgz#7ed071813d09c75298ef4f208956006b6111ecb9"
-  integrity sha512-Kag20n86cbO2AvHca6EJsvqAd82gc6VMGule4HwebwMlwkpXuVqrNRj6CkCV2sKxgi9MyAUnZVnZ6lJ1/vKhHQ==
+"@babel/helper-optimise-call-expression@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz#50dc96413d594f995a77905905b05893cd779673"
+  integrity sha512-n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg==
   dependencies:
-    "@babel/types" "^7.8.3"
+    "@babel/types" "^7.10.4"
 
-"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz#9ea293be19babc0f52ff8ca88b34c3611b208670"
-  integrity sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.8.0":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz#2f75a831269d4f677de49986dff59927533cf375"
+  integrity sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==
 
-"@babel/helper-regex@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.8.3.tgz#139772607d51b93f23effe72105b319d2a4c6965"
-  integrity sha512-BWt0QtYv/cg/NecOAZMdcn/waj/5P26DR4mVLXfFtDokSR6fyuG0Pj+e2FqtSME+MqED1khnSMulkmGl8qWiUQ==
+"@babel/helper-regex@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.10.4.tgz#59b373daaf3458e5747dece71bbaf45f9676af6d"
+  integrity sha512-inWpnHGgtg5NOF0eyHlC0/74/VkdRITY9dtTpB2PrxKKn+AkVMRiZz/Adrx+Ssg+MLDesi2zohBW6MVq6b4pOQ==
   dependencies:
     lodash "^4.17.13"
 
-"@babel/helper-remap-async-to-generator@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.8.3.tgz#273c600d8b9bf5006142c1e35887d555c12edd86"
-  integrity sha512-kgwDmw4fCg7AVgS4DukQR/roGp+jP+XluJE5hsRZwxCYGg+Rv9wSGErDWhlI90FODdYfd4xG4AQRiMDjjN0GzA==
+"@babel/helper-remap-async-to-generator@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.10.4.tgz#fce8bea4e9690bbe923056ded21e54b4e8b68ed5"
+  integrity sha512-86Lsr6NNw3qTNl+TBcF1oRZMaVzJtbWTyTko+CQL/tvNvcGYEFKbLXDPxtW0HKk3McNOk4KzY55itGWCAGK5tg==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.8.3"
-    "@babel/helper-wrap-function" "^7.8.3"
-    "@babel/template" "^7.8.3"
-    "@babel/traverse" "^7.8.3"
-    "@babel/types" "^7.8.3"
+    "@babel/helper-annotate-as-pure" "^7.10.4"
+    "@babel/helper-wrap-function" "^7.10.4"
+    "@babel/template" "^7.10.4"
+    "@babel/traverse" "^7.10.4"
+    "@babel/types" "^7.10.4"
 
-"@babel/helper-replace-supers@^7.8.3", "@babel/helper-replace-supers@^7.8.6":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.9.6.tgz#03149d7e6a5586ab6764996cd31d6981a17e1444"
-  integrity sha512-qX+chbxkbArLyCImk3bWV+jB5gTNU/rsze+JlcF6Nf8tVTigPJSI1o1oBow/9Resa1yehUO9lIipsmu9oG4RzA==
+"@babel/helper-replace-supers@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz#d585cd9388ea06e6031e4cd44b6713cbead9e6cf"
+  integrity sha512-sPxZfFXocEymYTdVK1UNmFPBN+Hv5mJkLPsYWwGBxZAxaWfFu+xqp7b6qWD0yjNuNL2VKc6L5M18tOXUP7NU0A==
   dependencies:
-    "@babel/helper-member-expression-to-functions" "^7.8.3"
-    "@babel/helper-optimise-call-expression" "^7.8.3"
-    "@babel/traverse" "^7.9.6"
-    "@babel/types" "^7.9.6"
+    "@babel/helper-member-expression-to-functions" "^7.10.4"
+    "@babel/helper-optimise-call-expression" "^7.10.4"
+    "@babel/traverse" "^7.10.4"
+    "@babel/types" "^7.10.4"
 
-"@babel/helper-simple-access@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.8.3.tgz#7f8109928b4dab4654076986af575231deb639ae"
-  integrity sha512-VNGUDjx5cCWg4vvCTR8qQ7YJYZ+HBjxOgXEl7ounz+4Sn7+LMD3CFrCTEU6/qXKbA2nKg21CwhhBzO0RpRbdCw==
+"@babel/helper-simple-access@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.10.4.tgz#0f5ccda2945277a2a7a2d3a821e15395edcf3461"
+  integrity sha512-0fMy72ej/VEvF8ULmX6yb5MtHG4uH4Dbd6I/aHDb/JVg0bbivwt9Wg+h3uMvX+QSFtwr5MeItvazbrc4jtRAXw==
   dependencies:
-    "@babel/template" "^7.8.3"
-    "@babel/types" "^7.8.3"
+    "@babel/template" "^7.10.4"
+    "@babel/types" "^7.10.4"
 
-"@babel/helper-split-export-declaration@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz#31a9f30070f91368a7182cf05f831781065fc7a9"
-  integrity sha512-3x3yOeyBhW851hroze7ElzdkeRXQYQbFIb7gLK1WQYsw2GWDay5gAJNw1sWJ0VFP6z5J1whqeXH/WCdCjZv6dA==
+"@babel/helper-split-export-declaration@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.4.tgz#2c70576eaa3b5609b24cb99db2888cc3fc4251d1"
+  integrity sha512-pySBTeoUff56fL5CBU2hWm9TesA4r/rOkI9DyJLvvgz09MB9YtfIYe3iBriVaYNaPe+Alua0vBIOVOLs2buWhg==
   dependencies:
-    "@babel/types" "^7.8.3"
+    "@babel/types" "^7.10.4"
 
-"@babel/helper-validator-identifier@^7.9.0", "@babel/helper-validator-identifier@^7.9.5":
-  version "7.9.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz#90977a8e6fbf6b431a7dc31752eee233bf052d80"
-  integrity sha512-/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g==
+"@babel/helper-validator-identifier@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz#a78c7a7251e01f616512d31b10adcf52ada5e0d2"
+  integrity sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==
 
-"@babel/helper-wrap-function@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.8.3.tgz#9dbdb2bb55ef14aaa01fe8c99b629bd5352d8610"
-  integrity sha512-LACJrbUET9cQDzb6kG7EeD7+7doC3JNvUgTEQOx2qaO1fKlzE/Bf05qs9w1oXQMmXlPO65lC3Tq9S6gZpTErEQ==
+"@babel/helper-wrap-function@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.10.4.tgz#8a6f701eab0ff39f765b5a1cfef409990e624b87"
+  integrity sha512-6py45WvEF0MhiLrdxtRjKjufwLL1/ob2qDJgg5JgNdojBAZSAKnAjkyOCNug6n+OBl4VW76XjvgSFTdaMcW0Ug==
   dependencies:
-    "@babel/helper-function-name" "^7.8.3"
-    "@babel/template" "^7.8.3"
-    "@babel/traverse" "^7.8.3"
-    "@babel/types" "^7.8.3"
+    "@babel/helper-function-name" "^7.10.4"
+    "@babel/template" "^7.10.4"
+    "@babel/traverse" "^7.10.4"
+    "@babel/types" "^7.10.4"
 
-"@babel/helpers@^7.9.6":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.9.6.tgz#092c774743471d0bb6c7de3ad465ab3d3486d580"
-  integrity sha512-tI4bUbldloLcHWoRUMAj4g1bF313M/o6fBKhIsb3QnGVPwRm9JsNf/gqMkQ7zjqReABiffPV6RWj7hEglID5Iw==
+"@babel/helpers@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.10.4.tgz#2abeb0d721aff7c0a97376b9e1f6f65d7a475044"
+  integrity sha512-L2gX/XeUONeEbI78dXSrJzGdz4GQ+ZTA/aazfUsFaWjSe95kiCuOZ5HsXvkiw3iwF+mFHSRUfJU8t6YavocdXA==
   dependencies:
-    "@babel/template" "^7.8.3"
-    "@babel/traverse" "^7.9.6"
-    "@babel/types" "^7.9.6"
+    "@babel/template" "^7.10.4"
+    "@babel/traverse" "^7.10.4"
+    "@babel/types" "^7.10.4"
 
-"@babel/highlight@^7.8.3":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.9.0.tgz#4e9b45ccb82b79607271b2979ad82c7b68163079"
-  integrity sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==
+"@babel/highlight@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.4.tgz#7d1bdfd65753538fabe6c38596cdb76d9ac60143"
+  integrity sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.9.0"
+    "@babel/helper-validator-identifier" "^7.10.4"
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.8.6", "@babel/parser@^7.9.6":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.9.6.tgz#3b1bbb30dabe600cd72db58720998376ff653bc7"
-  integrity sha512-AoeIEJn8vt+d/6+PXDRPaksYhnlbMIiejioBZvvMQsOjW/JYK6k/0dKnvvP3EhK5GfMBWDPtrxRtegWdAcdq9Q==
+"@babel/parser@^7.10.4", "@babel/parser@^7.10.5":
+  version "7.10.5"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.10.5.tgz#e7c6bf5a7deff957cec9f04b551e2762909d826b"
+  integrity sha512-wfryxy4bE1UivvQKSQDU4/X6dr+i8bctjUjj8Zyt3DQy7NtPizJXT8M52nqpNKL+nq2PW8lxk4ZqLj0fD4B4hQ==
 
-"@babel/plugin-proposal-async-generator-functions@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.8.3.tgz#bad329c670b382589721b27540c7d288601c6e6f"
-  integrity sha512-NZ9zLv848JsV3hs8ryEh7Uaz/0KsmPLqv0+PdkDJL1cJy0K4kOCFa8zc1E3mp+RHPQcpdfb/6GovEsW4VDrOMw==
+"@babel/plugin-proposal-async-generator-functions@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.4.tgz#4b65abb3d9bacc6c657aaa413e56696f9f170fc6"
+  integrity sha512-MJbxGSmejEFVOANAezdO39SObkURO5o/8b6fSH6D1pi9RZQt+ldppKPXfqgUWpSQ9asM6xaSaSJIaeWMDRP0Zg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/helper-remap-async-to-generator" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-remap-async-to-generator" "^7.10.4"
     "@babel/plugin-syntax-async-generators" "^7.8.0"
 
-"@babel/plugin-proposal-dynamic-import@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.8.3.tgz#38c4fe555744826e97e2ae930b0fb4cc07e66054"
-  integrity sha512-NyaBbyLFXFLT9FP+zk0kYlUlA8XtCUbehs67F0nnEg7KICgMc2mNkIeu9TYhKzyXMkrapZFwAhXLdnt4IYHy1w==
+"@babel/plugin-proposal-class-properties@^7.10.1", "@babel/plugin-proposal-class-properties@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.10.4.tgz#a33bf632da390a59c7a8c570045d1115cd778807"
+  integrity sha512-vhwkEROxzcHGNu2mzUC0OFFNXdZ4M23ib8aRRcJSsW8BZK9pQMD7QB7csl97NBbgGZO7ZyHUyKDnxzOaP4IrCg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-create-class-features-plugin" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
+
+"@babel/plugin-proposal-dynamic-import@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.10.4.tgz#ba57a26cb98b37741e9d5bca1b8b0ddf8291f17e"
+  integrity sha512-up6oID1LeidOOASNXgv/CFbgBqTuKJ0cJjz6An5tWD+NVBNlp3VNSBxv2ZdU7SYl3NxJC7agAQDApZusV6uFwQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-dynamic-import" "^7.8.0"
 
-"@babel/plugin-proposal-json-strings@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.8.3.tgz#da5216b238a98b58a1e05d6852104b10f9a70d6b"
-  integrity sha512-KGhQNZ3TVCQG/MjRbAUwuH+14y9q0tpxs1nWWs3pbSleRdDro9SAMMDyye8HhY1gqZ7/NqIc8SKhya0wRDgP1Q==
+"@babel/plugin-proposal-json-strings@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.10.4.tgz#593e59c63528160233bd321b1aebe0820c2341db"
+  integrity sha512-fCL7QF0Jo83uy1K0P2YXrfX11tj3lkpN7l4dMv9Y9VkowkhkQDwFHFd8IiwyK5MZjE8UpbgokkgtcReH88Abaw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-json-strings" "^7.8.0"
 
-"@babel/plugin-proposal-nullish-coalescing-operator@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.8.3.tgz#e4572253fdeed65cddeecfdab3f928afeb2fd5d2"
-  integrity sha512-TS9MlfzXpXKt6YYomudb/KU7nQI6/xnapG6in1uZxoxDghuSMZsPb6D2fyUwNYSAp4l1iR7QtFOjkqcRYcUsfw==
+"@babel/plugin-proposal-nullish-coalescing-operator@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.10.4.tgz#02a7e961fc32e6d5b2db0649e01bf80ddee7e04a"
+  integrity sha512-wq5n1M3ZUlHl9sqT2ok1T2/MTt6AXE0e1Lz4WzWBr95LsAZ5qDXe4KnFuauYyEyLiohvXFMdbsOTMyLZs91Zlw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
 
-"@babel/plugin-proposal-numeric-separator@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.8.3.tgz#5d6769409699ec9b3b68684cd8116cedff93bad8"
-  integrity sha512-jWioO1s6R/R+wEHizfaScNsAx+xKgwTLNXSh7tTC4Usj3ItsPEhYkEpU4h+lpnBwq7NBVOJXfO6cRFYcX69JUQ==
+"@babel/plugin-proposal-numeric-separator@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.10.4.tgz#ce1590ff0a65ad12970a609d78855e9a4c1aef06"
+  integrity sha512-73/G7QoRoeNkLZFxsoCCvlg4ezE4eM+57PnOqgaPOozd5myfj7p0muD1mRVJvbUWbOzD+q3No2bWbaKy+DJ8DA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-syntax-numeric-separator" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
 
-"@babel/plugin-proposal-object-rest-spread@^7.9.6":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.6.tgz#7a093586fcb18b08266eb1a7177da671ac575b63"
-  integrity sha512-Ga6/fhGqA9Hj+y6whNpPv8psyaK5xzrQwSPsGPloVkvmH+PqW1ixdnfJ9uIO06OjQNYol3PMnfmJ8vfZtkzF+A==
+"@babel/plugin-proposal-object-rest-spread@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.10.4.tgz#50129ac216b9a6a55b3853fdd923e74bf553a4c0"
+  integrity sha512-6vh4SqRuLLarjgeOf4EaROJAHjvu9Gl+/346PbDH9yWbJyfnJ/ah3jmYKYtswEyCoWZiidvVHjHshd4WgjB9BA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
-    "@babel/plugin-transform-parameters" "^7.9.5"
+    "@babel/plugin-transform-parameters" "^7.10.4"
 
-"@babel/plugin-proposal-optional-catch-binding@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.8.3.tgz#9dee96ab1650eed88646ae9734ca167ac4a9c5c9"
-  integrity sha512-0gkX7J7E+AtAw9fcwlVQj8peP61qhdg/89D5swOkjYbkboA2CVckn3kiyum1DE0wskGb7KJJxBdyEBApDLLVdw==
+"@babel/plugin-proposal-optional-catch-binding@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.10.4.tgz#31c938309d24a78a49d68fdabffaa863758554dd"
+  integrity sha512-LflT6nPh+GK2MnFiKDyLiqSqVHkQnVf7hdoAvyTnnKj9xB3docGRsdPuxp6qqqW19ifK3xgc9U5/FwrSaCNX5g==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.0"
 
-"@babel/plugin-proposal-optional-chaining@^7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.9.0.tgz#31db16b154c39d6b8a645292472b98394c292a58"
-  integrity sha512-NDn5tu3tcv4W30jNhmc2hyD5c56G6cXx4TesJubhxrJeCvuuMpttxr0OnNCqbZGhFjLrg+NIhxxC+BK5F6yS3w==
+"@babel/plugin-proposal-optional-chaining@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.10.4.tgz#750f1255e930a1f82d8cdde45031f81a0d0adff7"
+  integrity sha512-ZIhQIEeavTgouyMSdZRap4VPPHqJJ3NEs2cuHs5p0erH+iz6khB0qfgU8g7UuJkG88+fBMy23ZiU+nuHvekJeQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-optional-chaining" "^7.8.0"
 
-"@babel/plugin-proposal-unicode-property-regex@^7.4.4", "@babel/plugin-proposal-unicode-property-regex@^7.8.3":
-  version "7.8.8"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.8.8.tgz#ee3a95e90cdc04fe8cd92ec3279fa017d68a0d1d"
-  integrity sha512-EVhjVsMpbhLw9ZfHWSx2iy13Q8Z/eg8e8ccVWt23sWQK5l1UdkoLJPN5w69UA4uITGBnEZD2JOe4QOHycYKv8A==
+"@babel/plugin-proposal-private-methods@^7.10.1", "@babel/plugin-proposal-private-methods@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.10.4.tgz#b160d972b8fdba5c7d111a145fc8c421fc2a6909"
+  integrity sha512-wh5GJleuI8k3emgTg5KkJK6kHNsGEr0uBTDBuQUBJwckk9xs1ez79ioheEVVxMLyPscB0LfkbVHslQqIzWV6Bw==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.8.8"
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-create-class-features-plugin" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
+
+"@babel/plugin-proposal-unicode-property-regex@^7.10.4", "@babel/plugin-proposal-unicode-property-regex@^7.4.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.10.4.tgz#4483cda53041ce3413b7fe2f00022665ddfaa75d"
+  integrity sha512-H+3fOgPnEXFL9zGYtKQe4IDOPKYlZdF1kqFDQRRb8PK4B8af1vAGK04tF5iQAAsui+mHNBQSAtd2/ndEDe9wuA==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-syntax-async-generators@^7.8.0":
   version "7.8.4"
@@ -326,6 +353,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
+"@babel/plugin-syntax-class-properties@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.10.4.tgz#6644e6a0baa55a61f9e3231f6c9eeb6ee46c124c"
+  integrity sha512-GCSBF7iUle6rNugfURwNmCGG3Z/2+opxAMLs1nND4bhEG5PuxTIggDBoeYYSujAlLtsupzOHYJQgPS3pivwXIA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
+
 "@babel/plugin-syntax-dynamic-import@^7.8.0":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3"
@@ -347,12 +381,12 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-numeric-separator@^7.8.0", "@babel/plugin-syntax-numeric-separator@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.8.3.tgz#0e3fb63e09bea1b11e96467271c8308007e7c41f"
-  integrity sha512-H7dCMAdN83PcCmqmkHB5dtp+Xa9a6LKSvA2hiFBC/5alSHxM5VgWZXFqDi0YFe8XNGT6iCa+z4V4zSt/PdZ7Dw==
+"@babel/plugin-syntax-numeric-separator@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz#b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97"
+  integrity sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-syntax-object-rest-spread@^7.8.0":
   version "7.8.3"
@@ -375,326 +409,337 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-top-level-await@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.8.3.tgz#3acdece695e6b13aaf57fc291d1a800950c71391"
-  integrity sha512-kwj1j9lL/6Wd0hROD3b/OZZ7MSrZLqqn9RAZ5+cYYsflQ9HZBIKCUkr3+uL1MEJ1NePiUbf98jjiMQSv0NMR9g==
+"@babel/plugin-syntax-top-level-await@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.10.4.tgz#4bbeb8917b54fcf768364e0a81f560e33a3ef57d"
+  integrity sha512-ni1brg4lXEmWyafKr0ccFWkJG0CeMt4WV1oyeBW6EFObF4oOHclbkj5cARxAPQyAQ2UTuplJyK4nfkXIMMFvsQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-arrow-functions@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.8.3.tgz#82776c2ed0cd9e1a49956daeb896024c9473b8b6"
-  integrity sha512-0MRF+KC8EqH4dbuITCWwPSzsyO3HIWWlm30v8BbbpOrS1B++isGxPnnuq/IZvOX5J2D/p7DQalQm+/2PnlKGxg==
+"@babel/plugin-transform-arrow-functions@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.10.4.tgz#e22960d77e697c74f41c501d44d73dbf8a6a64cd"
+  integrity sha512-9J/oD1jV0ZCBcgnoFWFq1vJd4msoKb/TCpGNFyyLt0zABdcvgK3aYikZ8HjzB14c26bc7E3Q1yugpwGy2aTPNA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-async-to-generator@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.8.3.tgz#4308fad0d9409d71eafb9b1a6ee35f9d64b64086"
-  integrity sha512-imt9tFLD9ogt56Dd5CI/6XgpukMwd/fLGSrix2httihVe7LOGVPhyhMh1BU5kDM7iHD08i8uUtmV2sWaBFlHVQ==
+"@babel/plugin-transform-async-to-generator@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.10.4.tgz#41a5017e49eb6f3cda9392a51eef29405b245a37"
+  integrity sha512-F6nREOan7J5UXTLsDsZG3DXmZSVofr2tGNwfdrVwkDWHfQckbQXnXSPfD7iO+c/2HGqycwyLST3DnZ16n+cBJQ==
   dependencies:
-    "@babel/helper-module-imports" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/helper-remap-async-to-generator" "^7.8.3"
+    "@babel/helper-module-imports" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-remap-async-to-generator" "^7.10.4"
 
-"@babel/plugin-transform-block-scoped-functions@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.8.3.tgz#437eec5b799b5852072084b3ae5ef66e8349e8a3"
-  integrity sha512-vo4F2OewqjbB1+yaJ7k2EJFHlTP3jR634Z9Cj9itpqNjuLXvhlVxgnjsHsdRgASR8xYDrx6onw4vW5H6We0Jmg==
+"@babel/plugin-transform-block-scoped-functions@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.10.4.tgz#1afa595744f75e43a91af73b0d998ecfe4ebc2e8"
+  integrity sha512-WzXDarQXYYfjaV1szJvN3AD7rZgZzC1JtjJZ8dMHUyiK8mxPRahynp14zzNjU3VkPqPsO38CzxiWO1c9ARZ8JA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-block-scoping@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.8.3.tgz#97d35dab66857a437c166358b91d09050c868f3a"
-  integrity sha512-pGnYfm7RNRgYRi7bids5bHluENHqJhrV4bCZRwc5GamaWIIs07N4rZECcmJL6ZClwjDz1GbdMZFtPs27hTB06w==
+"@babel/plugin-transform-block-scoping@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.10.4.tgz#a670d1364bb5019a621b9ea2001482876d734787"
+  integrity sha512-J3b5CluMg3hPUii2onJDRiaVbPtKFPLEaV5dOPY5OeAbDi1iU/UbbFFTgwb7WnanaDy7bjU35kc26W3eM5Qa0A==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
     lodash "^4.17.13"
 
-"@babel/plugin-transform-classes@^7.9.5":
-  version "7.9.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.9.5.tgz#800597ddb8aefc2c293ed27459c1fcc935a26c2c"
-  integrity sha512-x2kZoIuLC//O5iA7PEvecB105o7TLzZo8ofBVhP79N+DO3jaX+KYfww9TQcfBEZD0nikNyYcGB1IKtRq36rdmg==
+"@babel/plugin-transform-classes@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.10.4.tgz#405136af2b3e218bc4a1926228bc917ab1a0adc7"
+  integrity sha512-2oZ9qLjt161dn1ZE0Ms66xBncQH4In8Sqw1YWgBUZuGVJJS5c0OFZXL6dP2MRHrkU/eKhWg8CzFJhRQl50rQxA==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.8.3"
-    "@babel/helper-define-map" "^7.8.3"
-    "@babel/helper-function-name" "^7.9.5"
-    "@babel/helper-optimise-call-expression" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/helper-replace-supers" "^7.8.6"
-    "@babel/helper-split-export-declaration" "^7.8.3"
+    "@babel/helper-annotate-as-pure" "^7.10.4"
+    "@babel/helper-define-map" "^7.10.4"
+    "@babel/helper-function-name" "^7.10.4"
+    "@babel/helper-optimise-call-expression" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-replace-supers" "^7.10.4"
+    "@babel/helper-split-export-declaration" "^7.10.4"
     globals "^11.1.0"
 
-"@babel/plugin-transform-computed-properties@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.8.3.tgz#96d0d28b7f7ce4eb5b120bb2e0e943343c86f81b"
-  integrity sha512-O5hiIpSyOGdrQZRQ2ccwtTVkgUDBBiCuK//4RJ6UfePllUTCENOzKxfh6ulckXKc0DixTFLCfb2HVkNA7aDpzA==
+"@babel/plugin-transform-computed-properties@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.10.4.tgz#9ded83a816e82ded28d52d4b4ecbdd810cdfc0eb"
+  integrity sha512-JFwVDXcP/hM/TbyzGq3l/XWGut7p46Z3QvqFMXTfk6/09m7xZHJUN9xHfsv7vqqD4YnfI5ueYdSJtXqqBLyjBw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-destructuring@^7.9.5":
-  version "7.9.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.9.5.tgz#72c97cf5f38604aea3abf3b935b0e17b1db76a50"
-  integrity sha512-j3OEsGel8nHL/iusv/mRd5fYZ3DrOxWC82x0ogmdN/vHfAP4MYw+AFKYanzWlktNwikKvlzUV//afBW5FTp17Q==
+"@babel/plugin-transform-destructuring@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.10.4.tgz#70ddd2b3d1bea83d01509e9bb25ddb3a74fc85e5"
+  integrity sha512-+WmfvyfsyF603iPa6825mq6Qrb7uLjTOsa3XOFzlYcYDHSS4QmpOWOL0NNBY5qMbvrcf3tq0Cw+v4lxswOBpgA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-dotall-regex@^7.4.4", "@babel/plugin-transform-dotall-regex@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.8.3.tgz#c3c6ec5ee6125c6993c5cbca20dc8621a9ea7a6e"
-  integrity sha512-kLs1j9Nn4MQoBYdRXH6AeaXMbEJFaFu/v1nQkvib6QzTj8MZI5OQzqmD83/2jEM1z0DLilra5aWO5YpyC0ALIw==
+"@babel/plugin-transform-dotall-regex@^7.10.4", "@babel/plugin-transform-dotall-regex@^7.4.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.10.4.tgz#469c2062105c1eb6a040eaf4fac4b488078395ee"
+  integrity sha512-ZEAVvUTCMlMFAbASYSVQoxIbHm2OkG2MseW6bV2JjIygOjdVv8tuxrCTzj1+Rynh7ODb8GivUy7dzEXzEhuPaA==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-create-regexp-features-plugin" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-duplicate-keys@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.8.3.tgz#8d12df309aa537f272899c565ea1768e286e21f1"
-  integrity sha512-s8dHiBUbcbSgipS4SMFuWGqCvyge5V2ZeAWzR6INTVC3Ltjig/Vw1G2Gztv0vU/hRG9X8IvKvYdoksnUfgXOEQ==
+"@babel/plugin-transform-duplicate-keys@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.10.4.tgz#697e50c9fee14380fe843d1f306b295617431e47"
+  integrity sha512-GL0/fJnmgMclHiBTTWXNlYjYsA7rDrtsazHG6mglaGSTh0KsrW04qml+Bbz9FL0LcJIRwBWL5ZqlNHKTkU3xAA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-exponentiation-operator@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.8.3.tgz#581a6d7f56970e06bf51560cd64f5e947b70d7b7"
-  integrity sha512-zwIpuIymb3ACcInbksHaNcR12S++0MDLKkiqXHl3AzpgdKlFNhog+z/K0+TGW+b0w5pgTq4H6IwV/WhxbGYSjQ==
+"@babel/plugin-transform-exponentiation-operator@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.10.4.tgz#5ae338c57f8cf4001bdb35607ae66b92d665af2e"
+  integrity sha512-S5HgLVgkBcRdyQAHbKj+7KyuWx8C6t5oETmUuwz1pt3WTWJhsUV0WIIXuVvfXMxl/QQyHKlSCNNtaIamG8fysw==
   dependencies:
-    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-for-of@^7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.9.0.tgz#0f260e27d3e29cd1bb3128da5e76c761aa6c108e"
-  integrity sha512-lTAnWOpMwOXpyDx06N+ywmF3jNbafZEqZ96CGYabxHrxNX8l5ny7dt4bK/rGwAh9utyP2b2Hv7PlZh1AAS54FQ==
+"@babel/plugin-transform-for-of@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.10.4.tgz#c08892e8819d3a5db29031b115af511dbbfebae9"
+  integrity sha512-ItdQfAzu9AlEqmusA/65TqJ79eRcgGmpPPFvBnGILXZH975G0LNjP1yjHvGgfuCxqrPPueXOPe+FsvxmxKiHHQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-function-name@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.8.3.tgz#279373cb27322aaad67c2683e776dfc47196ed8b"
-  integrity sha512-rO/OnDS78Eifbjn5Py9v8y0aR+aSYhDhqAwVfsTl0ERuMZyr05L1aFSCJnbv2mmsLkit/4ReeQ9N2BgLnOcPCQ==
+"@babel/plugin-transform-function-name@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.10.4.tgz#6a467880e0fc9638514ba369111811ddbe2644b7"
+  integrity sha512-OcDCq2y5+E0dVD5MagT5X+yTRbcvFjDI2ZVAottGH6tzqjx/LKpgkUepu3hp/u4tZBzxxpNGwLsAvGBvQ2mJzg==
   dependencies:
-    "@babel/helper-function-name" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-function-name" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-literals@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.8.3.tgz#aef239823d91994ec7b68e55193525d76dbd5dc1"
-  integrity sha512-3Tqf8JJ/qB7TeldGl+TT55+uQei9JfYaregDcEAyBZ7akutriFrt6C/wLYIer6OYhleVQvH/ntEhjE/xMmy10A==
+"@babel/plugin-transform-literals@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.10.4.tgz#9f42ba0841100a135f22712d0e391c462f571f3c"
+  integrity sha512-Xd/dFSTEVuUWnyZiMu76/InZxLTYilOSr1UlHV+p115Z/Le2Fi1KXkJUYz0b42DfndostYlPub3m8ZTQlMaiqQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-member-expression-literals@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.8.3.tgz#963fed4b620ac7cbf6029c755424029fa3a40410"
-  integrity sha512-3Wk2EXhnw+rP+IDkK6BdtPKsUE5IeZ6QOGrPYvw52NwBStw9V1ZVzxgK6fSKSxqUvH9eQPR3tm3cOq79HlsKYA==
+"@babel/plugin-transform-member-expression-literals@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.10.4.tgz#b1ec44fcf195afcb8db2c62cd8e551c881baf8b7"
+  integrity sha512-0bFOvPyAoTBhtcJLr9VcwZqKmSjFml1iVxvPL0ReomGU53CX53HsM4h2SzckNdkQcHox1bpAqzxBI1Y09LlBSw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-modules-amd@^7.9.6":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.9.6.tgz#8539ec42c153d12ea3836e0e3ac30d5aae7b258e"
-  integrity sha512-zoT0kgC3EixAyIAU+9vfaUVKTv9IxBDSabgHoUCBP6FqEJ+iNiN7ip7NBKcYqbfUDfuC2mFCbM7vbu4qJgOnDw==
+"@babel/plugin-transform-modules-amd@^7.10.4", "@babel/plugin-transform-modules-amd@^7.10.5":
+  version "7.10.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.10.5.tgz#1b9cddaf05d9e88b3aad339cb3e445c4f020a9b1"
+  integrity sha512-elm5uruNio7CTLFItVC/rIzKLfQ17+fX7EVz5W0TMgIHFo1zY0Ozzx+lgwhL4plzl8OzVn6Qasx5DeEFyoNiRw==
   dependencies:
-    "@babel/helper-module-transforms" "^7.9.0"
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-module-transforms" "^7.10.5"
+    "@babel/helper-plugin-utils" "^7.10.4"
     babel-plugin-dynamic-import-node "^2.3.3"
 
-"@babel/plugin-transform-modules-commonjs@^7.9.6":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.9.6.tgz#64b7474a4279ee588cacd1906695ca721687c277"
-  integrity sha512-7H25fSlLcn+iYimmsNe3uK1at79IE6SKW9q0/QeEHTMC9MdOZ+4bA+T1VFB5fgOqBWoqlifXRzYD0JPdmIrgSQ==
+"@babel/plugin-transform-modules-commonjs@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.10.4.tgz#66667c3eeda1ebf7896d41f1f16b17105a2fbca0"
+  integrity sha512-Xj7Uq5o80HDLlW64rVfDBhao6OX89HKUmb+9vWYaLXBZOma4gA6tw4Ni1O5qVDoZWUV0fxMYA0aYzOawz0l+1w==
   dependencies:
-    "@babel/helper-module-transforms" "^7.9.0"
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/helper-simple-access" "^7.8.3"
+    "@babel/helper-module-transforms" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-simple-access" "^7.10.4"
     babel-plugin-dynamic-import-node "^2.3.3"
 
-"@babel/plugin-transform-modules-systemjs@^7.9.6":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.9.6.tgz#207f1461c78a231d5337a92140e52422510d81a4"
-  integrity sha512-NW5XQuW3N2tTHim8e1b7qGy7s0kZ2OH3m5octc49K1SdAKGxYxeIx7hiIz05kS1R2R+hOWcsr1eYwcGhrdHsrg==
+"@babel/plugin-transform-modules-systemjs@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.4.tgz#8f576afd943ac2f789b35ded0a6312f929c633f9"
+  integrity sha512-Tb28LlfxrTiOTGtZFsvkjpyjCl9IoaRI52AEU/VIwOwvDQWtbNJsAqTXzh+5R7i74e/OZHH2c2w2fsOqAfnQYQ==
   dependencies:
-    "@babel/helper-hoist-variables" "^7.8.3"
-    "@babel/helper-module-transforms" "^7.9.0"
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-hoist-variables" "^7.10.4"
+    "@babel/helper-module-transforms" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
     babel-plugin-dynamic-import-node "^2.3.3"
 
-"@babel/plugin-transform-modules-umd@^7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.9.0.tgz#e909acae276fec280f9b821a5f38e1f08b480697"
-  integrity sha512-uTWkXkIVtg/JGRSIABdBoMsoIeoHQHPTL0Y2E7xf5Oj7sLqwVsNXOkNk0VJc7vF0IMBsPeikHxFjGe+qmwPtTQ==
+"@babel/plugin-transform-modules-umd@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.10.4.tgz#9a8481fe81b824654b3a0b65da3df89f3d21839e"
+  integrity sha512-mohW5q3uAEt8T45YT7Qc5ws6mWgJAaL/8BfWD9Dodo1A3RKWli8wTS+WiQ/knF+tXlPirW/1/MqzzGfCExKECA==
   dependencies:
-    "@babel/helper-module-transforms" "^7.9.0"
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-module-transforms" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-named-capturing-groups-regex@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.8.3.tgz#a2a72bffa202ac0e2d0506afd0939c5ecbc48c6c"
-  integrity sha512-f+tF/8UVPU86TrCb06JoPWIdDpTNSGGcAtaD9mLP0aYGA0OS0j7j7DHJR0GTFrUZPUU6loZhbsVZgTh0N+Qdnw==
+"@babel/plugin-transform-named-capturing-groups-regex@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.10.4.tgz#78b4d978810b6f3bcf03f9e318f2fc0ed41aecb6"
+  integrity sha512-V6LuOnD31kTkxQPhKiVYzYC/Jgdq53irJC/xBSmqcNcqFGV+PER4l6rU5SH2Vl7bH9mLDHcc0+l9HUOe4RNGKA==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.8.3"
+    "@babel/helper-create-regexp-features-plugin" "^7.10.4"
 
-"@babel/plugin-transform-new-target@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.8.3.tgz#60cc2ae66d85c95ab540eb34babb6434d4c70c43"
-  integrity sha512-QuSGysibQpyxexRyui2vca+Cmbljo8bcRckgzYV4kRIsHpVeyeC3JDO63pY+xFZ6bWOBn7pfKZTqV4o/ix9sFw==
+"@babel/plugin-transform-new-target@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.10.4.tgz#9097d753cb7b024cb7381a3b2e52e9513a9c6888"
+  integrity sha512-YXwWUDAH/J6dlfwqlWsztI2Puz1NtUAubXhOPLQ5gjR/qmQ5U96DY4FQO8At33JN4XPBhrjB8I4eMmLROjjLjw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-object-super@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.8.3.tgz#ebb6a1e7a86ffa96858bd6ac0102d65944261725"
-  integrity sha512-57FXk+gItG/GejofIyLIgBKTas4+pEU47IXKDBWFTxdPd7F80H8zybyAY7UoblVfBhBGs2EKM+bJUu2+iUYPDQ==
+"@babel/plugin-transform-object-super@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.10.4.tgz#d7146c4d139433e7a6526f888c667e314a093894"
+  integrity sha512-5iTw0JkdRdJvr7sY0vHqTpnruUpTea32JHmq/atIWqsnNussbRzjEDyWep8UNztt1B5IusBYg8Irb0bLbiEBCQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/helper-replace-supers" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-replace-supers" "^7.10.4"
 
-"@babel/plugin-transform-parameters@^7.9.5":
-  version "7.9.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.9.5.tgz#173b265746f5e15b2afe527eeda65b73623a0795"
-  integrity sha512-0+1FhHnMfj6lIIhVvS4KGQJeuhe1GI//h5uptK4PvLt+BGBxsoUJbd3/IW002yk//6sZPlFgsG1hY6OHLcy6kA==
+"@babel/plugin-transform-parameters@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.4.tgz#7b4d137c87ea7adc2a0f3ebf53266871daa6fced"
+  integrity sha512-RurVtZ/D5nYfEg0iVERXYKEgDFeesHrHfx8RT05Sq57ucj2eOYAP6eu5fynL4Adju4I/mP/I6SO0DqNWAXjfLQ==
   dependencies:
-    "@babel/helper-get-function-arity" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-get-function-arity" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-property-literals@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.8.3.tgz#33194300d8539c1ed28c62ad5087ba3807b98263"
-  integrity sha512-uGiiXAZMqEoQhRWMK17VospMZh5sXWg+dlh2soffpkAl96KAm+WZuJfa6lcELotSRmooLqg0MWdH6UUq85nmmg==
+"@babel/plugin-transform-property-literals@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.10.4.tgz#f6fe54b6590352298785b83edd815d214c42e3c0"
+  integrity sha512-ofsAcKiUxQ8TY4sScgsGeR2vJIsfrzqvFb9GvJ5UdXDzl+MyYCaBj/FGzXuv7qE0aJcjWMILny1epqelnFlz8g==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-regenerator@^7.8.7":
-  version "7.8.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.8.7.tgz#5e46a0dca2bee1ad8285eb0527e6abc9c37672f8"
-  integrity sha512-TIg+gAl4Z0a3WmD3mbYSk+J9ZUH6n/Yc57rtKRnlA/7rcCvpekHXe0CMZHP1gYp7/KLe9GHTuIba0vXmls6drA==
+"@babel/plugin-transform-regenerator@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.10.4.tgz#2015e59d839074e76838de2159db421966fd8b63"
+  integrity sha512-3thAHwtor39A7C04XucbMg17RcZ3Qppfxr22wYzZNcVIkPHfpM9J0SO8zuCV6SZa265kxBJSrfKTvDCYqBFXGw==
   dependencies:
     regenerator-transform "^0.14.2"
 
-"@babel/plugin-transform-reserved-words@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.8.3.tgz#9a0635ac4e665d29b162837dd3cc50745dfdf1f5"
-  integrity sha512-mwMxcycN3omKFDjDQUl+8zyMsBfjRFr0Zn/64I41pmjv4NJuqcYlEtezwYtw9TFd9WR1vN5kiM+O0gMZzO6L0A==
+"@babel/plugin-transform-reserved-words@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.10.4.tgz#8f2682bcdcef9ed327e1b0861585d7013f8a54dd"
+  integrity sha512-hGsw1O6Rew1fkFbDImZIEqA8GoidwTAilwCyWqLBM9f+e/u/sQMQu7uX6dyokfOayRuuVfKOW4O7HvaBWM+JlQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-shorthand-properties@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.8.3.tgz#28545216e023a832d4d3a1185ed492bcfeac08c8"
-  integrity sha512-I9DI6Odg0JJwxCHzbzW08ggMdCezoWcuQRz3ptdudgwaHxTjxw5HgdFJmZIkIMlRymL6YiZcped4TTCB0JcC8w==
+"@babel/plugin-transform-shorthand-properties@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.10.4.tgz#9fd25ec5cdd555bb7f473e5e6ee1c971eede4dd6"
+  integrity sha512-AC2K/t7o07KeTIxMoHneyX90v3zkm5cjHJEokrPEAGEy3UCp8sLKfnfOIGdZ194fyN4wfX/zZUWT9trJZ0qc+Q==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-spread@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.8.3.tgz#9c8ffe8170fdfb88b114ecb920b82fb6e95fe5e8"
-  integrity sha512-CkuTU9mbmAoFOI1tklFWYYbzX5qCIZVXPVy0jpXgGwkplCndQAa58s2jr66fTeQnA64bDox0HL4U56CFYoyC7g==
+"@babel/plugin-transform-spread@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.10.4.tgz#4e2c85ea0d6abaee1b24dcfbbae426fe8d674cff"
+  integrity sha512-1e/51G/Ni+7uH5gktbWv+eCED9pP8ZpRhZB3jOaI3mmzfvJTWHkuyYTv0Z5PYtyM+Tr2Ccr9kUdQxn60fI5WuQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-sticky-regex@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.8.3.tgz#be7a1290f81dae767475452199e1f76d6175b100"
-  integrity sha512-9Spq0vGCD5Bb4Z/ZXXSK5wbbLFMG085qd2vhL1JYu1WcQ5bXqZBAYRzU1d+p79GcHs2szYv5pVQCX13QgldaWw==
+"@babel/plugin-transform-sticky-regex@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.10.4.tgz#8f3889ee8657581130a29d9cc91d7c73b7c4a28d"
+  integrity sha512-Ddy3QZfIbEV0VYcVtFDCjeE4xwVTJWTmUtorAJkn6u/92Z/nWJNV+mILyqHKrUxXYKA2EoCilgoPePymKL4DvQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/helper-regex" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-regex" "^7.10.4"
 
-"@babel/plugin-transform-template-literals@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.8.3.tgz#7bfa4732b455ea6a43130adc0ba767ec0e402a80"
-  integrity sha512-820QBtykIQOLFT8NZOcTRJ1UNuztIELe4p9DCgvj4NK+PwluSJ49we7s9FB1HIGNIYT7wFUJ0ar2QpCDj0escQ==
+"@babel/plugin-transform-template-literals@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.4.tgz#e6375407b30fcb7fcfdbba3bb98ef3e9d36df7bc"
+  integrity sha512-4NErciJkAYe+xI5cqfS8pV/0ntlY5N5Ske/4ImxAVX7mk9Rxt2bwDTGv1Msc2BRJvWQcmYEC+yoMLdX22aE4VQ==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-annotate-as-pure" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-typeof-symbol@^7.8.4":
-  version "7.8.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.8.4.tgz#ede4062315ce0aaf8a657a920858f1a2f35fc412"
-  integrity sha512-2QKyfjGdvuNfHsb7qnBBlKclbD4CfshH2KvDabiijLMGXPHJXGxtDzwIF7bQP+T0ysw8fYTtxPafgfs/c1Lrqg==
+"@babel/plugin-transform-typeof-symbol@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.10.4.tgz#9509f1a7eec31c4edbffe137c16cc33ff0bc5bfc"
+  integrity sha512-QqNgYwuuW0y0H+kUE/GWSR45t/ccRhe14Fs/4ZRouNNQsyd4o3PG4OtHiIrepbM2WKUBDAXKCAK/Lk4VhzTaGA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-unicode-regex@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.8.3.tgz#0cef36e3ba73e5c57273effb182f46b91a1ecaad"
-  integrity sha512-+ufgJjYdmWfSQ+6NS9VGUR2ns8cjJjYbrbi11mZBTaWm+Fui/ncTLFF28Ei1okavY+xkojGr1eJxNsWYeA5aZw==
+"@babel/plugin-transform-unicode-escapes@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.10.4.tgz#feae523391c7651ddac115dae0a9d06857892007"
+  integrity sha512-y5XJ9waMti2J+e7ij20e+aH+fho7Wb7W8rNuu72aKRwCHFqQdhkdU2lo3uZ9tQuboEJcUFayXdARhcxLQ3+6Fg==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
+
+"@babel/plugin-transform-unicode-regex@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.10.4.tgz#e56d71f9282fac6db09c82742055576d5e6d80a8"
+  integrity sha512-wNfsc4s8N2qnIwpO/WP2ZiSyjfpTamT2C9V9FDH/Ljub9zw6P3SjkXcFmc0RQUt96k2fmIvtla2MMjgTwIAC+A==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/polyfill@^7.8.7":
-  version "7.8.7"
-  resolved "https://registry.yarnpkg.com/@babel/polyfill/-/polyfill-7.8.7.tgz#151ec24c7135481336168c3bd8b8bf0cf91c032f"
-  integrity sha512-LeSfP9bNZH2UOZgcGcZ0PIHUt1ZuHub1L3CVmEyqLxCeDLm4C5Gi8jRH8ZX2PNpDhQCo0z6y/+DIs2JlliXW8w==
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/polyfill/-/polyfill-7.10.4.tgz#915e5bfe61490ac0199008e35ca9d7d151a8e45a"
+  integrity sha512-8BYcnVqQ5kMD2HXoHInBH7H1b/uP3KdnwCYXOqFnXqguOyuu443WXusbIUbWEfY3Z0Txk0M1uG/8YuAMhNl6zg==
   dependencies:
     core-js "^2.6.5"
     regenerator-runtime "^0.13.4"
 
-"@babel/preset-env@^7.8.6":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.9.6.tgz#df063b276c6455ec6fcfc6e53aacc38da9b0aea6"
-  integrity sha512-0gQJ9RTzO0heXOhzftog+a/WyOuqMrAIugVYxMYf83gh1CQaQDjMtsOpqOwXyDL/5JcWsrCm8l4ju8QC97O7EQ==
+"@babel/preset-env@^7.10.3":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.10.4.tgz#fbf57f9a803afd97f4f32e4f798bb62e4b2bef5f"
+  integrity sha512-tcmuQ6vupfMZPrLrc38d0sF2OjLT3/bZ0dry5HchNCQbrokoQi4reXqclvkkAT5b+gWc23meVWpve5P/7+w/zw==
   dependencies:
-    "@babel/compat-data" "^7.9.6"
-    "@babel/helper-compilation-targets" "^7.9.6"
-    "@babel/helper-module-imports" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-proposal-async-generator-functions" "^7.8.3"
-    "@babel/plugin-proposal-dynamic-import" "^7.8.3"
-    "@babel/plugin-proposal-json-strings" "^7.8.3"
-    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.8.3"
-    "@babel/plugin-proposal-numeric-separator" "^7.8.3"
-    "@babel/plugin-proposal-object-rest-spread" "^7.9.6"
-    "@babel/plugin-proposal-optional-catch-binding" "^7.8.3"
-    "@babel/plugin-proposal-optional-chaining" "^7.9.0"
-    "@babel/plugin-proposal-unicode-property-regex" "^7.8.3"
+    "@babel/compat-data" "^7.10.4"
+    "@babel/helper-compilation-targets" "^7.10.4"
+    "@babel/helper-module-imports" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/plugin-proposal-async-generator-functions" "^7.10.4"
+    "@babel/plugin-proposal-class-properties" "^7.10.4"
+    "@babel/plugin-proposal-dynamic-import" "^7.10.4"
+    "@babel/plugin-proposal-json-strings" "^7.10.4"
+    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.10.4"
+    "@babel/plugin-proposal-numeric-separator" "^7.10.4"
+    "@babel/plugin-proposal-object-rest-spread" "^7.10.4"
+    "@babel/plugin-proposal-optional-catch-binding" "^7.10.4"
+    "@babel/plugin-proposal-optional-chaining" "^7.10.4"
+    "@babel/plugin-proposal-private-methods" "^7.10.4"
+    "@babel/plugin-proposal-unicode-property-regex" "^7.10.4"
     "@babel/plugin-syntax-async-generators" "^7.8.0"
+    "@babel/plugin-syntax-class-properties" "^7.10.4"
     "@babel/plugin-syntax-dynamic-import" "^7.8.0"
     "@babel/plugin-syntax-json-strings" "^7.8.0"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
-    "@babel/plugin-syntax-numeric-separator" "^7.8.0"
+    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
     "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.0"
     "@babel/plugin-syntax-optional-chaining" "^7.8.0"
-    "@babel/plugin-syntax-top-level-await" "^7.8.3"
-    "@babel/plugin-transform-arrow-functions" "^7.8.3"
-    "@babel/plugin-transform-async-to-generator" "^7.8.3"
-    "@babel/plugin-transform-block-scoped-functions" "^7.8.3"
-    "@babel/plugin-transform-block-scoping" "^7.8.3"
-    "@babel/plugin-transform-classes" "^7.9.5"
-    "@babel/plugin-transform-computed-properties" "^7.8.3"
-    "@babel/plugin-transform-destructuring" "^7.9.5"
-    "@babel/plugin-transform-dotall-regex" "^7.8.3"
-    "@babel/plugin-transform-duplicate-keys" "^7.8.3"
-    "@babel/plugin-transform-exponentiation-operator" "^7.8.3"
-    "@babel/plugin-transform-for-of" "^7.9.0"
-    "@babel/plugin-transform-function-name" "^7.8.3"
-    "@babel/plugin-transform-literals" "^7.8.3"
-    "@babel/plugin-transform-member-expression-literals" "^7.8.3"
-    "@babel/plugin-transform-modules-amd" "^7.9.6"
-    "@babel/plugin-transform-modules-commonjs" "^7.9.6"
-    "@babel/plugin-transform-modules-systemjs" "^7.9.6"
-    "@babel/plugin-transform-modules-umd" "^7.9.0"
-    "@babel/plugin-transform-named-capturing-groups-regex" "^7.8.3"
-    "@babel/plugin-transform-new-target" "^7.8.3"
-    "@babel/plugin-transform-object-super" "^7.8.3"
-    "@babel/plugin-transform-parameters" "^7.9.5"
-    "@babel/plugin-transform-property-literals" "^7.8.3"
-    "@babel/plugin-transform-regenerator" "^7.8.7"
-    "@babel/plugin-transform-reserved-words" "^7.8.3"
-    "@babel/plugin-transform-shorthand-properties" "^7.8.3"
-    "@babel/plugin-transform-spread" "^7.8.3"
-    "@babel/plugin-transform-sticky-regex" "^7.8.3"
-    "@babel/plugin-transform-template-literals" "^7.8.3"
-    "@babel/plugin-transform-typeof-symbol" "^7.8.4"
-    "@babel/plugin-transform-unicode-regex" "^7.8.3"
+    "@babel/plugin-syntax-top-level-await" "^7.10.4"
+    "@babel/plugin-transform-arrow-functions" "^7.10.4"
+    "@babel/plugin-transform-async-to-generator" "^7.10.4"
+    "@babel/plugin-transform-block-scoped-functions" "^7.10.4"
+    "@babel/plugin-transform-block-scoping" "^7.10.4"
+    "@babel/plugin-transform-classes" "^7.10.4"
+    "@babel/plugin-transform-computed-properties" "^7.10.4"
+    "@babel/plugin-transform-destructuring" "^7.10.4"
+    "@babel/plugin-transform-dotall-regex" "^7.10.4"
+    "@babel/plugin-transform-duplicate-keys" "^7.10.4"
+    "@babel/plugin-transform-exponentiation-operator" "^7.10.4"
+    "@babel/plugin-transform-for-of" "^7.10.4"
+    "@babel/plugin-transform-function-name" "^7.10.4"
+    "@babel/plugin-transform-literals" "^7.10.4"
+    "@babel/plugin-transform-member-expression-literals" "^7.10.4"
+    "@babel/plugin-transform-modules-amd" "^7.10.4"
+    "@babel/plugin-transform-modules-commonjs" "^7.10.4"
+    "@babel/plugin-transform-modules-systemjs" "^7.10.4"
+    "@babel/plugin-transform-modules-umd" "^7.10.4"
+    "@babel/plugin-transform-named-capturing-groups-regex" "^7.10.4"
+    "@babel/plugin-transform-new-target" "^7.10.4"
+    "@babel/plugin-transform-object-super" "^7.10.4"
+    "@babel/plugin-transform-parameters" "^7.10.4"
+    "@babel/plugin-transform-property-literals" "^7.10.4"
+    "@babel/plugin-transform-regenerator" "^7.10.4"
+    "@babel/plugin-transform-reserved-words" "^7.10.4"
+    "@babel/plugin-transform-shorthand-properties" "^7.10.4"
+    "@babel/plugin-transform-spread" "^7.10.4"
+    "@babel/plugin-transform-sticky-regex" "^7.10.4"
+    "@babel/plugin-transform-template-literals" "^7.10.4"
+    "@babel/plugin-transform-typeof-symbol" "^7.10.4"
+    "@babel/plugin-transform-unicode-escapes" "^7.10.4"
+    "@babel/plugin-transform-unicode-regex" "^7.10.4"
     "@babel/preset-modules" "^0.1.3"
-    "@babel/types" "^7.9.6"
-    browserslist "^4.11.1"
+    "@babel/types" "^7.10.4"
+    browserslist "^4.12.0"
     core-js-compat "^3.6.2"
     invariant "^2.2.2"
     levenary "^1.1.1"
@@ -711,44 +756,51 @@
     "@babel/types" "^7.4.4"
     esutils "^2.0.2"
 
-"@babel/runtime@^7.7.7", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2":
+"@babel/runtime@^7.8.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.10.4.tgz#a6724f1a6b8d2f6ea5236dbfe58c7d7ea9c5eb99"
+  integrity sha512-UpTN5yUJr9b4EX2CnGNWIvER7Ab83ibv0pcvvHc4UOdrBI5jb8bj+32cCwPX6xu0mt2daFNjYhoi+X7beH0RSw==
+  dependencies:
+    regenerator-runtime "^0.13.4"
+
+"@babel/runtime@^7.9.2":
   version "7.9.6"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.9.6.tgz#a9102eb5cadedf3f31d08a9ecf294af7827ea29f"
   integrity sha512-64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ==
   dependencies:
     regenerator-runtime "^0.13.4"
 
-"@babel/template@^7.8.3", "@babel/template@^7.8.6":
-  version "7.8.6"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.8.6.tgz#86b22af15f828dfb086474f964dcc3e39c43ce2b"
-  integrity sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==
+"@babel/template@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.10.4.tgz#3251996c4200ebc71d1a8fc405fba940f36ba278"
+  integrity sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==
   dependencies:
-    "@babel/code-frame" "^7.8.3"
-    "@babel/parser" "^7.8.6"
-    "@babel/types" "^7.8.6"
+    "@babel/code-frame" "^7.10.4"
+    "@babel/parser" "^7.10.4"
+    "@babel/types" "^7.10.4"
 
-"@babel/traverse@^7.8.3", "@babel/traverse@^7.9.6":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.9.6.tgz#5540d7577697bf619cc57b92aa0f1c231a94f442"
-  integrity sha512-b3rAHSjbxy6VEAvlxM8OV/0X4XrG72zoxme6q1MOoe2vd0bEc+TwayhuC1+Dfgqh1QEG+pj7atQqvUprHIccsg==
+"@babel/traverse@^7.10.4", "@babel/traverse@^7.10.5":
+  version "7.10.5"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.10.5.tgz#77ce464f5b258be265af618d8fddf0536f20b564"
+  integrity sha512-yc/fyv2gUjPqzTz0WHeRJH2pv7jA9kA7mBX2tXl/x5iOE81uaVPuGPtaYk7wmkx4b67mQ7NqI8rmT2pF47KYKQ==
   dependencies:
-    "@babel/code-frame" "^7.8.3"
-    "@babel/generator" "^7.9.6"
-    "@babel/helper-function-name" "^7.9.5"
-    "@babel/helper-split-export-declaration" "^7.8.3"
-    "@babel/parser" "^7.9.6"
-    "@babel/types" "^7.9.6"
+    "@babel/code-frame" "^7.10.4"
+    "@babel/generator" "^7.10.5"
+    "@babel/helper-function-name" "^7.10.4"
+    "@babel/helper-split-export-declaration" "^7.10.4"
+    "@babel/parser" "^7.10.5"
+    "@babel/types" "^7.10.5"
     debug "^4.1.0"
     globals "^11.1.0"
-    lodash "^4.17.13"
+    lodash "^4.17.19"
 
-"@babel/types@^7.4.4", "@babel/types@^7.8.3", "@babel/types@^7.8.6", "@babel/types@^7.9.0", "@babel/types@^7.9.5", "@babel/types@^7.9.6":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.9.6.tgz#2c5502b427251e9de1bd2dff95add646d95cc9f7"
-  integrity sha512-qxXzvBO//jO9ZnoasKF1uJzHd2+M6Q2ZPIVfnFps8JJvXy0ZBbwbNOmE6SGIY5XOY6d1Bo5lb9d9RJ8nv3WSeA==
+"@babel/types@^7.10.4", "@babel/types@^7.10.5", "@babel/types@^7.4.4":
+  version "7.10.5"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.10.5.tgz#d88ae7e2fde86bfbfe851d4d81afa70a997b5d15"
+  integrity sha512-ixV66KWfCI6GKoA/2H9v6bQdbfXEwwpOdQ8cRvb4F+eyvhlaHxWFMQB4+3d9QFJXZsiiiqVrewNV0DFEQpyT4Q==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.9.5"
-    lodash "^4.17.13"
+    "@babel/helper-validator-identifier" "^7.10.4"
+    lodash "^4.17.19"
     to-fast-properties "^2.0.0"
 
 "@csstools/convert-colors@^1.4.0":
@@ -858,6 +910,23 @@
   resolved "https://registry.yarnpkg.com/@types/html-minifier-terser/-/html-minifier-terser-5.1.0.tgz#551a4589b6ee2cc9c1dff08056128aec29b94880"
   integrity sha512-iYCgjm1dGPRuo12+BStjd1HiVQqhlRhWDOQigNxn023HcjnhsiFz9pc6CzJj4HwDCSQca9bxTL4PxJDbkdm3PA==
 
+"@types/json-schema@^7.0.4":
+  version "7.0.5"
+  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.5.tgz#dcce4430e64b443ba8945f0290fb564ad5bac6dd"
+  integrity sha512-7+2BITlgjgDhH0vvwZU/HZJVyk+2XUlvxXe8dFMedNX/aMkaOq++rMAFXc0tM7ij15QaWlbdQASBR9dihi+bDQ==
+
+"@types/json5@^0.0.29":
+  version "0.0.29"
+  resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
+  integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4=
+
+"@types/localforage@0.0.34":
+  version "0.0.34"
+  resolved "https://registry.yarnpkg.com/@types/localforage/-/localforage-0.0.34.tgz#5e31c32dd8791ec4b9ff3ef47c9cb55b2d0d9438"
+  integrity sha1-XjHDLdh5HsS5/z70fJy1Wy0NlDg=
+  dependencies:
+    localforage "*"
+
 "@types/minimatch@*":
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
@@ -935,7 +1004,7 @@
     "@types/source-list-map" "*"
     source-map "^0.6.1"
 
-"@types/webpack@^4.4.31", "@types/webpack@^4.41.8":
+"@types/webpack@^4.41.8":
   version "4.41.12"
   resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.12.tgz#0386ee2a2814368e2f2397abb036c0bf173ff6c3"
   integrity sha512-BpCtM4NnBen6W+KEhrL9jKuZCXVtiH6+0b6cxdvNt2EwU949Al334PjQSl2BeAyvAX9mgoNNG21wvjP3xZJJ5w==
@@ -1107,7 +1176,7 @@ abbrev@1:
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
   integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
 
-accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7:
+accepts@~1.3.4:
   version "1.3.7"
   resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd"
   integrity sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==
@@ -1158,7 +1227,7 @@ ajv-keywords@^3.1.0, ajv-keywords@^3.4.1:
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.1.tgz#ef916e271c64ac12171fd8384eaae6b2345854da"
   integrity sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ==
 
-ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.0, ajv@^6.5.5:
+ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.2, ajv@^6.5.5:
   version "6.12.2"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.2.tgz#c629c5eced17baf314437918d2da88c99d5958cd"
   integrity sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ==
@@ -1214,11 +1283,6 @@ ansi-gray@^0.1.1:
   dependencies:
     ansi-wrap "0.1.0"
 
-ansi-html@0.0.7:
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e"
-  integrity sha1-gTWEAhliqenm/QOflA0S9WynhZ4=
-
 ansi-regex@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
@@ -1251,7 +1315,7 @@ ansi-styles@^3.2.0, ansi-styles@^3.2.1:
   dependencies:
     color-convert "^1.9.0"
 
-ansi-styles@^4.1.0:
+ansi-styles@^4.0.0, ansi-styles@^4.1.0:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.1.tgz#90ae75c424d008d2624c5bf29ead3177ebfcf359"
   integrity sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==
@@ -1277,6 +1341,14 @@ anymatch@^2.0.0:
     micromatch "^3.1.4"
     normalize-path "^2.1.1"
 
+anymatch@~3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz#c55ecf02185e2469259399310c173ce31233b142"
+  integrity sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==
+  dependencies:
+    normalize-path "^3.0.0"
+    picomatch "^2.0.4"
+
 append-buffer@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/append-buffer/-/append-buffer-1.0.2.tgz#d8220cf466081525efea50614f3de6514dfa58f1"
@@ -1365,17 +1437,7 @@ array-find-index@^1.0.1:
   resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
   integrity sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=
 
-array-flatten@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
-  integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=
-
-array-flatten@^2.1.0:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099"
-  integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==
-
-array-includes@^3.0.3:
+array-includes@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.1.tgz#cdd67e6852bdf9c1215460786732255ed2459348"
   integrity sha512-c2VXaCHl7zPsvpkFsw4nxvFie4fh1ur9bpcgsVkIjqn0H/Xwdg+7fv3n2r/isyS8EBj5b06M9kHyZuIr4El6WQ==
@@ -1435,7 +1497,7 @@ array-unique@^0.3.2:
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
   integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
 
-array.prototype.flat@^1.2.1:
+array.prototype.flat@^1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.3.tgz#0de82b426b0318dbfdb940089e38b043d37f6c7b"
   integrity sha512-gBlRZV0VSmfPIeWfuuy56XZMvbVfbEUnOXUvt3F/eUUUSyzlgLxhEX4YAEpxNAogRGehPSnfXyPtYyKAhkzQhQ==
@@ -1492,10 +1554,10 @@ assign-symbols@^1.0.0:
   resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
   integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=
 
-ast-metadata-inferer@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/ast-metadata-inferer/-/ast-metadata-inferer-0.1.1.tgz#66e24fae9d30ca961fac4880b7fc466f09b25165"
-  integrity sha512-hc9w8Qrgg9Lf9iFcZVhNjUnhrd2BBpTlyCnegPVvCe6O0yMrF57a6Cmh7k+xUsfUOMh9wajOL5AsGOBNEyTCcw==
+ast-metadata-inferer@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/ast-metadata-inferer/-/ast-metadata-inferer-0.4.0.tgz#6be85ceeffcf267bd79db8e1ae731da44880b45f"
+  integrity sha512-tKHdBe8N/Vq2nLAm4YPBVREVZjMux6KrqyPfNQgIbDl0t7HaNSmy8w4OyVHYg/cvyn5BW7o7pVwpjPte89Zhcg==
 
 astral-regex@^1.0.0:
   version "1.0.0"
@@ -1544,13 +1606,6 @@ async@1.5.2:
   resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
   integrity sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=
 
-async@^2.6.2:
-  version "2.6.3"
-  resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff"
-  integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==
-  dependencies:
-    lodash "^4.17.14"
-
 asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
@@ -1561,17 +1616,17 @@ atob@^2.1.2:
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
   integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
 
-autoprefixer@^9.0.0, autoprefixer@^9.6.1, autoprefixer@^9.7.6, autoprefixer@^9.8.0:
-  version "9.8.0"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.8.0.tgz#68e2d2bef7ba4c3a65436f662d0a56a741e56511"
-  integrity sha512-D96ZiIHXbDmU02dBaemyAg53ez+6F5yZmapmgKcjm35yEe1uVDYI8hGW3VYoGRaG290ZFf91YxHrR518vC0u/A==
+autoprefixer@^9.0.0, autoprefixer@^9.6.1, autoprefixer@^9.8.0, autoprefixer@^9.8.5:
+  version "9.8.5"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.8.5.tgz#2c225de229ddafe1d1424c02791d0c3e10ccccaa"
+  integrity sha512-C2p5KkumJlsTHoNv9w31NrBRgXhf6eCMteJuHZi2xhkgC+5Vm40MEtCKPhc0qdgAOhox0YPy1SQHTAky05UoKg==
   dependencies:
     browserslist "^4.12.0"
-    caniuse-lite "^1.0.30001061"
-    chalk "^2.4.2"
+    caniuse-lite "^1.0.30001097"
+    colorette "^1.2.0"
     normalize-range "^0.1.2"
     num2fraction "^1.2.2"
-    postcss "^7.0.30"
+    postcss "^7.0.32"
     postcss-value-parser "^4.1.0"
 
 aws-sign2@~0.7.0:
@@ -1592,6 +1647,15 @@ axios@0.19.0:
     follow-redirects "1.5.10"
     is-buffer "^2.0.2"
 
+babel-eslint@^11.0.0-beta.2:
+  version "11.0.0-beta.2"
+  resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-11.0.0-beta.2.tgz#de1f06795aa0d8cedcf6ac943e63056f5b4a7048"
+  integrity sha512-D2tunrOu04XloEdU2XVUminUu25FILlGruZmffqH5OSnLDhCheKNvUoM1ihrexdUvhizlix8bjqRnsss4V/UIQ==
+  dependencies:
+    eslint-scope "5.0.0"
+    eslint-visitor-keys "^1.1.0"
+    semver "^6.3.0"
+
 babel-loader@^8.0.6:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.1.0.tgz#c611d5112bd5209abe8b9fa84c3e4da25275f1c3"
@@ -1750,6 +1814,11 @@ binary-extensions@^1.0.0:
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65"
   integrity sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==
 
+binary-extensions@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.1.0.tgz#30fa40c9e7fe07dbc895678cd287024dea241dd9"
+  integrity sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==
+
 bindings@^1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df"
@@ -1782,39 +1851,16 @@ bluebird@^3.5.5:
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
   integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
 
+blurhash@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/blurhash/-/blurhash-1.1.3.tgz#dc325af7da836d07a0861d830bdd63694382483e"
+  integrity sha512-yUhPJvXexbqbyijCIE/T2NCXcj9iNPhWmOKbPTuR/cm7Q5snXYIfnVnz6m7MWOXxODMz/Cr3UcVkRdHiuDVRDw==
+
 bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
   version "4.11.8"
   resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f"
   integrity sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==
 
-body-parser@1.19.0:
-  version "1.19.0"
-  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a"
-  integrity sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==
-  dependencies:
-    bytes "3.1.0"
-    content-type "~1.0.4"
-    debug "2.6.9"
-    depd "~1.1.2"
-    http-errors "1.7.2"
-    iconv-lite "0.4.24"
-    on-finished "~2.3.0"
-    qs "6.7.0"
-    raw-body "2.4.0"
-    type-is "~1.6.17"
-
-bonjour@^3.5.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/bonjour/-/bonjour-3.5.0.tgz#8e890a183d8ee9a2393b3844c691a42bcf7bc9f5"
-  integrity sha1-jokKGD2O6aI5OzhExpGkK897yfU=
-  dependencies:
-    array-flatten "^2.1.0"
-    deep-equal "^1.0.1"
-    dns-equal "^1.0.0"
-    dns-txt "^2.0.2"
-    multicast-dns "^6.0.1"
-    multicast-dns-service-types "^1.1.0"
-
 boolbase@^1.0.0, boolbase@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
@@ -1844,7 +1890,7 @@ braces@^2.3.1, braces@^2.3.2:
     split-string "^3.0.2"
     to-regex "^3.0.1"
 
-braces@^3.0.1:
+braces@^3.0.1, braces@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
   integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
@@ -1856,20 +1902,20 @@ brorand@^1.0.1:
   resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
   integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=
 
-browser-sync-client@^2.26.6:
-  version "2.26.6"
-  resolved "https://registry.yarnpkg.com/browser-sync-client/-/browser-sync-client-2.26.6.tgz#e5201d3ace8aee88af17656b7b0c0620b6f8e4ab"
-  integrity sha512-mGrkZdNzttKdf/16I+y+2dTQxoMCIpKbVIMJ/uP8ZpnKu9f9qa/2CYVtLtbjZG8nsM14EwiCrjuFTGBEnT3Gjw==
+browser-sync-client@^2.26.10:
+  version "2.26.10"
+  resolved "https://registry.yarnpkg.com/browser-sync-client/-/browser-sync-client-2.26.10.tgz#ca9309ba19f9695e7945b95062da8a7ef3156711"
+  integrity sha512-8pYitKwpVva7hzXJI8lTljNDbA9fjMEobHSxWqegIUon/GjJAG3UgHB/+lBWnOLzTY8rGX66MvGqL1Aknyrj7g==
   dependencies:
     etag "1.8.1"
     fresh "0.5.2"
     mitt "^1.1.3"
     rxjs "^5.5.6"
 
-browser-sync-ui@^2.26.4:
-  version "2.26.4"
-  resolved "https://registry.yarnpkg.com/browser-sync-ui/-/browser-sync-ui-2.26.4.tgz#3772f13c6b93f2d7d333f4be0ca1ec02aae97dba"
-  integrity sha512-u20P3EsZoM8Pt+puoi3BU3KlbQAH1lAcV+/O4saF26qokrBqIDotmGonfWwoRbUmdxZkM9MBmA0K39ZTG1h4sA==
+browser-sync-ui@^2.26.10:
+  version "2.26.10"
+  resolved "https://registry.yarnpkg.com/browser-sync-ui/-/browser-sync-ui-2.26.10.tgz#7b4b378de204b3913d4b8a6f93b16b1ba769d4bc"
+  integrity sha512-UfNSBItlXcmEvJ9RE4JooNtIsiIfHowp+7/52Jz4VFfQD4v78QK5/NV9DVrG41oMM3zLyhW4f/RliOb4ysStZg==
   dependencies:
     async-each-series "0.1.1"
     connect-history-api-fallback "^1"
@@ -1878,16 +1924,16 @@ browser-sync-ui@^2.26.4:
     socket.io-client "^2.0.4"
     stream-throttle "^0.1.3"
 
-browser-sync@^2.26.7:
-  version "2.26.7"
-  resolved "https://registry.yarnpkg.com/browser-sync/-/browser-sync-2.26.7.tgz#120287716eb405651a76cc74fe851c31350557f9"
-  integrity sha512-lY3emme0OyvA2ujEMpRmyRy9LY6gHLuTr2/ABxhIm3lADOiRXzP4dgekvnDrQqZ/Ec2Fz19lEjm6kglSG5766w==
+browser-sync@^2.26.10:
+  version "2.26.10"
+  resolved "https://registry.yarnpkg.com/browser-sync/-/browser-sync-2.26.10.tgz#f03c043f615cf53c9294ccb2a5a5e25cfe11a230"
+  integrity sha512-JeVQP3CARvNA1DELj+ZGWj+/0pzE8+Omvq1WNgzaTXVdP3lNEbGxZbkjvLK7hHpQywjQ1sDJWlJQZT6V59XDTg==
   dependencies:
-    browser-sync-client "^2.26.6"
-    browser-sync-ui "^2.26.4"
+    browser-sync-client "^2.26.10"
+    browser-sync-ui "^2.26.10"
     bs-recipes "1.3.4"
     bs-snippet-injector "^2.0.1"
-    chokidar "^2.0.4"
+    chokidar "^3.4.1"
     connect "3.6.6"
     connect-history-api-fallback "^1"
     dev-ip "^1.0.1"
@@ -1896,10 +1942,10 @@ browser-sync@^2.26.7:
     etag "^1.8.1"
     fresh "^0.5.2"
     fs-extra "3.0.1"
-    http-proxy "1.15.2"
+    http-proxy "^1.18.1"
     immutable "^3"
-    localtunnel "1.9.2"
-    micromatch "^3.1.10"
+    localtunnel "^2.0.0"
+    micromatch "^4.0.2"
     opn "5.3.0"
     portscanner "2.1.1"
     qs "6.2.3"
@@ -1911,8 +1957,8 @@ browser-sync@^2.26.7:
     serve-static "1.13.2"
     server-destroy "1.0.1"
     socket.io "2.1.1"
-    ua-parser-js "0.7.17"
-    yargs "6.4.0"
+    ua-parser-js "^0.7.18"
+    yargs "^15.4.1"
 
 browserify-aes@^1.0.0, browserify-aes@^1.0.4:
   version "1.2.0"
@@ -1981,15 +2027,15 @@ browserslist@^1.1.3:
     caniuse-db "^1.0.30000639"
     electron-to-chromium "^1.2.7"
 
-browserslist@^4.0.0, browserslist@^4.11.1, browserslist@^4.12.0, browserslist@^4.6.4, browserslist@^4.8.2, browserslist@^4.8.5:
-  version "4.12.0"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.12.0.tgz#06c6d5715a1ede6c51fc39ff67fd647f740b656d"
-  integrity sha512-UH2GkcEDSI0k/lRkuDSzFl9ZZ87skSy9w2XAn1MsZnL+4c4rqbBd3e82UWHbYDpztABrPBhZsTEeuxVfHppqDg==
+browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.12.2, browserslist@^4.6.4, browserslist@^4.8.5:
+  version "4.12.2"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.12.2.tgz#76653d7e4c57caa8a1a28513e2f4e197dc11a711"
+  integrity sha512-MfZaeYqR8StRZdstAK9hCKDd2StvePCYp5rHzQCPicUjfFliDgmuaBNPHYUTpAywBN8+Wc/d7NYVFkO0aqaBUw==
   dependencies:
-    caniuse-lite "^1.0.30001043"
-    electron-to-chromium "^1.3.413"
-    node-releases "^1.1.53"
-    pkg-up "^2.0.0"
+    caniuse-lite "^1.0.30001088"
+    electron-to-chromium "^1.3.483"
+    escalade "^3.0.1"
+    node-releases "^1.1.58"
 
 bs-recipes@1.3.4:
   version "1.3.4"
@@ -2034,11 +2080,6 @@ buffer-from@^1.0.0:
   resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
   integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
 
-buffer-indexof@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/buffer-indexof/-/buffer-indexof-1.1.1.tgz#52fabcc6a606d1a00302802648ef68f639da268c"
-  integrity sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==
-
 buffer-xor@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9"
@@ -2066,11 +2107,6 @@ builtin-status-codes@^3.0.0:
   resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
   integrity sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=
 
-bytes@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
-  integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=
-
 bytes@3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6"
@@ -2241,15 +2277,15 @@ caniuse-db@^1.0.30000639:
   resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30001036.tgz#8761fb6cd423ef2d3f8d96a21d898932252dc477"
   integrity sha512-plRkihXQyiDaFUXC7x/jAIXXTKiiaWvfAagsruh/vmstnRQ+a2a95HyENxiTr5WrkPSvmFUIvsRUalVFyeh2/w==
 
-caniuse-db@^1.0.30001017:
-  version "1.0.30001039"
-  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30001039.tgz#b5e8c3bb07a144341644729fa2a5eb2c0deaf47d"
-  integrity sha512-XVk5KMAi8/DI28tQXKuq1PDyuPoD9Ypnda3ctF04TlB+LYIb+bgHq0ZDfNOn0+4cwLENJC0093Vuf0dhkjXQ7Q==
+caniuse-db@^1.0.30001090:
+  version "1.0.30001093"
+  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30001093.tgz#5a1cae72d94df1156f40f15d9079456e1b29d050"
+  integrity sha512-XqXxHR6Z9IN0BXLKMaTJ1NZ+US74cbKritholD6uaDLUWHiDj0QilpSb708wOcoGz0PmPRsXT/6zE+bjx+QSMw==
 
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001043, caniuse-lite@^1.0.30001061:
-  version "1.0.30001061"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001061.tgz#80ca87ef14eb543a7458e7fd2b5e2face3458c9f"
-  integrity sha512-SMICCeiNvMZnyXpuoO+ot7FHpMVPlrsR+HmfByj6nY4xYDHXLqMTbgH7ecEkDNXWkH1vaip+ZS0D7VTXwM1KYQ==
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001088, caniuse-lite@^1.0.30001097:
+  version "1.0.30001099"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001099.tgz#540118fcc6842d1fde62f4ee5521d1ec6afdb40e"
+  integrity sha512-sdS9A+sQTk7wKoeuZBN/YMAHVztUfVnjDi4/UV3sDE8xoh7YR12hKW+pIdB3oqKGwr9XaFL2ovfzt9w8eUI5CA==
 
 caseless@~0.12.0:
   version "0.12.0"
@@ -2271,15 +2307,6 @@ ccount@^1.0.0:
   resolved "https://registry.yarnpkg.com/ccount/-/ccount-1.0.5.tgz#ac82a944905a65ce204eb03023157edf29425c17"
   integrity sha512-MOli1W+nfbPLlKEhInaxhRdp7KVLFxLN5ykwzHgLsLI3H3gs5jjFAK4Eoj3OzzcxCtumDaI8onoVDeQyWaNTkw==
 
-chalk@2.4.2, chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.4.1, chalk@^2.4.2:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
-  integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
-  dependencies:
-    ansi-styles "^3.2.1"
-    escape-string-regexp "^1.0.5"
-    supports-color "^5.3.0"
-
 chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
@@ -2291,6 +2318,15 @@ chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
+chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.4.1, chalk@^2.4.2:
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
+  integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
+  dependencies:
+    ansi-styles "^3.2.1"
+    escape-string-regexp "^1.0.5"
+    supports-color "^5.3.0"
+
 chalk@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4"
@@ -2299,10 +2335,10 @@ chalk@^3.0.0:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
-chalk@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.0.0.tgz#6e98081ed2d17faab615eb52ac66ec1fe6209e72"
-  integrity sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==
+chalk@^4.0.0, chalk@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a"
+  integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==
   dependencies:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
@@ -2332,7 +2368,7 @@ chardet@^0.7.0:
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
   integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
 
-chokidar@^2.0.0, chokidar@^2.0.4, chokidar@^2.1.8:
+chokidar@^2.0.0, chokidar@^2.1.8:
   version "2.1.8"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917"
   integrity sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==
@@ -2351,6 +2387,21 @@ chokidar@^2.0.0, chokidar@^2.0.4, chokidar@^2.1.8:
   optionalDependencies:
     fsevents "^1.2.7"
 
+chokidar@^3.4.1:
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.4.1.tgz#e905bdecf10eaa0a0b1db0c664481cc4cbc22ba1"
+  integrity sha512-TQTJyr2stihpC4Sya9hs2Xh+O2wf+igjL36Y75xx2WdHuiICcn/XJza46Jwt0eT5hVpQOzo3FpY3cj3RVYLX0g==
+  dependencies:
+    anymatch "~3.1.1"
+    braces "~3.0.2"
+    glob-parent "~5.1.0"
+    is-binary-path "~2.1.0"
+    is-glob "~4.0.1"
+    normalize-path "~3.0.0"
+    readdirp "~3.4.0"
+  optionalDependencies:
+    fsevents "~2.1.2"
+
 chownr@^1.1.1:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
@@ -2397,14 +2448,6 @@ clean-stack@^2.0.0:
   resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b"
   integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==
 
-clean-webpack-plugin@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/clean-webpack-plugin/-/clean-webpack-plugin-3.0.0.tgz#a99d8ec34c1c628a4541567aa7b457446460c62b"
-  integrity sha512-MciirUH5r+cYLGCOL5JX/ZLzOZbVr1ot3Fw+KcvbhUb6PM+yycqd9ZhIlcigQ5gl+XhppNmw3bEFuaaMNyLj3A==
-  dependencies:
-    "@types/webpack" "^4.4.31"
-    del "^4.1.1"
-
 cli-cursor@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307"
@@ -2435,6 +2478,15 @@ cliui@^5.0.0:
     strip-ansi "^5.2.0"
     wrap-ansi "^5.1.0"
 
+cliui@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-6.0.0.tgz#511d702c0c4e41ca156d7d0e96021f23e13225b1"
+  integrity sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==
+  dependencies:
+    string-width "^4.2.0"
+    strip-ansi "^6.0.0"
+    wrap-ansi "^6.2.0"
+
 clone-buffer@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz#e3e25b207ac4e701af721e2cb5a16792cac3dc58"
@@ -2572,6 +2624,11 @@ color@^3.0.0:
     color-convert "^1.9.1"
     color-string "^1.5.2"
 
+colorette@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.0.tgz#45306add826d196e8c87236ac05d797f25982e63"
+  integrity sha512-soRSroY+OF/8OdA3PTQXwaDJeMc7TfknKKrxeSCencL2a4+Tx5zhxmmv7hdpCjhKBjehzp8+bwe/T68K0hpIjw==
+
 combined-stream@^1.0.6, combined-stream@~1.0.6:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
@@ -2594,11 +2651,6 @@ commander@^4.1.1:
   resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068"
   integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==
 
-commander@~2.13.0:
-  version "2.13.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.13.0.tgz#6964bca67685df7c1f1430c584f07d7597885b9c"
-  integrity sha512-MVuS359B+YzaWqjCL/c+22gfryv+mCBPHAv3zyVI2GN8EY6IRP8VwtasXn8jyyhvvq84R4ImN1OKRtcbIasjYA==
-
 commander@~2.19.0:
   version "2.19.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
@@ -2636,26 +2688,6 @@ component-inherit@0.0.3:
   resolved "https://registry.yarnpkg.com/component-inherit/-/component-inherit-0.0.3.tgz#645fc4adf58b72b649d5cae65135619db26ff143"
   integrity sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM=
 
-compressible@~2.0.16:
-  version "2.0.18"
-  resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.18.tgz#af53cca6b070d4c3c0750fbd77286a6d7cc46fba"
-  integrity sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==
-  dependencies:
-    mime-db ">= 1.43.0 < 2"
-
-compression@^1.7.4:
-  version "1.7.4"
-  resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f"
-  integrity sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==
-  dependencies:
-    accepts "~1.3.5"
-    bytes "3.0.0"
-    compressible "~2.0.16"
-    debug "2.6.9"
-    on-headers "~1.0.2"
-    safe-buffer "5.1.2"
-    vary "~1.1.2"
-
 concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
@@ -2671,7 +2703,7 @@ concat-stream@^1.5.0, concat-stream@^1.6.0:
     readable-stream "^2.2.2"
     typedarray "^0.0.6"
 
-concat-with-sourcemaps@^1.0.0, concat-with-sourcemaps@^1.0.5:
+concat-with-sourcemaps@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/concat-with-sourcemaps/-/concat-with-sourcemaps-1.1.0.tgz#d4ea93f05ae25790951b99e7b3b09e3908a4082e"
   integrity sha512-4gEjHJFT9e+2W/77h/DS5SGUgwDaOwprX8L/gl5+3ixnzkVJJsZWDSelmN3Oilw3LNDZjZV0yqH1hLG3k6nghg==
@@ -2686,7 +2718,7 @@ config-chain@^1.1.11:
     ini "^1.3.4"
     proto-list "~1.2.1"
 
-connect-history-api-fallback@^1, connect-history-api-fallback@^1.6.0:
+connect-history-api-fallback@^1:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc"
   integrity sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==
@@ -2726,18 +2758,13 @@ contains-path@^0.1.0:
   resolved "https://registry.yarnpkg.com/contains-path/-/contains-path-0.1.0.tgz#fe8cf184ff6670b6baef01a9d4861a5cbec4120a"
   integrity sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo=
 
-content-disposition@0.5.3, content-disposition@^0.5.2:
+content-disposition@^0.5.2:
   version "0.5.3"
   resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd"
   integrity sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==
   dependencies:
     safe-buffer "5.1.2"
 
-content-type@~1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
-  integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
-
 convert-source-map@1.X, convert-source-map@^1.5.0, convert-source-map@^1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442"
@@ -2745,21 +2772,11 @@ convert-source-map@1.X, convert-source-map@^1.5.0, convert-source-map@^1.7.0:
   dependencies:
     safe-buffer "~5.1.1"
 
-cookie-signature@1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
-  integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw=
-
 cookie@0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"
   integrity sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=
 
-cookie@0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba"
-  integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==
-
 copy-concurrently@^1.0.0:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0"
@@ -2878,17 +2895,6 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
     safe-buffer "^5.0.1"
     sha.js "^2.4.8"
 
-cross-spawn@6.0.5, cross-spawn@^6.0.0, cross-spawn@^6.0.5:
-  version "6.0.5"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
-  integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
-  dependencies:
-    nice-try "^1.0.4"
-    path-key "^2.0.1"
-    semver "^5.5.0"
-    shebang-command "^1.2.0"
-    which "^1.2.9"
-
 cross-spawn@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-3.0.1.tgz#1256037ecb9f0c5f79e3d6ef135e30770184b982"
@@ -2906,6 +2912,17 @@ cross-spawn@^5.0.1:
     shebang-command "^1.2.0"
     which "^1.2.9"
 
+cross-spawn@^6.0.0, cross-spawn@^6.0.5:
+  version "6.0.5"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
+  integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
+  dependencies:
+    nice-try "^1.0.4"
+    path-key "^2.0.1"
+    semver "^5.5.0"
+    shebang-command "^1.2.0"
+    which "^1.2.9"
+
 crypto-browserify@^3.11.0:
   version "3.12.0"
   resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec"
@@ -2951,24 +2968,24 @@ css-has-pseudo@^0.10.0:
     postcss "^7.0.6"
     postcss-selector-parser "^5.0.0-rc.4"
 
-css-loader@^3.4.2:
-  version "3.5.3"
-  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-3.5.3.tgz#95ac16468e1adcd95c844729e0bb167639eb0bcf"
-  integrity sha512-UEr9NH5Lmi7+dguAm+/JSPovNjYbm2k3TK58EiwQHzOHH5Jfq1Y+XoP2bQO6TMn7PptMd0opxxedAWcaSTRKHw==
+css-loader@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-4.0.0.tgz#814434d4e1e2d5f430c70e85e78268db7f3cced1"
+  integrity sha512-/7d5slKnmY2S39FNifJ7JQ8MhcMM/rDIjAZ2Sc/Z8lnOWOmc10hijg28ovBtljY364pQaF01O2nj5AIBDnJ9vQ==
   dependencies:
-    camelcase "^5.3.1"
+    camelcase "^6.0.0"
     cssesc "^3.0.0"
     icss-utils "^4.1.1"
-    loader-utils "^1.2.3"
+    loader-utils "^2.0.0"
     normalize-path "^3.0.0"
-    postcss "^7.0.27"
+    postcss "^7.0.32"
     postcss-modules-extract-imports "^2.0.0"
-    postcss-modules-local-by-default "^3.0.2"
+    postcss-modules-local-by-default "^3.0.3"
     postcss-modules-scope "^2.2.0"
     postcss-modules-values "^3.0.0"
-    postcss-value-parser "^4.0.3"
-    schema-utils "^2.6.6"
-    semver "^6.3.0"
+    postcss-value-parser "^4.1.0"
+    schema-utils "^2.7.0"
+    semver "^7.3.2"
 
 css-prefers-color-scheme@^3.1.1:
   version "3.1.1"
@@ -3155,10 +3172,10 @@ dashdash@^1.12.0:
   dependencies:
     assert-plus "^1.0.0"
 
-date-fns@^2.14.0:
-  version "2.14.0"
-  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.14.0.tgz#359a87a265bb34ef2e38f93ecf63ac453f9bc7ba"
-  integrity sha512-1zD+68jhFgDIM0rF05rcwYO8cExdNqxjq4xP1QKM60Q45mnO6zaMWB4tOzrIr4M4GSLntsKeE4c9Bdl2jhL/yw==
+date-fns@^2.15.0:
+  version "2.15.0"
+  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.15.0.tgz#424de6b3778e4e69d3ff27046ec136af58ae5d5f"
+  integrity sha512-ZCPzAMJZn3rNUvvQIMlXhDr4A+Ar07eLeGsGREoWU19a3Pqf5oYa+ccd+B3F6XVtQY6HANMFdOQ8A+ipFnvJdQ==
 
 dateformat@^2.0.0:
   version "2.2.0"
@@ -3181,7 +3198,7 @@ debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.9:
   dependencies:
     ms "2.0.0"
 
-debug@3.X, debug@^3.0.0, debug@^3.1.1, debug@^3.2.5:
+debug@3.X:
   version "3.2.6"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
   integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
@@ -3280,18 +3297,6 @@ decompress@^4.0.0, decompress@^4.2.0:
     pify "^2.3.0"
     strip-dirs "^2.0.0"
 
-deep-equal@^1.0.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.1.1.tgz#b5c98c942ceffaf7cb051e24e1434a25a2e6076a"
-  integrity sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==
-  dependencies:
-    is-arguments "^1.0.4"
-    is-date-object "^1.0.1"
-    is-regex "^1.0.4"
-    object-is "^1.0.1"
-    object-keys "^1.1.1"
-    regexp.prototype.flags "^1.2.0"
-
 deep-is@~0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
@@ -3304,14 +3309,6 @@ default-compare@^1.0.0:
   dependencies:
     kind-of "^5.0.2"
 
-default-gateway@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-4.2.0.tgz#167104c7500c2115f6dd69b0a536bb8ed720552b"
-  integrity sha512-h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA==
-  dependencies:
-    execa "^1.0.0"
-    ip-regex "^2.1.0"
-
 default-resolution@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/default-resolution/-/default-resolution-2.0.0.tgz#bcb82baa72ad79b426a76732f1a81ad6df26d684"
@@ -3346,19 +3343,6 @@ define-property@^2.0.2:
     is-descriptor "^1.0.2"
     isobject "^3.0.1"
 
-del@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/del/-/del-4.1.1.tgz#9e8f117222ea44a31ff3a156c049b99052a9f0b4"
-  integrity sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==
-  dependencies:
-    "@types/glob" "^7.1.1"
-    globby "^6.1.0"
-    is-path-cwd "^2.0.0"
-    is-path-in-cwd "^2.0.0"
-    p-map "^2.0.0"
-    pify "^4.0.1"
-    rimraf "^2.6.3"
-
 del@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/del/-/del-5.1.0.tgz#d9487c94e367410e6eff2925ee58c0c84a75b3a7"
@@ -3411,11 +3395,6 @@ detect-newline@2.X:
   resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-2.1.0.tgz#f41f1c10be4b00e87b5f13da680759f2c5bfd3e2"
   integrity sha1-9B8cEL5LAOh7XxPaaAdZ8sW/0+I=
 
-detect-node@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c"
-  integrity sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==
-
 dev-ip@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/dev-ip/-/dev-ip-1.0.1.tgz#a76a3ed1855be7a012bb8ac16cb80f3c00dc28f0"
@@ -3430,14 +3409,6 @@ diffie-hellman@^5.0.0:
     miller-rabin "^4.0.0"
     randombytes "^2.0.0"
 
-dir-glob@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.0.0.tgz#0b205d2b6aef98238ca286598a8204d29d0a0034"
-  integrity sha512-37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag==
-  dependencies:
-    arrify "^1.0.1"
-    path-type "^3.0.0"
-
 dir-glob@^2.0.0, dir-glob@^2.2.2:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.2.2.tgz#fa09f0694153c8918b18ba0deafae94769fc50c4"
@@ -3452,26 +3423,6 @@ dir-glob@^3.0.1:
   dependencies:
     path-type "^4.0.0"
 
-dns-equal@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d"
-  integrity sha1-s55/HabrCnW6nBcySzR1PEfgZU0=
-
-dns-packet@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.3.1.tgz#12aa426981075be500b910eedcd0b47dd7deda5a"
-  integrity sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==
-  dependencies:
-    ip "^1.1.0"
-    safe-buffer "^5.0.1"
-
-dns-txt@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/dns-txt/-/dns-txt-2.0.2.tgz#b91d806f5d27188e4ab3e7d107d881a1cc4642b6"
-  integrity sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=
-  dependencies:
-    buffer-indexof "^1.0.0"
-
 doctrine@1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa"
@@ -3487,13 +3438,6 @@ doctrine@^3.0.0:
   dependencies:
     esutils "^2.0.2"
 
-document-register-element@^1.14.3:
-  version "1.14.3"
-  resolved "https://registry.yarnpkg.com/document-register-element/-/document-register-element-1.14.3.tgz#3335d4578df6a1536a34595b91cca36dd5db61d7"
-  integrity sha512-SbJTzoQXLTcYxnpdDNRZXu/gwsGSShemXpvj6Pa6ujRwJFpJ41siil4tk4y+cQXnqylS6mc2Rtxp/PkMzfkqyQ==
-  dependencies:
-    lightercollective "^0.3.0"
-
 dom-converter@^0.2:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/dom-converter/-/dom-converter-0.2.0.tgz#6721a9daee2e293682955b6afe416771627bb768"
@@ -3676,11 +3620,16 @@ ee-first@1.1.1:
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
   integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
 
-electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.413:
+electron-to-chromium@^1.2.7:
   version "1.3.427"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.427.tgz#ea43d02908a8c71f47ebb46e09de5a3cf8236f04"
   integrity sha512-/rG5G7Opcw68/Yrb4qYkz07h3bESVRJjUl4X/FrKLXzoUJleKm6D7K7rTTz8V5LUWnd+BbTOyxJX2XprRqHD8A==
 
+electron-to-chromium@^1.3.483:
+  version "1.3.488"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.488.tgz#9226229f5fbc825959210e81e0bb3e63035d1c06"
+  integrity sha512-NReBdOugu1yl8ly+0VDtiQ6Yw/1sLjnvflWq0gvY1nfUXU2PbA+1XAVuEb7ModnwL/MfUPjby7e4pAFnSHiy6Q==
+
 elliptic@^6.0.0:
   version "6.5.2"
   resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.2.tgz#05c5678d7173c049d8ca433552224a495d0e3762"
@@ -3709,11 +3658,6 @@ emoji-regex@^8.0.0:
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
   integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
 
-emojis-list@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
-  integrity sha1-TapNnbAPmBmIDHn6RXrlsJof04k=
-
 emojis-list@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78"
@@ -3799,19 +3743,10 @@ engine.io@~3.2.0:
     engine.io-parser "~2.1.0"
     ws "~3.3.1"
 
-enhanced-resolve@4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz#41c7e0bfdfe74ac1ffe1e57ad6a5c6c9f3742a7f"
-  integrity sha512-F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng==
-  dependencies:
-    graceful-fs "^4.1.2"
-    memory-fs "^0.4.0"
-    tapable "^1.0.0"
-
-enhanced-resolve@^4.1.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.1.tgz#2937e2b8066cd0fe7ce0990a98f0d71a35189f66"
-  integrity sha512-98p2zE+rL7/g/DzMHMTF4zZlCgeVdJ7yr6xzEpJRYwFYrGi9ANdn5DnJURg6RpBkyk60XYDnWIv51VfIhfNGuA==
+enhanced-resolve@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.3.0.tgz#3b806f3bfafc1ec7de69551ef93cca46c1704126"
+  integrity sha512-3e87LvavsdxyoCfGusJnrZ5G8SLPOFeHSNpZI/ATL9a5leXo2k0w6MKnbqhdBad9qTobSfB20Ld7UmgoNbAZkQ==
   dependencies:
     graceful-fs "^4.1.2"
     memory-fs "^0.5.0"
@@ -3827,6 +3762,21 @@ entities@^2.0.0:
   resolved "https://registry.yarnpkg.com/entities/-/entities-2.0.0.tgz#68d6084cab1b079767540d80e56a39b423e4abf4"
   integrity sha512-D9f7V0JSRwIxlRI2mjMqufDrRDnx8p+eEOz7aUM9SuvF8gsBzra0/6tbjl1m8eQHrZlYj6PxqE00hZ1SAIKPLw==
 
+epubjs@^0.3.85:
+  version "0.3.88"
+  resolved "https://registry.yarnpkg.com/epubjs/-/epubjs-0.3.88.tgz#bc365e7e21893cf2d92717ce10927c1071275347"
+  integrity sha512-VRumULpUELYmYwzypyfbDwoSIqDp2LXOXCtY3o55o3YDW5Zm32UjtZuX/xaWFGqyZORNNMWWQ8VlMaY1djnDYg==
+  dependencies:
+    "@types/localforage" "0.0.34"
+    core-js "^3.6.5"
+    event-emitter "^0.3.5"
+    jszip "^3.4.0"
+    localforage "^1.7.3"
+    lodash "^4.17.15"
+    marks-pane "^1.0.9"
+    path-webpack "0.0.3"
+    xmldom "^0.3.0"
+
 errno@^0.1.3, errno@~0.1.7:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618"
@@ -3841,7 +3791,24 @@ error-ex@^1.2.0, error-ex@^1.3.1:
   dependencies:
     is-arrayish "^0.2.1"
 
-es-abstract@^1.17.0, es-abstract@^1.17.0-next.1, es-abstract@^1.17.2, es-abstract@^1.17.5:
+es-abstract@^1.17.0, es-abstract@^1.17.0-next.1, es-abstract@^1.17.5:
+  version "1.17.6"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.6.tgz#9142071707857b2cacc7b89ecb670316c3e2d52a"
+  integrity sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==
+  dependencies:
+    es-to-primitive "^1.2.1"
+    function-bind "^1.1.1"
+    has "^1.0.3"
+    has-symbols "^1.0.1"
+    is-callable "^1.2.0"
+    is-regex "^1.1.0"
+    object-inspect "^1.7.0"
+    object-keys "^1.1.1"
+    object.assign "^4.1.0"
+    string.prototype.trimend "^1.0.1"
+    string.prototype.trimstart "^1.0.1"
+
+es-abstract@^1.17.2:
   version "1.17.5"
   resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.5.tgz#d8c9d1d66c8981fb9200e2251d799eee92774ae9"
   integrity sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg==
@@ -3908,6 +3875,11 @@ es6-weak-map@^2.0.1, es6-weak-map@^2.0.2:
     es6-iterator "^2.0.3"
     es6-symbol "^3.1.1"
 
+escalade@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.0.1.tgz#52568a77443f6927cd0ab9c73129137533c965ed"
+  integrity sha512-DR6NO3h9niOT+MZs7bjxlj2a1k+POu5RN8CLTPX2+i78bRi9eLe7+0zXgUHMnGXWybYcL61E9hGhPKqedy8tQA==
+
 escape-html@~1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
@@ -3923,15 +3895,15 @@ escape-string-regexp@^2.0.0:
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344"
   integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==
 
-eslint-import-resolver-node@^0.3.2:
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.3.tgz#dbaa52b6b2816b50bc6711af75422de808e98404"
-  integrity sha512-b8crLDo0M5RSe5YG8Pu2DYBj71tSB6OvXkfzwbJU2w7y8P4/yo0MyF8jU26IEuEuHF2K5/gcAJE3LhQGqBBbVg==
+eslint-import-resolver-node@^0.3.3:
+  version "0.3.4"
+  resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz#85ffa81942c25012d8231096ddf679c03042c717"
+  integrity sha512-ogtf+5AB/O+nM6DIeBUNr2fuT7ot9Qg/1harBfBtaP13ekEWFQEEMP94BCB7zaNW3gyY+8SHYF00rnqYwXKWOA==
   dependencies:
     debug "^2.6.9"
     resolve "^1.13.1"
 
-eslint-module-utils@^2.4.1:
+eslint-module-utils@^2.6.0:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz#579ebd094f56af7797d19c9866c9c9486629bfa6"
   integrity sha512-6j9xxegbqe8/kZY8cYpcp0xhbK0EgJlg3g9mib3/miLaExuuwc3n5UEfSnU6hWMbT0FAYVvDbL9RrRgpUeQIvA==
@@ -3940,61 +3912,63 @@ eslint-module-utils@^2.4.1:
     pkg-dir "^2.0.0"
 
 eslint-plugin-compat@^3.5.1:
-  version "3.5.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-compat/-/eslint-plugin-compat-3.5.1.tgz#09f9c05dcfa9b5cd69345d7ab333749813ed8b14"
-  integrity sha512-dhfW12vZxxKLEVhrPoblmEopgwpYU2Sd4GdXj5OSfbQ+as9+1aY+S5pqnJYJvXXNWFFJ6aspLkCyk4NMQ/pgtA==
+  version "3.8.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-compat/-/eslint-plugin-compat-3.8.0.tgz#2348d6105e7e87b823ae3b97b349512a2a45a7f2"
+  integrity sha512-5CuWUSZXZkXLCQJBriEpndn/YWrvggDSHTpRJq++kR8GVcsWbTdp8Eh+nBA7JlrNi7ZJ/+kniOVXmn3bpnxuRA==
   dependencies:
-    "@babel/runtime" "^7.7.7"
-    ast-metadata-inferer "^0.1.1"
-    browserslist "^4.8.2"
-    caniuse-db "^1.0.30001017"
+    ast-metadata-inferer "^0.4.0"
+    browserslist "^4.12.2"
+    caniuse-db "^1.0.30001090"
+    core-js "^3.6.5"
+    find-up "^4.1.0"
     lodash.memoize "4.1.2"
-    mdn-browser-compat-data "^1.0.3"
-    semver "^6.3.0"
+    mdn-browser-compat-data "^1.0.28"
+    semver "7.3.2"
 
-eslint-plugin-eslint-comments@^3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-eslint-comments/-/eslint-plugin-eslint-comments-3.1.2.tgz#4ef6c488dbe06aa1627fea107b3e5d059fc8a395"
-  integrity sha512-QexaqrNeteFfRTad96W+Vi4Zj1KFbkHHNMMaHZEYcovKav6gdomyGzaxSDSL3GoIyUOo078wRAdYlu1caiauIQ==
+eslint-plugin-eslint-comments@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-eslint-comments/-/eslint-plugin-eslint-comments-3.2.0.tgz#9e1cd7b4413526abb313933071d7aba05ca12ffa"
+  integrity sha512-0jkOl0hfojIHHmEHgmNdqv4fmh7300NdpA9FFpF7zaoLvB/QeXOGNLIo86oAveJFrfB1p05kC8hpEMHM8DwWVQ==
   dependencies:
     escape-string-regexp "^1.0.5"
     ignore "^5.0.5"
 
-eslint-plugin-import@^2.20.2:
-  version "2.20.2"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.20.2.tgz#91fc3807ce08be4837141272c8b99073906e588d"
-  integrity sha512-FObidqpXrR8OnCh4iNsxy+WACztJLXAHBO5hK79T1Hc77PgQZkyDGA5Ag9xAvRpglvLNxhH/zSmZ70/pZ31dHg==
+eslint-plugin-import@^2.21.2:
+  version "2.22.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.22.0.tgz#92f7736fe1fde3e2de77623c838dd992ff5ffb7e"
+  integrity sha512-66Fpf1Ln6aIS5Gr/55ts19eUuoDhAbZgnr6UxK5hbDx6l/QgQgx61AePq+BV4PP2uXQFClgMVzep5zZ94qqsxg==
   dependencies:
-    array-includes "^3.0.3"
-    array.prototype.flat "^1.2.1"
+    array-includes "^3.1.1"
+    array.prototype.flat "^1.2.3"
     contains-path "^0.1.0"
     debug "^2.6.9"
     doctrine "1.5.0"
-    eslint-import-resolver-node "^0.3.2"
-    eslint-module-utils "^2.4.1"
+    eslint-import-resolver-node "^0.3.3"
+    eslint-module-utils "^2.6.0"
     has "^1.0.3"
     minimatch "^3.0.4"
-    object.values "^1.1.0"
+    object.values "^1.1.1"
     read-pkg-up "^2.0.0"
-    resolve "^1.12.0"
+    resolve "^1.17.0"
+    tsconfig-paths "^3.9.0"
 
 eslint-plugin-promise@^4.2.1:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-4.2.1.tgz#845fd8b2260ad8f82564c1222fce44ad71d9418a"
   integrity sha512-VoM09vT7bfA7D+upt+FjeBO5eHIJQBUWki1aPvB+vbNiHS3+oGIJGIeyBtKQTME6UPXXy3vV07OL1tHd3ANuDw==
 
-eslint-scope@^4.0.3:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.3.tgz#ca03833310f6889a3264781aa82e63eb9cfe7848"
-  integrity sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==
+eslint-scope@5.0.0, eslint-scope@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.0.0.tgz#e87c8887c73e8d1ec84f1ca591645c358bfc8fb9"
+  integrity sha512-oYrhJW7S0bxAFDvWqzvMPRm6pcgcnWc4QnofCAqRTRfQC0JcwenzGglTtsLyIuuWFfkqDG9vz67cnttSd53djw==
   dependencies:
     esrecurse "^4.1.0"
     estraverse "^4.1.1"
 
-eslint-scope@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.0.0.tgz#e87c8887c73e8d1ec84f1ca591645c358bfc8fb9"
-  integrity sha512-oYrhJW7S0bxAFDvWqzvMPRm6pcgcnWc4QnofCAqRTRfQC0JcwenzGglTtsLyIuuWFfkqDG9vz67cnttSd53djw==
+eslint-scope@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.3.tgz#ca03833310f6889a3264781aa82e63eb9cfe7848"
+  integrity sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==
   dependencies:
     esrecurse "^4.1.0"
     estraverse "^4.1.1"
@@ -4110,33 +4084,16 @@ event-emitter@^0.3.5:
     d "1"
     es5-ext "~0.10.14"
 
-eventemitter3@1.x.x:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-1.2.0.tgz#1c86991d816ad1e504750e73874224ecf3bec508"
-  integrity sha1-HIaZHYFq0eUEdQ5zh0Ik7PO+xQg=
-
-eventemitter3@3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-3.1.0.tgz#090b4d6cdbd645ed10bf750d4b5407942d7ba163"
-  integrity sha512-ivIvhpq/Y0uSjcHDcOIccjmYjGLcP09MFGE7ysAwkAvkXfpZlC985pH2/ui64DKazbTW/4kN3yqozUxlXzI6cA==
-
-eventemitter3@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.0.tgz#d65176163887ee59f386d64c82610b696a4a74eb"
-  integrity sha512-qerSRB0p+UDEssxTtm6EDKcE7W4OaoisfIMl4CngyEhjpYglocpNg6UEqCvemdGhosAsg4sO2dXJOdyBifPGCg==
+eventemitter3@^4.0.0, eventemitter3@^4.0.3:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.4.tgz#b5463ace635a083d018bdc7c917b4c5f10a85384"
+  integrity sha512-rlaVLnVxtxvoyLsQQFBx53YmXHDxRIzzTLbdfxqi4yocpSjAxXwkU0cScM5JgSKMqEhrZpnvQ2D9gjylR0AimQ==
 
 events@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/events/-/events-3.1.0.tgz#84279af1b34cb75aa88bf5ff291f6d0bd9b31a59"
   integrity sha512-Rv+u8MLHNOdMjTAFeT3nCjHn2aGlx435FP/sDHNaRhDEMwyI/aB22Kj2qIN8R0cw3z28psEQLYwxVKLsKrMgWg==
 
-eventsource@^1.0.7:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-1.0.7.tgz#8fbc72c93fcd34088090bc0a4e64f4b5cee6d8d0"
-  integrity sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ==
-  dependencies:
-    original "^1.0.0"
-
 evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz#7fcbdb198dc71959432efe13842684e0525acb02"
@@ -4223,42 +4180,6 @@ expand-tilde@^2.0.0, expand-tilde@^2.0.2:
   dependencies:
     homedir-polyfill "^1.0.1"
 
-express@^4.17.1:
-  version "4.17.1"
-  resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134"
-  integrity sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==
-  dependencies:
-    accepts "~1.3.7"
-    array-flatten "1.1.1"
-    body-parser "1.19.0"
-    content-disposition "0.5.3"
-    content-type "~1.0.4"
-    cookie "0.4.0"
-    cookie-signature "1.0.6"
-    debug "2.6.9"
-    depd "~1.1.2"
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    etag "~1.8.1"
-    finalhandler "~1.1.2"
-    fresh "0.5.2"
-    merge-descriptors "1.0.1"
-    methods "~1.1.2"
-    on-finished "~2.3.0"
-    parseurl "~1.3.3"
-    path-to-regexp "0.1.7"
-    proxy-addr "~2.0.5"
-    qs "6.7.0"
-    range-parser "~1.2.1"
-    safe-buffer "5.1.2"
-    send "0.17.1"
-    serve-static "1.14.1"
-    setprototypeof "1.1.1"
-    statuses "~1.5.0"
-    type-is "~1.6.18"
-    utils-merge "1.0.1"
-    vary "~1.1.2"
-
 ext-list@^2.0.0:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/ext-list/-/ext-list-2.2.2.tgz#0b98e64ed82f5acf0f2931babf69212ef52ddd37"
@@ -4349,7 +4270,7 @@ fast-deep-equal@^3.1.1:
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz#545145077c501491e33b15ec408c294376e94ae4"
   integrity sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==
 
-fast-glob@^2.0.2, fast-glob@^2.2.6:
+fast-glob@^2.2.6:
   version "2.2.7"
   resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-2.2.7.tgz#6953857c3afa475fff92ee6015d52da70a4cd39d"
   integrity sha512-g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw==
@@ -4383,10 +4304,10 @@ fast-levenshtein@~2.0.6:
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
   integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
 
-fast-text-encoding@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/fast-text-encoding/-/fast-text-encoding-1.0.2.tgz#ff1ad5677bde049e0f8656aa6083a7ef2c5836e2"
-  integrity sha512-5rQdinSsycpzvAoHga2EDn+LRX1d5xLFsuNG0Kg61JrAT/tASXcLL0nf/33v+sAxlQcfYmWbTURa1mmAf55jGw==
+fast-text-encoding@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/fast-text-encoding/-/fast-text-encoding-1.0.3.tgz#ec02ac8e01ab8a319af182dae2681213cfe9ce53"
+  integrity sha512-dtm4QZH9nZtcDt8qJiOH9fcQd1NAgi+K1O2DbE6GG1PPCK/BWfOH3idCTRQ4ImXRUOyopDEgDEnVEE7Y/2Wrig==
 
 fastq@^1.6.0:
   version "1.7.0"
@@ -4395,20 +4316,6 @@ fastq@^1.6.0:
   dependencies:
     reusify "^1.0.4"
 
-faye-websocket@^0.10.0:
-  version "0.10.0"
-  resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.10.0.tgz#4e492f8d04dfb6f89003507f6edbf2d501e7c6f4"
-  integrity sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=
-  dependencies:
-    websocket-driver ">=0.5.1"
-
-faye-websocket@~0.11.1:
-  version "0.11.3"
-  resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.3.tgz#5c0e9a8968e8912c286639fde977a8b209f2508e"
-  integrity sha512-D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA==
-  dependencies:
-    websocket-driver ">=0.5.1"
-
 fd-slicer@~1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e"
@@ -4542,19 +4449,6 @@ finalhandler@1.1.0:
     statuses "~1.3.1"
     unpipe "~1.0.0"
 
-finalhandler@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d"
-  integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==
-  dependencies:
-    debug "2.6.9"
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    on-finished "~2.3.0"
-    parseurl "~1.3.3"
-    statuses "~1.5.0"
-    unpipe "~1.0.0"
-
 find-cache-dir@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz#8d0f94cd13fe43c6c7c261a0d86115ca918c05f7"
@@ -4601,16 +4495,6 @@ find-versions@^3.0.0:
   dependencies:
     semver-regex "^2.0.0"
 
-findup-sync@3.0.0, findup-sync@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-3.0.0.tgz#17b108f9ee512dfb7a5c7f3c8b27ea9e1a9c08d1"
-  integrity sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg==
-  dependencies:
-    detect-file "^1.0.0"
-    is-glob "^4.0.0"
-    micromatch "^3.0.4"
-    resolve-dir "^1.0.1"
-
 findup-sync@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-2.0.0.tgz#9326b1488c22d1a6088650a86901b2d9a90a2cbc"
@@ -4621,6 +4505,16 @@ findup-sync@^2.0.0:
     micromatch "^3.0.4"
     resolve-dir "^1.0.1"
 
+findup-sync@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-3.0.0.tgz#17b108f9ee512dfb7a5c7f3c8b27ea9e1a9c08d1"
+  integrity sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg==
+  dependencies:
+    detect-file "^1.0.0"
+    is-glob "^4.0.0"
+    micromatch "^3.0.4"
+    resolve-dir "^1.0.1"
+
 fined@^1.0.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/fined/-/fined-1.2.0.tgz#d00beccf1aa2b475d16d423b0238b713a2c4a37b"
@@ -4680,11 +4574,9 @@ follow-redirects@1.5.10:
     debug "=3.1.0"
 
 follow-redirects@^1.0.0:
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.11.0.tgz#afa14f08ba12a52963140fe43212658897bc0ecb"
-  integrity sha512-KZm0V+ll8PfBrKwMzdo5D13b1bur9Iq9Zd/RMmAoQQcl2PxxFml8cxXPaaPYVbV0RjNjq1CU7zIzAOqtUPudmA==
-  dependencies:
-    debug "^3.0.0"
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.12.1.tgz#de54a6205311b93d60398ebc01cf7015682312b6"
+  integrity sha512-tmRv0AVuR7ZyouUHLeNSiO6pqulF7dYa3s19c6t+wz9LD69/uSzdMxJ2S91nTI9U3rt/IldxpzMOFejp6f0hjg==
 
 for-in@^1.0.1, for-in@^1.0.2:
   version "1.0.2"
@@ -4717,11 +4609,6 @@ form-data@~2.3.2:
     combined-stream "^1.0.6"
     mime-types "^2.1.12"
 
-forwarded@~0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84"
-  integrity sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=
-
 fragment-cache@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
@@ -4787,6 +4674,11 @@ fsevents@^1.2.7:
     bindings "^1.5.0"
     nan "^2.12.1"
 
+fsevents@~2.1.2:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.3.tgz#fb738703ae8d2f9fe900c33836ddebee8b97f23e"
+  integrity sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==
+
 fstream@^1.0.0, fstream@^1.0.12:
   version "1.0.12"
   resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.12.tgz#4e8ba8ee2d48be4f7d0de505455548eae5932045"
@@ -4927,7 +4819,7 @@ glob-parent@^3.1.0:
     is-glob "^3.1.0"
     path-dirname "^1.0.0"
 
-glob-parent@^5.0.0, glob-parent@^5.1.0:
+glob-parent@^5.0.0, glob-parent@^5.1.0, glob-parent@~5.1.0:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.1.tgz#b6c1ef417c4e5663ea498f1c45afac6916bbc229"
   integrity sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==
@@ -4979,13 +4871,6 @@ glob@^7.0.0, glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, gl
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-global-modules@2.0.0, global-modules@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-2.0.0.tgz#997605ad2345f27f51539bea26574421215c7780"
-  integrity sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==
-  dependencies:
-    global-prefix "^3.0.0"
-
 global-modules@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz#6d770f0eb523ac78164d72b5e71a8877265cc3ea"
@@ -4995,6 +4880,13 @@ global-modules@^1.0.0:
     is-windows "^1.0.1"
     resolve-dir "^1.0.0"
 
+global-modules@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-2.0.0.tgz#997605ad2345f27f51539bea26574421215c7780"
+  integrity sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==
+  dependencies:
+    global-prefix "^3.0.0"
+
 global-prefix@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-1.0.2.tgz#dbf743c6c14992593c655568cb66ed32c0122ebe"
@@ -5041,10 +4933,10 @@ globby@^10.0.0, globby@^10.0.1:
     merge2 "^1.2.3"
     slash "^3.0.0"
 
-globby@^11.0.0:
-  version "11.0.0"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.0.tgz#56fd0e9f0d4f8fb0c456f1ab0dee96e1380bc154"
-  integrity sha512-iuehFnR3xu5wBBtm4xi0dMe92Ob87ufyu/dHwpDYfbcpYpIbrO5OnS8M1vWvrBhSGEJ3/Ecj7gnX76P8YxpPEg==
+globby@^11.0.1:
+  version "11.0.1"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.1.tgz#9a2bf107a068f3ffeabc49ad702c79ede8cfd357"
+  integrity sha512-iH9RmgwCmUJHi2z5o2l3eTtGBtXek1OYlHrbcxOYugyHLmAsZrPj43OtHThd62Buh/Vv6VyCBD2bdyWcGNQqoQ==
   dependencies:
     array-union "^2.1.0"
     dir-glob "^3.0.1"
@@ -5053,17 +4945,6 @@ globby@^11.0.0:
     merge2 "^1.3.0"
     slash "^3.0.0"
 
-globby@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c"
-  integrity sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=
-  dependencies:
-    array-union "^1.0.1"
-    glob "^7.0.3"
-    object-assign "^4.0.1"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
-
 globby@^7.1.1:
   version "7.1.1"
   resolved "https://registry.yarnpkg.com/globby/-/globby-7.1.1.tgz#fb2ccff9401f8600945dfada97440cca972b8680"
@@ -5076,19 +4957,6 @@ globby@^7.1.1:
     pify "^3.0.0"
     slash "^1.0.0"
 
-globby@^8.0.1:
-  version "8.0.2"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-8.0.2.tgz#5697619ccd95c5275dbb2d6faa42087c1a941d8d"
-  integrity sha512-yTzMmKygLp8RUpG1Ymu2VXPSJQZjNAZPD4ywgYEaG7e4tBJeUQBO8OpXrf1RCNcEs5alsoJYPAMiIHP0cmeC7w==
-  dependencies:
-    array-union "^1.0.1"
-    dir-glob "2.0.0"
-    fast-glob "^2.0.2"
-    glob "^7.1.2"
-    ignore "^3.3.5"
-    pify "^3.0.0"
-    slash "^1.0.0"
-
 globby@^9.0.0:
   version "9.2.0"
   resolved "https://registry.yarnpkg.com/globby/-/globby-9.2.0.tgz#fd029a706c703d29bdd170f4b6db3a3f7a7cb63d"
@@ -5213,10 +5081,10 @@ gulp-babel@^8.0.0:
     through2 "^2.0.0"
     vinyl-sourcemaps-apply "^0.2.0"
 
-gulp-cli@^2.2.0, gulp-cli@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/gulp-cli/-/gulp-cli-2.2.1.tgz#376e427661b7996430a89d71c15df75defa3360a"
-  integrity sha512-yEMxrXqY8mJFlaauFQxNrCpzWJThu0sH1sqlToaTOT063Hub9s/Nt2C+GSLe6feQ/IMWrHvGOOsyES7CQc9O+A==
+gulp-cli@^2.2.0, gulp-cli@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/gulp-cli/-/gulp-cli-2.3.0.tgz#ec0d380e29e52aa45e47977f0d32e18fd161122f"
+  integrity sha512-zzGBl5fHo0EKSXsHzjspp3y5CONegCm8ErO5Qh0UzFzk2y4tMvzLWhoDokADbarfZRL2pGpRp7yt6gfJX4ph7A==
   dependencies:
     ansi-colors "^1.0.1"
     archy "^1.0.0"
@@ -5226,7 +5094,7 @@ gulp-cli@^2.2.0, gulp-cli@^2.2.1:
     copy-props "^2.0.1"
     fancy-log "^1.3.2"
     gulplog "^1.0.0"
-    interpret "^1.1.0"
+    interpret "^1.4.0"
     isobject "^3.0.1"
     liftoff "^3.1.0"
     matchdep "^2.0.0"
@@ -5234,7 +5102,7 @@ gulp-cli@^2.2.0, gulp-cli@^2.2.1:
     pretty-hrtime "^1.0.0"
     replace-homedir "^1.0.0"
     semver-greatest-satisfied-range "^1.1.0"
-    v8flags "^3.0.1"
+    v8flags "^3.2.0"
     yargs "^7.1.0"
 
 gulp-concat@^2.6.1:
@@ -5352,14 +5220,14 @@ gulp-sourcemaps@^2.6.5:
     strip-bom-string "1.X"
     through2 "2.X"
 
-gulp-terser@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/gulp-terser/-/gulp-terser-1.2.0.tgz#41df2a1d0257d011ba8b05efb2568432ecd0495b"
-  integrity sha512-lf+jE2DALg2w32p0HRiYMlFYRYelKZPNunHp2pZccCYrrdCLOs0ItbZcN63yr2pbz116IyhUG9mD/QbtRO1FKA==
+gulp-terser@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/gulp-terser/-/gulp-terser-1.2.1.tgz#d5b0ee7ebb1107c1a7bb92449629b07a1951b896"
+  integrity sha512-wFWfO6hqPwHbzyulA67ZiC2mFXQO4bPno82cvL/V6qZsFXvYxKeeFuLSNsv+i/POhyfNJLkDrcye4rRxkvJUAA==
   dependencies:
     plugin-error "^1.0.1"
-    terser "^4.0.0"
-    through2 "^3.0.1"
+    terser ">=4"
+    through2 "^4.0.2"
     vinyl-sourcemaps-apply "^0.2.1"
 
 gulp-util@^3.0.8:
@@ -5403,11 +5271,6 @@ gulplog@^1.0.0:
   dependencies:
     glogg "^1.0.0"
 
-handle-thing@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.1.tgz#857f79ce359580c340d43081cc648970d0bb234e"
-  integrity sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==
-
 har-schema@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
@@ -5559,12 +5422,12 @@ hex-color-regex@^1.1.0:
   resolved "https://registry.yarnpkg.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz#4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e"
   integrity sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==
 
-hls.js@^0.13.1:
-  version "0.13.2"
-  resolved "https://registry.yarnpkg.com/hls.js/-/hls.js-0.13.2.tgz#3e7dd28e3787c69c6aba42b64b11eb2c3c8c29f1"
-  integrity sha512-sIg2t4uGpWQLzuK1Iid9614WOKqxj4OYg+EbFbhhTDCsxpENBN+Du3yBFnoi+a83DuOOHdiQd1ydnti9loSGXw==
+hls.js@^0.14.5:
+  version "0.14.5"
+  resolved "https://registry.yarnpkg.com/hls.js/-/hls.js-0.14.5.tgz#25aa94a4fea941eb3fd58814fc9e2c041c22e9c0"
+  integrity sha512-sBu8M70FFfrJ2SQ/PFk2UyTwwveG+9BANpo38i6XAa7LQCeE9cvjM8JTq9PsGzJSuWLMtTYye5VmefUZ6SGHXw==
   dependencies:
-    eventemitter3 "3.1.0"
+    eventemitter3 "^4.0.3"
     url-toolkit "^2.1.6"
 
 hmac-drbg@^1.0.0:
@@ -5593,16 +5456,6 @@ howler@^2.2.0:
   resolved "https://registry.yarnpkg.com/howler/-/howler-2.2.0.tgz#0e2c780997ae65ab9a1a186333031beac1c63c6b"
   integrity sha512-sGPkrAQy7jh5mNDbkRNG0F82R2HFDYNsQXBcX4smXQT0y0F4UMsa/+jXaGwWvcrajWr2tDB7JUkH7G5qSnuIyQ==
 
-hpack.js@^2.1.6:
-  version "2.1.6"
-  resolved "https://registry.yarnpkg.com/hpack.js/-/hpack.js-2.1.6.tgz#87774c0949e513f42e84575b3c45681fade2a0b2"
-  integrity sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=
-  dependencies:
-    inherits "^2.0.1"
-    obuf "^1.0.0"
-    readable-stream "^2.0.1"
-    wbuf "^1.1.0"
-
 hsl-regex@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/hsl-regex/-/hsl-regex-1.0.0.tgz#d49330c789ed819e276a4c0d272dffa30b18fe6e"
@@ -5618,11 +5471,6 @@ html-comment-regex@^1.1.0, html-comment-regex@^1.1.2:
   resolved "https://registry.yarnpkg.com/html-comment-regex/-/html-comment-regex-1.1.2.tgz#97d4688aeb5c81886a364faa0cad1dda14d433a7"
   integrity sha512-P+M65QY2JQ5Y0G9KKdlDpo0zK+/OHptU5AaBwUfAIDJZk1MYf32Frm84EcOytfJE0t5JvkAnKlmjsXDnWzCJmQ==
 
-html-entities@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.3.1.tgz#fb9a1a4b5b14c5daba82d3e34c6ae4fe701a0e44"
-  integrity sha512-rhE/4Z3hIhzHAUKbW8jVcCyuT5oJCXXqhN/6mXXVCpzTmvJnoH2HL/bt3EZ6p55jbFJBeAe1ZNpL5BugLujxNA==
-
 html-minifier-terser@^5.0.1:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-5.1.0.tgz#95d3df037f04835e9d1a09d1767c0e361a7de916"
@@ -5691,23 +5539,7 @@ http-cache-semantics@3.8.1:
   resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz#39b0e16add9b605bf0a9ef3d9daaf4843b4cacd2"
   integrity sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w==
 
-http-deceiver@^1.2.7:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87"
-  integrity sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=
-
-http-errors@1.7.2:
-  version "1.7.2"
-  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f"
-  integrity sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==
-  dependencies:
-    depd "~1.1.2"
-    inherits "2.0.3"
-    setprototypeof "1.1.1"
-    statuses ">= 1.5.0 < 2"
-    toidentifier "1.0.0"
-
-http-errors@1.7.3, http-errors@~1.7.2:
+http-errors@1.7.3:
   version "1.7.3"
   resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz#6c619e4f9c60308c38519498c14fbb10aacebb06"
   integrity sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw==
@@ -5728,33 +5560,10 @@ http-errors@~1.6.2:
     setprototypeof "1.1.0"
     statuses ">= 1.4.0 < 2"
 
-"http-parser-js@>=0.4.0 <0.4.11":
-  version "0.4.10"
-  resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.4.10.tgz#92c9c1374c35085f75db359ec56cc257cbb93fa4"
-  integrity sha1-ksnBN0w1CF912zWexWzCV8u5P6Q=
-
-http-proxy-middleware@0.19.1:
-  version "0.19.1"
-  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz#183c7dc4aa1479150306498c210cdaf96080a43a"
-  integrity sha512-yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q==
-  dependencies:
-    http-proxy "^1.17.0"
-    is-glob "^4.0.0"
-    lodash "^4.17.11"
-    micromatch "^3.1.10"
-
-http-proxy@1.15.2:
-  version "1.15.2"
-  resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.15.2.tgz#642fdcaffe52d3448d2bda3b0079e9409064da31"
-  integrity sha1-ZC/cr/5S00SNK9o7AHnpQJBk2jE=
-  dependencies:
-    eventemitter3 "1.x.x"
-    requires-port "1.x.x"
-
-http-proxy@^1.17.0:
-  version "1.18.0"
-  resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.0.tgz#dbe55f63e75a347db7f3d99974f2692a314a6a3a"
-  integrity sha512-84I2iJM/n1d4Hdgc6y2+qY5mDaz2PUVjlg9znE9byl+q0uC3DeByqBGReQu5tpLK0TAqTIXScRUV+dg7+bUPpQ==
+http-proxy@^1.18.1:
+  version "1.18.1"
+  resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.1.tgz#401541f0534884bbf95260334e72f88ee3976549"
+  integrity sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==
   dependencies:
     eventemitter3 "^4.0.0"
     follow-redirects "^1.0.0"
@@ -5808,10 +5617,10 @@ ignore@^4.0.3, ignore@^4.0.6:
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
   integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
 
-ignore@^5.0.4, ignore@^5.0.5, ignore@^5.1.1, ignore@^5.1.4:
-  version "5.1.4"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.4.tgz#84b7b3dbe64552b6ef0eca99f6743dbec6d97adf"
-  integrity sha512-MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A==
+ignore@^5.0.4, ignore@^5.0.5, ignore@^5.1.1, ignore@^5.1.4, ignore@^5.1.8:
+  version "5.1.8"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57"
+  integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==
 
 imagemin-gifsicle@^7.0.0:
   version "7.0.0"
@@ -5861,6 +5670,11 @@ imagemin@^7.0.0:
     p-pipe "^3.0.0"
     replace-ext "^1.0.0"
 
+immediate@~3.0.5:
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b"
+  integrity sha1-nbHb0Pr43m++D13V5Wu2BigN5ps=
+
 immutable@^3:
   version "3.8.2"
   resolved "https://registry.yarnpkg.com/immutable/-/immutable-3.8.2.tgz#c2439951455bb39913daf281376f1530e104adf3"
@@ -5906,14 +5720,6 @@ import-lazy@^4.0.0:
   resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-4.0.0.tgz#e8eb627483a0a43da3c03f3e35548be5cb0cc153"
   integrity sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==
 
-import-local@2.0.0, import-local@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/import-local/-/import-local-2.0.0.tgz#55070be38a5993cf18ef6db7e961f5bee5c5a09d"
-  integrity sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==
-  dependencies:
-    pkg-dir "^3.0.0"
-    resolve-cwd "^2.0.0"
-
 imurmurhash@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
@@ -6003,23 +5809,15 @@ inquirer@^7.0.0:
     strip-ansi "^6.0.0"
     through "^2.3.6"
 
-internal-ip@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-4.3.0.tgz#845452baad9d2ca3b69c635a137acb9a0dad0907"
-  integrity sha512-S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg==
-  dependencies:
-    default-gateway "^4.2.0"
-    ipaddr.js "^1.9.0"
+interpret@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e"
+  integrity sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==
 
-interpret@1.2.0, interpret@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.2.0.tgz#d5061a6224be58e8083985f5014d844359576296"
-  integrity sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw==
-
-intersection-observer@^0.10.0:
-  version "0.10.0"
-  resolved "https://registry.yarnpkg.com/intersection-observer/-/intersection-observer-0.10.0.tgz#4d11d63c1ff67e21e62987be24d55218da1a1a69"
-  integrity sha512-fn4bQ0Xq8FTej09YC/jqKZwtijpvARlRp6wxL5WTA6yPe2YWSJ5RJh7Nm79rK2qB0wr6iDQzH60XGq5V/7u8YQ==
+intersection-observer@^0.11.0:
+  version "0.11.0"
+  resolved "https://registry.yarnpkg.com/intersection-observer/-/intersection-observer-0.11.0.tgz#f4ea067070326f68393ee161cc0a2ca4c0040c6f"
+  integrity sha512-KZArj2QVnmdud9zTpKf279m2bbGfG+4/kn16UU0NL3pTVl52ZHiJ9IRNSsnn6jaHrL9EGLFM5eWjTx2fz/+zoQ==
 
 into-stream@^3.1.0:
   version "3.1.0"
@@ -6041,26 +5839,6 @@ invert-kv@^1.0.0:
   resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"
   integrity sha1-EEqOSqym09jNFXqO+L+rLXo//bY=
 
-invert-kv@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz#7393f5afa59ec9ff5f67a27620d11c226e3eec02"
-  integrity sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==
-
-ip-regex@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"
-  integrity sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=
-
-ip@^1.1.0, ip@^1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
-  integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=
-
-ipaddr.js@1.9.1, ipaddr.js@^1.9.0:
-  version "1.9.1"
-  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3"
-  integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==
-
 irregular-plurals@^1.0.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/irregular-plurals/-/irregular-plurals-1.4.0.tgz#2ca9b033651111855412f16be5d77c62a458a766"
@@ -6076,11 +5854,6 @@ is-absolute-url@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-2.1.0.tgz#50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6"
   integrity sha1-UFMN+4T8yap9vnhS6Do3uTufKqY=
 
-is-absolute-url@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-3.0.3.tgz#96c6a22b6a23929b11ea0afb1836c36ad4a5d698"
-  integrity sha512-opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q==
-
 is-absolute@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-absolute/-/is-absolute-1.0.0.tgz#395e1ae84b11f26ad1795e73c17378e48a301576"
@@ -6121,11 +5894,6 @@ is-alphanumerical@^1.0.0:
     is-alphabetical "^1.0.0"
     is-decimal "^1.0.0"
 
-is-arguments@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.0.4.tgz#3faf966c7cba0ff437fb31f6250082fcf0448cf3"
-  integrity sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==
-
 is-arrayish@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
@@ -6143,6 +5911,13 @@ is-binary-path@^1.0.0:
   dependencies:
     binary-extensions "^1.0.0"
 
+is-binary-path@~2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09"
+  integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==
+  dependencies:
+    binary-extensions "^2.0.0"
+
 is-buffer@^1.1.5:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
@@ -6153,10 +5928,10 @@ is-buffer@^2.0.0, is-buffer@^2.0.2:
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.4.tgz#3e572f23c8411a5cfd9557c849e3665e0b290623"
   integrity sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==
 
-is-callable@^1.1.4, is-callable@^1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.5.tgz#f7e46b596890456db74e7f6e976cb3273d06faab"
-  integrity sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==
+is-callable@^1.1.4, is-callable@^1.1.5, is-callable@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.0.tgz#83336560b54a38e35e3a2df7afd0454d691468bb"
+  integrity sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw==
 
 is-color-stop@^1.0.0:
   version "1.1.0"
@@ -6270,7 +6045,7 @@ is-glob@^3.1.0:
   dependencies:
     is-extglob "^2.1.0"
 
-is-glob@^4.0.0, is-glob@^4.0.1:
+is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
   integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==
@@ -6331,25 +6106,11 @@ is-object@^1.0.1:
   resolved "https://registry.yarnpkg.com/is-object/-/is-object-1.0.1.tgz#8952688c5ec2ffd6b03ecc85e769e02903083470"
   integrity sha1-iVJojF7C/9awPsyF52ngKQMINHA=
 
-is-path-cwd@^2.0.0, is-path-cwd@^2.2.0:
+is-path-cwd@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-2.2.0.tgz#67d43b82664a7b5191fd9119127eb300048a9fdb"
   integrity sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==
 
-is-path-in-cwd@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz#bfe2dca26c69f397265a4009963602935a053acb"
-  integrity sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==
-  dependencies:
-    is-path-inside "^2.1.0"
-
-is-path-inside@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-2.1.0.tgz#7c9810587d659a40d27bcdb4d5616eab059494b2"
-  integrity sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==
-  dependencies:
-    path-is-inside "^1.0.2"
-
 is-path-inside@^3.0.1:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.2.tgz#f5220fc82a3e233757291dddc9c5877f2a1f3017"
@@ -6382,12 +6143,12 @@ is-promise@^2.1:
   resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.2.2.tgz#39ab959ccbf9a774cf079f7b40c7a26f763135f1"
   integrity sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==
 
-is-regex@^1.0.4, is-regex@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.5.tgz#39d589a358bf18967f726967120b8fc1aed74eae"
-  integrity sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==
+is-regex@^1.0.5, is-regex@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.0.tgz#ece38e389e490df0dc21caea2bd596f987f767ff"
+  integrity sha512-iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw==
   dependencies:
-    has "^1.0.3"
+    has-symbols "^1.0.1"
 
 is-regexp@^1.0.0:
   version "1.0.0"
@@ -6539,10 +6300,10 @@ isurl@^1.0.0-alpha5:
     has-to-string-tag-x "^1.2.0"
     is-object "^1.0.1"
 
-jellyfin-apiclient@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/jellyfin-apiclient/-/jellyfin-apiclient-1.2.0.tgz#a892985ccfcd9798fe67455ee39cd0869adb14d5"
-  integrity sha512-7l2dXpVU+nvDVYJA/RwJPzZy99RtP89iIooZdRZ9gGF4tSCQe1Gf/fNIcTPBdMjXDBhiEZc1wytz4iYR1y2E/Q==
+jellyfin-apiclient@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/jellyfin-apiclient/-/jellyfin-apiclient-1.4.1.tgz#5e544a19bc001b16669eb7ecf46bb7d652365e41"
+  integrity sha512-BTTRucQ4tCLyiZ9kR9nAoxqxYp5/z+MCzkayy9vmMZ5C7jlVVsnxAXuuZjoa+AgXMjohXcM5Ci54myfJM1pRkA==
 
 "jellyfin-noto@https://github.com/jellyfin/jellyfin-noto":
   version "1.0.3"
@@ -6616,11 +6377,6 @@ json-stringify-safe@~5.0.1:
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
   integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
 
-json3@^3.3.2:
-  version "3.3.3"
-  resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.3.tgz#7fc10e375fc5ae42c4705a5cc0aa6f62be305b81"
-  integrity sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA==
-
 json5@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
@@ -6652,13 +6408,23 @@ jsprim@^1.2.2:
     json-schema "0.2.3"
     verror "1.10.0"
 
-jstree@^3.3.7:
-  version "3.3.9"
-  resolved "https://registry.yarnpkg.com/jstree/-/jstree-3.3.9.tgz#62b47cad3c4fda390d021e5c4f98ee5b3365198a"
-  integrity sha512-jRIbhg+BHrIs1Wm6oiJt3oKTVBE6sWS0PCp2/RlkIUqsLUPWUYgV3q8LfKoi1/E+YMzGtP6BuK4okk+0mwfmhQ==
+jstree@^3.3.10:
+  version "3.3.10"
+  resolved "https://registry.yarnpkg.com/jstree/-/jstree-3.3.10.tgz#28d5b464a6bd4b5a93ccc2e978d005845596a408"
+  integrity sha512-TDhwTy24ZKCVei0gLRxnH5PQuX77nqlG7bhQh+UDTeOxC2xdhDrS1x7YtbjLVlSxmH7USnA/WIeVOGN/m3D0QA==
   dependencies:
     jquery ">=1.9.1"
 
+jszip@^3.4.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.5.0.tgz#b4fd1f368245346658e781fec9675802489e15f6"
+  integrity sha512-WRtu7TPCmYePR1nazfrtuF216cIVon/3GWOvHS9QR5bIwSbnxtdpma6un3jyGGNhHsKCSzn5Ypk+EkDRvTGiFA==
+  dependencies:
+    lie "~3.3.0"
+    pako "~1.0.2"
+    readable-stream "~2.3.6"
+    set-immediate-shim "~1.0.1"
+
 junk@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/junk/-/junk-3.1.0.tgz#31499098d902b7e98c5d9b9c80f43457a88abfa1"
@@ -6676,11 +6442,6 @@ keyv@3.0.0:
   dependencies:
     json-buffer "3.0.0"
 
-killable@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz#4c8ce441187a061c7474fb87ca08e2a638194892"
-  integrity sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg==
-
 kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
@@ -6744,13 +6505,6 @@ lcid@^1.0.0:
   dependencies:
     invert-kv "^1.0.0"
 
-lcid@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/lcid/-/lcid-2.0.0.tgz#6ef5d2df60e52f82eb228a4c373e8d1f397253cf"
-  integrity sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==
-  dependencies:
-    invert-kv "^2.0.0"
-
 lead@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/lead/-/lead-1.0.0.tgz#6f14f99a37be3a9dd784f5495690e5903466ee42"
@@ -6787,6 +6541,20 @@ levn@^0.3.0, levn@~0.3.0:
   version "4.0.0"
   resolved "https://github.com/jellyfin/JavascriptSubtitlesOctopus#58e9a3f1a7f7883556ee002545f445a430120639"
 
+lie@3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/lie/-/lie-3.1.1.tgz#9a436b2cc7746ca59de7a41fa469b3efb76bd87e"
+  integrity sha1-mkNrLMd0bKWd56QfpGmz77dr2H4=
+  dependencies:
+    immediate "~3.0.5"
+
+lie@~3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/lie/-/lie-3.3.0.tgz#dcf82dee545f46074daf200c7c1c5a08e0f40f6a"
+  integrity sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==
+  dependencies:
+    immediate "~3.0.5"
+
 liftoff@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/liftoff/-/liftoff-3.1.0.tgz#c9ba6081f908670607ee79062d700df062c52ed3"
@@ -6801,11 +6569,6 @@ liftoff@^3.1.0:
     rechoir "^0.6.2"
     resolve "^1.1.7"
 
-lightercollective@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/lightercollective/-/lightercollective-0.3.0.tgz#1f07638642ec645d70bdb69ab2777676f35a28f0"
-  integrity sha512-RFOLSUVvwdK3xA0P8o6G7QGXLIyy1L2qv5caEI7zXN5ciaEjbAriRF182kbsoJ1S1TgvpyGcN485fMky6qxOPw==
-
 limiter@^1.0.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/limiter/-/limiter-1.1.5.tgz#8f92a25b3b16c6131293a0cc834b4a838a2aa7c2"
@@ -6852,15 +6615,6 @@ loader-runner@^2.4.0:
   resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.4.0.tgz#ed47066bfe534d7e84c4c7b9998c2a75607d9357"
   integrity sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==
 
-loader-utils@1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.2.3.tgz#1ff5dc6911c9f0a062531a4c04b609406108c2c7"
-  integrity sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==
-  dependencies:
-    big.js "^5.2.2"
-    emojis-list "^2.0.0"
-    json5 "^1.0.1"
-
 loader-utils@^1.1.0, loader-utils@^1.2.3, loader-utils@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613"
@@ -6879,15 +6633,22 @@ loader-utils@^2.0.0:
     emojis-list "^3.0.0"
     json5 "^2.1.2"
 
-localtunnel@1.9.2:
-  version "1.9.2"
-  resolved "https://registry.yarnpkg.com/localtunnel/-/localtunnel-1.9.2.tgz#0012fcabc29cf964c130a01858768aa2bb65b5af"
-  integrity sha512-NEKF7bDJE9U3xzJu3kbayF0WTvng6Pww7tzqNb/XtEARYwqw7CKEX7BvOMg98FtE9es2CRizl61gkV3hS8dqYg==
+localforage@*, localforage@^1.7.3:
+  version "1.7.4"
+  resolved "https://registry.yarnpkg.com/localforage/-/localforage-1.7.4.tgz#88b59cc9b25ae54c76bb2c080b21ec832c22d3f6"
+  integrity sha512-3EmVZatmNVeCo/t6Te7P06h2alGwbq8wXlSkcSXMvDE2/edPmsVqTPlzGnZaqwZZDBs6v+kxWpqjVsqsNJT8jA==
+  dependencies:
+    lie "3.1.1"
+
+localtunnel@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/localtunnel/-/localtunnel-2.0.0.tgz#2ea71174fa80e34cce91b2a7ce416e6a57d9ff7c"
+  integrity sha512-g6E0aLgYYDvQDxIjIXkgJo2+pHj3sGg4Wz/XP3h2KtZnRsWPbOQY+hw1H8Z91jep998fkcVE9l+kghO+97vllg==
   dependencies:
     axios "0.19.0"
     debug "4.1.1"
     openurl "1.1.1"
-    yargs "6.6.0"
+    yargs "13.3.0"
 
 locate-path@^2.0.0:
   version "2.0.0"
@@ -7051,10 +6812,10 @@ lodash.uniq@^4.5.0:
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
   integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
 
-lodash@^4.0.0, lodash@^4.1.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.4, lodash@~4.17.12:
-  version "4.17.15"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
-  integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
+lodash@^4.0.0, lodash@^4.1.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.4, lodash@~4.17.12:
+  version "4.17.19"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b"
+  integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==
 
 log-symbols@^1.0.2:
   version "1.0.2"
@@ -7085,11 +6846,6 @@ logalot@^2.0.0, logalot@^2.1.0:
     figures "^1.3.5"
     squeak "^1.0.0"
 
-loglevel@^1.6.8:
-  version "1.6.8"
-  resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.8.tgz#8a25fb75d092230ecd4457270d80b54e28011171"
-  integrity sha512-bsU7+gc9AJ2SqpzxwU3+1fedl8zAntbtC5XYlt3s2j1hJcn2PsXSmgN8TaLG/J1/2mod4+cE/3vNL70/c1RNCA==
-
 longest-streak@^2.0.1:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/longest-streak/-/longest-streak-2.0.4.tgz#b8599957da5b5dab64dee3fe316fa774597d90e4"
@@ -7198,13 +6954,6 @@ make-iterator@^1.0.0:
   dependencies:
     kind-of "^6.0.2"
 
-map-age-cleaner@^0.1.1:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a"
-  integrity sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==
-  dependencies:
-    p-defer "^1.0.0"
-
 map-cache@^0.2.0, map-cache@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
@@ -7249,6 +6998,11 @@ markdown-table@^2.0.0:
   dependencies:
     repeat-string "^1.0.0"
 
+marks-pane@^1.0.9:
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/marks-pane/-/marks-pane-1.0.9.tgz#c0b5ab813384d8cd81faaeb3bbf3397dc809c1b3"
+  integrity sha512-Ahs4oeG90tbdPWwAJkAAoHg2lRR8lAs9mZXETNPO9hYg3AkjUJBKi1NQ4aaIQZVGrig7c/3NUV1jANl8rFTeMg==
+
 matchdep@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/matchdep/-/matchdep-2.0.0.tgz#c6f34834a0d8dbc3b37c27ee8bbcb27c7775582e"
@@ -7292,10 +7046,10 @@ mdast-util-compact@^2.0.0:
   dependencies:
     unist-util-visit "^2.0.0"
 
-mdn-browser-compat-data@^1.0.3:
-  version "1.0.19"
-  resolved "https://registry.yarnpkg.com/mdn-browser-compat-data/-/mdn-browser-compat-data-1.0.19.tgz#f4542aea7bce4231c95c5bdab04f999298b58903"
-  integrity sha512-S1i9iILAsFi/C17NADg2cBT6D6Xcd5Ub+GSMQa5ScLhuVyUrRKjCNmFEED9mQ2G/lrKtvU9SGUrpPpXB8SXhCg==
+mdn-browser-compat-data@^1.0.28:
+  version "1.0.29"
+  resolved "https://registry.yarnpkg.com/mdn-browser-compat-data/-/mdn-browser-compat-data-1.0.29.tgz#9edddaa953221050c6959a538c993e915e619220"
+  integrity sha512-R9/8Xi1d9by2Ag5O7Sur3zoe8k/61a+yYeC4f6S5UhbEZb2ICmYNZuprm+2IO9bBcT3Pa2BtEx+xKoX/8v8tPw==
   dependencies:
     extend "3.0.2"
 
@@ -7309,20 +7063,6 @@ mdn-data@2.0.6:
   resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.6.tgz#852dc60fcaa5daa2e8cf6c9189c440ed3e042978"
   integrity sha512-rQvjv71olwNHgiTbfPZFkJtjNMciWgswYeciZhtvWLO8bmX3TnhyA62I6sTWOyZssWHJJjY6/KiWwqQsWWsqOA==
 
-media-typer@0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
-  integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=
-
-mem@^4.0.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/mem/-/mem-4.3.0.tgz#461af497bc4ae09608cdb2e60eefb69bff744178"
-  integrity sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==
-  dependencies:
-    map-age-cleaner "^0.1.1"
-    mimic-fn "^2.0.0"
-    p-is-promise "^2.0.0"
-
 memoizee@0.4.X:
   version "0.4.14"
   resolved "https://registry.yarnpkg.com/memoizee/-/memoizee-0.4.14.tgz#07a00f204699f9a95c2d9e77218271c7cd610d57"
@@ -7337,7 +7077,7 @@ memoizee@0.4.X:
     next-tick "1"
     timers-ext "^0.1.5"
 
-memory-fs@^0.4.0, memory-fs@^0.4.1:
+memory-fs@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
   integrity sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=
@@ -7403,11 +7143,6 @@ meow@^7.0.1:
     type-fest "^0.13.1"
     yargs-parser "^18.1.3"
 
-merge-descriptors@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
-  integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=
-
 merge-stream@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
@@ -7418,11 +7153,6 @@ merge2@^1.2.3, merge2@^1.3.0:
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.3.0.tgz#5b366ee83b2f1582c48f87e47cf1a9352103ca81"
   integrity sha512-2j4DAdlBOkiSZIsaXk4mTE3sRS02yBHAtfy127xRV3bQUFqXkjHCHLW6Scv7DwNRbIWNHH8zpnz9zMaKXIdvYw==
 
-methods@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
-  integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=
-
 micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4:
   version "3.1.10"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
@@ -7458,7 +7188,7 @@ miller-rabin@^4.0.0:
     bn.js "^4.0.0"
     brorand "^1.0.1"
 
-mime-db@1.44.0, "mime-db@>= 1.43.0 < 2", mime-db@^1.28.0:
+mime-db@1.44.0, mime-db@^1.28.0:
   version "1.44.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz#fa11c5eb0aca1334b4233cb4d52f10c5a6272f92"
   integrity sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==
@@ -7475,17 +7205,7 @@ mime@1.4.1:
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"
   integrity sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==
 
-mime@1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
-  integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
-
-mime@^2.4.4:
-  version "2.4.5"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.5.tgz#d8de2ecb92982dedbb6541c9b6841d7f218ea009"
-  integrity sha512-3hQhEUF027BuxZjQA3s7rIv/7VCQPa27hN9u9g87sEkWaKwQPuXOkVKtOeiyUrnWqTDiOs8Ed2rwg733mB0R5w==
-
-mimic-fn@^2.0.0, mimic-fn@^2.1.0:
+mimic-fn@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
   integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
@@ -7605,29 +7325,11 @@ ms@2.0.0:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
   integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
 
-ms@2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
-  integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
-
 ms@^2.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
-multicast-dns-service-types@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz#899f11d9686e5e05cb91b35d5f0e63b773cfc901"
-  integrity sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=
-
-multicast-dns@^6.0.1:
-  version "6.2.3"
-  resolved "https://registry.yarnpkg.com/multicast-dns/-/multicast-dns-6.2.3.tgz#a0ec7bd9055c4282f790c3c82f4e28db3b31b229"
-  integrity sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==
-  dependencies:
-    dns-packet "^1.3.1"
-    thunky "^1.0.2"
-
 multipipe@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/multipipe/-/multipipe-0.1.2.tgz#2a8f2ddf70eed564dff2d57f1e1a137d9f05078b"
@@ -7717,11 +7419,6 @@ no-case@^3.0.3:
     lower-case "^2.0.1"
     tslib "^1.10.0"
 
-node-forge@0.9.0:
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.9.0.tgz#d624050edbb44874adca12bb9a52ec63cb782579"
-  integrity sha512-7ASaDa3pD+lJ3WvXFsxekJQelBKRpne+GOVbLbtHYdd7pFspyeuJHnWfLplGf3SwKGbfs/aYl5V/JCIaHVUKKQ==
-
 node-gyp@^3.8.0:
   version "3.8.0"
   resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.8.0.tgz#540304261c330e80d0d5edce253a68cb3964218c"
@@ -7769,10 +7466,10 @@ node-libs-browser@^2.2.1:
     util "^0.11.0"
     vm-browserify "^1.0.1"
 
-node-releases@^1.1.53:
-  version "1.1.53"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.53.tgz#2d821bfa499ed7c5dffc5e2f28c88e78a08ee3f4"
-  integrity sha512-wp8zyQVwef2hpZ/dJH7SfSrIPD6YoJz6BDQDpGEkcA0s3LpAQoxBIYmfIq6QAhC1DhwsyCgTaTTcONwX8qzCuQ==
+node-releases@^1.1.58:
+  version "1.1.58"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.58.tgz#8ee20eef30fa60e52755fcc0942def5a734fe935"
+  integrity sha512-NxBudgVKiRh/2aPWMgPR7bPTX0VPmGx5QBwCtdHitnqFE5/O8DeBXuIMH1nwNnw/aMo6AjOrpsHzfY3UbUJ7yg==
 
 node-sass@^4.13.1:
   version "4.14.1"
@@ -7844,7 +7541,7 @@ normalize-path@^2.0.1, normalize-path@^2.1.1:
   dependencies:
     remove-trailing-separator "^1.0.1"
 
-normalize-path@^3.0.0:
+normalize-path@^3.0.0, normalize-path@~3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
   integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
@@ -7952,17 +7649,9 @@ object-copy@^0.1.0:
     kind-of "^3.0.3"
 
 object-inspect@^1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.7.0.tgz#f4f6bd181ad77f006b5ece60bd0b6f398ff74a67"
-  integrity sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==
-
-object-is@^1.0.1:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.2.tgz#c5d2e87ff9e119f78b7a088441519e2eec1573b6"
-  integrity sha512-5lHCz+0uufF6wZ7CRFWJN3hp8Jqblpgve06U5CMQ3f//6iDjPr2PEo9MWCjEssDsa+UZEL4PkFpr+BMop6aKzQ==
-  dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.5"
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.8.0.tgz#df807e5ecf53a609cc6bfe93eac3cc7be5b3a9d0"
+  integrity sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==
 
 object-keys@^1.0.11, object-keys@^1.0.12, object-keys@^1.1.1:
   version "1.1.1"
@@ -8032,7 +7721,7 @@ object.reduce@^1.0.0:
     for-own "^1.0.0"
     make-iterator "^1.0.0"
 
-object.values@^1.1.0:
+object.values@^1.1.0, object.values@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.1.tgz#68a99ecde356b7e9295a3c5e0ce31dc8c953de5e"
   integrity sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA==
@@ -8042,11 +7731,6 @@ object.values@^1.1.0:
     function-bind "^1.1.1"
     has "^1.0.3"
 
-obuf@^1.0.0, obuf@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e"
-  integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==
-
 on-finished@~2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
@@ -8054,11 +7738,6 @@ on-finished@~2.3.0:
   dependencies:
     ee-first "1.1.1"
 
-on-headers@~1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f"
-  integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==
-
 once@^1.3.0, once@^1.3.1, once@^1.3.2, once@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
@@ -8085,13 +7764,6 @@ opn@5.3.0:
   dependencies:
     is-wsl "^1.1.0"
 
-opn@^5.5.0:
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/opn/-/opn-5.5.0.tgz#fc7164fab56d235904c51c3b27da6758ca3b9bfc"
-  integrity sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==
-  dependencies:
-    is-wsl "^1.1.0"
-
 optionator@^0.8.3:
   version "0.8.3"
   resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495"
@@ -8120,13 +7792,6 @@ ordered-read-streams@^1.0.0:
   dependencies:
     readable-stream "^2.0.1"
 
-original@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/original/-/original-1.0.2.tgz#e442a61cffe1c5fd20a65f3261c26663b303f25f"
-  integrity sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==
-  dependencies:
-    url-parse "^1.4.3"
-
 os-browserify@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
@@ -8151,15 +7816,6 @@ os-locale@^1.4.0:
   dependencies:
     lcid "^1.0.0"
 
-os-locale@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz#a802a6ee17f24c10483ab9935719cef4ed16bf1a"
-  integrity sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==
-  dependencies:
-    execa "^1.0.0"
-    lcid "^2.0.0"
-    mem "^4.0.0"
-
 os-tmpdir@^1.0.0, os-tmpdir@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
@@ -8183,11 +7839,6 @@ p-cancelable@^0.4.0:
   resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-0.4.1.tgz#35f363d67d52081c8d9585e37bcceb7e0bbcb2a0"
   integrity sha512-HNa1A8LvB1kie7cERyy21VNeHb2CWJJYqyyC2o3klWFfMGlFmWv2Z7sFgZH8ZiaYL95ydToKTFVXgMV/Os0bBQ==
 
-p-defer@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"
-  integrity sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=
-
 p-event@^1.0.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/p-event/-/p-event-1.3.0.tgz#8e6b4f4f65c72bc5b6fe28b75eda874f96a4a085"
@@ -8212,11 +7863,6 @@ p-is-promise@^1.1.0:
   resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-1.1.0.tgz#9c9456989e9f6588017b0434d56097675c3da05e"
   integrity sha1-nJRWmJ6fZYgBewQ01WCXZ1w9oF4=
 
-p-is-promise@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.1.0.tgz#918cebaea248a62cf7ffab8e3bca8c5f882fc42e"
-  integrity sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==
-
 p-limit@^1.1.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"
@@ -8259,11 +7905,6 @@ p-map-series@^1.0.0:
   dependencies:
     p-reduce "^1.0.0"
 
-p-map@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz#310928feef9c9ecc65b68b17693018a665cea175"
-  integrity sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==
-
 p-map@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/p-map/-/p-map-3.0.0.tgz#d704d9af8a2ba684e2600d9a215983d4141a979d"
@@ -8281,13 +7922,6 @@ p-reduce@^1.0.0:
   resolved "https://registry.yarnpkg.com/p-reduce/-/p-reduce-1.0.0.tgz#18c2b0dd936a4690a529f8231f58a0fdb6a47dfa"
   integrity sha1-GMKw3ZNqRpClKfgjH1ig/bakffo=
 
-p-retry@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-3.0.1.tgz#316b4c8893e2c8dc1cfa891f406c4b422bebf328"
-  integrity sha512-XE6G4+YTTkT2a0UWb2kjZe8xNwf8bIbnqpc/IS/idOBVhyves0mK5OJgeocjx7q5pvX/6m23xuzVPYT1uGM73w==
-  dependencies:
-    retry "^0.12.0"
-
 p-timeout@^1.1.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-1.2.1.tgz#5eb3b353b7fce99f101a1038880bb054ebbea386"
@@ -8319,7 +7953,7 @@ page@^1.11.6:
   dependencies:
     path-to-regexp "~1.2.1"
 
-pako@~1.0.5:
+pako@~1.0.2, pako@~1.0.5:
   version "1.0.11"
   resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf"
   integrity sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==
@@ -8449,7 +8083,7 @@ parseuri@0.0.5:
   dependencies:
     better-assert "~1.0.0"
 
-parseurl@~1.3.2, parseurl@~1.3.3:
+parseurl@~1.3.2:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
   integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==
@@ -8499,11 +8133,6 @@ path-is-absolute@^1.0.0:
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
   integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
 
-path-is-inside@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
-  integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=
-
 path-key@^2.0.0, path-key@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
@@ -8526,11 +8155,6 @@ path-root@^0.1.1:
   dependencies:
     path-root-regex "^0.1.0"
 
-path-to-regexp@0.1.7:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
-  integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=
-
 path-to-regexp@~1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.2.1.tgz#b33705c140234d873c8721c7b9fd8b541ed3aff9"
@@ -8566,6 +8190,11 @@ path-type@^4.0.0:
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
   integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
 
+path-webpack@0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/path-webpack/-/path-webpack-0.0.3.tgz#ff6dec749eec5a94605c04d5f63fc55607a03a16"
+  integrity sha1-/23sdJ7sWpRgXATV9j/FVgegOhY=
+
 pbkdf2@^3.0.3:
   version "3.0.17"
   resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.17.tgz#976c206530617b14ebb32114239f7b09336e93a6"
@@ -8587,7 +8216,7 @@ performance-now@^2.1.0:
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
   integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
 
-picomatch@^2.0.5, picomatch@^2.2.1:
+picomatch@^2.0.4, picomatch@^2.0.5, picomatch@^2.2.1:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad"
   integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==
@@ -8633,13 +8262,6 @@ pkg-dir@^3.0.0:
   dependencies:
     find-up "^3.0.0"
 
-pkg-up@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-2.0.0.tgz#c819ac728059a461cab1c3889a2be3c49a004d7f"
-  integrity sha1-yBmscoBZpGHKscOImivjxJoATX8=
-  dependencies:
-    find-up "^2.1.0"
-
 plugin-error@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/plugin-error/-/plugin-error-1.0.1.tgz#77016bd8919d0ac377fdcdd0322328953ca5781c"
@@ -8664,15 +8286,6 @@ plur@^3.0.1:
   dependencies:
     irregular-plurals "^2.0.0"
 
-portfinder@^1.0.26:
-  version "1.0.26"
-  resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.26.tgz#475658d56ca30bed72ac7f1378ed350bd1b64e70"
-  integrity sha512-Xi7mKxJHHMI3rIUrnm/jjUgwhbYMkp/XKEcZX3aG4BrumLpq3nmoQMX+ClYnDZnZ/New7IatC1no5RX0zo1vXQ==
-  dependencies:
-    async "^2.6.2"
-    debug "^3.1.1"
-    mkdirp "^0.5.1"
-
 portscanner@2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/portscanner/-/portscanner-2.1.1.tgz#eabb409e4de24950f5a2a516d35ae769343fbb96"
@@ -9027,15 +8640,15 @@ postcss-modules-extract-imports@^2.0.0:
   dependencies:
     postcss "^7.0.5"
 
-postcss-modules-local-by-default@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.2.tgz#e8a6561be914aaf3c052876377524ca90dbb7915"
-  integrity sha512-jM/V8eqM4oJ/22j0gx4jrp63GSvDH6v86OqyTHHUvk4/k1vceipZsaymiZ5PvocqZOl5SFHiFJqjs3la0wnfIQ==
+postcss-modules-local-by-default@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.3.tgz#bb14e0cc78279d504dbdcbfd7e0ca28993ffbbb0"
+  integrity sha512-e3xDq+LotiGesympRlKNgaJ0PCzoUIdpH0dj47iWAui/kyTgh3CiAr1qP54uodmJhl6p9rN6BoNcdEDVJx9RDw==
   dependencies:
     icss-utils "^4.1.1"
-    postcss "^7.0.16"
+    postcss "^7.0.32"
     postcss-selector-parser "^6.0.2"
-    postcss-value-parser "^4.0.0"
+    postcss-value-parser "^4.1.0"
 
 postcss-modules-scope@^2.2.0:
   version "2.2.0"
@@ -9298,12 +8911,12 @@ postcss-sass@^0.4.4:
     gonzales-pe "^4.3.0"
     postcss "^7.0.21"
 
-postcss-scss@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-scss/-/postcss-scss-2.0.0.tgz#248b0a28af77ea7b32b1011aba0f738bda27dea1"
-  integrity sha512-um9zdGKaDZirMm+kZFKKVsnKPF7zF7qBAtIfTSnZXD1jZ0JNZIxdB6TxQOjCnlSzLRInVl2v3YdBh/M881C4ug==
+postcss-scss@^2.0.0, postcss-scss@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/postcss-scss/-/postcss-scss-2.1.1.tgz#ec3a75fa29a55e016b90bf3269026c53c1d2b383"
+  integrity sha512-jQmGnj0hSGLd9RscFw9LyuSVAa5Bl1/KBPqG1NQw9w8ND55nY4ZEsdlVuYJvLPpV+y0nwTV5v/4rHPzZRihQbA==
   dependencies:
-    postcss "^7.0.0"
+    postcss "^7.0.6"
 
 postcss-selector-matches@^4.0.0:
   version "4.0.0"
@@ -9402,7 +9015,7 @@ postcss-value-parser@^3.0.0, postcss-value-parser@^3.3.0:
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281"
   integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==
 
-postcss-value-parser@^4.0.0, postcss-value-parser@^4.0.2, postcss-value-parser@^4.0.3, postcss-value-parser@^4.1.0:
+postcss-value-parser@^4.0.2, postcss-value-parser@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz#443f6a20ced6481a2bda4fa8532a6e55d789a2cb"
   integrity sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==
@@ -9426,10 +9039,10 @@ postcss@^5.0.0, postcss@^5.0.18:
     source-map "^0.5.6"
     supports-color "^3.2.3"
 
-postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.13, postcss@^7.0.14, postcss@^7.0.16, postcss@^7.0.17, postcss@^7.0.2, postcss@^7.0.21, postcss@^7.0.26, postcss@^7.0.27, postcss@^7.0.30, postcss@^7.0.5, postcss@^7.0.6, postcss@^7.0.7:
-  version "7.0.30"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.30.tgz#cc9378beffe46a02cbc4506a0477d05fcea9a8e2"
-  integrity sha512-nu/0m+NtIzoubO+xdAlwZl/u5S5vi/y6BCsoL8D+8IxsD3XvBS8X4YEADNIVXKVuQvduiucnRv+vPIqj56EGMQ==
+postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.13, postcss@^7.0.14, postcss@^7.0.17, postcss@^7.0.2, postcss@^7.0.21, postcss@^7.0.26, postcss@^7.0.27, postcss@^7.0.31, postcss@^7.0.32, postcss@^7.0.5, postcss@^7.0.6, postcss@^7.0.7:
+  version "7.0.32"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.32.tgz#4310d6ee347053da3433db2be492883d62cec59d"
+  integrity sha512-03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw==
   dependencies:
     chalk "^2.4.2"
     source-map "^0.6.1"
@@ -9468,11 +9081,6 @@ pretty-hrtime@^1.0.0:
   resolved "https://registry.yarnpkg.com/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz#b7e3ea42435a4c9b2759d99e0f201eb195802ee1"
   integrity sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=
 
-private@^0.1.8:
-  version "0.1.8"
-  resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
-  integrity sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==
-
 process-nextick-args@^2.0.0, process-nextick-args@~2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
@@ -9498,14 +9106,6 @@ proto-list@~1.2.1:
   resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"
   integrity sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=
 
-proxy-addr@~2.0.5:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.6.tgz#fdc2336505447d3f2f2c638ed272caf614bbb2bf"
-  integrity sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw==
-  dependencies:
-    forwarded "~0.1.2"
-    ipaddr.js "1.9.1"
-
 prr@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
@@ -9583,11 +9183,6 @@ qs@6.2.3:
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.2.3.tgz#1cfcb25c10a9b2b483053ff39f5dfc9233908cfe"
   integrity sha1-HPyyXBCpsrSDBT/zn138kjOQjP4=
 
-qs@6.7.0:
-  version "6.7.0"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc"
-  integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==
-
 qs@~6.5.2:
   version "6.5.2"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
@@ -9602,10 +9197,10 @@ query-string@^5.0.1:
     object-assign "^4.1.0"
     strict-uri-encode "^1.0.0"
 
-query-string@^6.11.1:
-  version "6.12.1"
-  resolved "https://registry.yarnpkg.com/query-string/-/query-string-6.12.1.tgz#2ae4d272db4fba267141665374e49a1de09e8a7c"
-  integrity sha512-OHj+zzfRMyj3rmo/6G8a5Ifvw3AleL/EbcHMD27YA31Q+cO5lfmQxECkImuNVjcskLcvBRVHNAB3w6udMs1eAA==
+query-string@^6.13.1:
+  version "6.13.1"
+  resolved "https://registry.yarnpkg.com/query-string/-/query-string-6.13.1.tgz#d913ccfce3b4b3a713989fe6d39466d92e71ccad"
+  integrity sha512-RfoButmcK+yCta1+FuU8REvisx1oEzhMKwhLUNcepQTPGcNMp1sIqjnfCtfnvGSQZQEhaBHvccujtWoUV3TTbA==
   dependencies:
     decode-uri-component "^0.2.0"
     split-on-first "^1.0.0"
@@ -9621,11 +9216,6 @@ querystring@0.2.0:
   resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
   integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=
 
-querystringify@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.1.1.tgz#60e5a5fd64a7f8bfa4d2ab2ed6fdf4c85bad154e"
-  integrity sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA==
-
 quick-lru@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-1.1.0.tgz#4360b17c61136ad38078397ff11416e186dcfbb8"
@@ -9651,21 +9241,11 @@ randomfill@^1.0.3:
     randombytes "^2.0.5"
     safe-buffer "^5.1.0"
 
-range-parser@^1.2.1, range-parser@~1.2.0, range-parser@~1.2.1:
+range-parser@~1.2.0:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
   integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
 
-raw-body@2.4.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz#a1ce6fb9c9bc356ca52e89256ab59059e13d0332"
-  integrity sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==
-  dependencies:
-    bytes "3.1.0"
-    http-errors "1.7.2"
-    iconv-lite "0.4.24"
-    unpipe "1.0.0"
-
 raw-body@^2.3.2:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.1.tgz#30ac82f98bb5ae8c152e67149dac8d55153b168c"
@@ -9766,7 +9346,7 @@ read-pkg@^5.2.0:
     string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
-"readable-stream@2 || 3", readable-stream@^3.0.6, readable-stream@^3.1.1, readable-stream@^3.6.0:
+"readable-stream@2 || 3", readable-stream@3, readable-stream@^3.1.1, readable-stream@^3.6.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
   integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
@@ -9794,6 +9374,13 @@ readdirp@^2.2.1:
     micromatch "^3.1.10"
     readable-stream "^2.0.2"
 
+readdirp@~3.4.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.4.0.tgz#9fdccdf9e9155805449221ac645e8303ab5b9ada"
+  integrity sha512-0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==
+  dependencies:
+    picomatch "^2.2.1"
+
 rechoir@^0.6.2:
   version "0.6.2"
   resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
@@ -9833,9 +9420,9 @@ regenerate-unicode-properties@^8.2.0:
     regenerate "^1.4.0"
 
 regenerate@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11"
-  integrity sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.1.tgz#cad92ad8e6b591773485fbe05a485caf4f457e6f"
+  integrity sha512-j2+C8+NtXQgEKWk49MMP5P/u2GhnahTtVkRIHr5R5lVRlbKvmQ+oS+A5aLKWp2ma5VkT8sh6v+v4hbH0YHR66A==
 
 regenerator-runtime@^0.13.4:
   version "0.13.5"
@@ -9843,12 +9430,11 @@ regenerator-runtime@^0.13.4:
   integrity sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==
 
 regenerator-transform@^0.14.2:
-  version "0.14.4"
-  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.4.tgz#5266857896518d1616a78a0479337a30ea974cc7"
-  integrity sha512-EaJaKPBI9GvKpvUz2mz4fhx7WPgvwRLY9v3hlNHWmAuJHI13T4nwKnNvm5RWJzEdnI5g5UwtOww+S8IdoUC2bw==
+  version "0.14.5"
+  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.5.tgz#c98da154683671c9c4dcb16ece736517e1b7feb4"
+  integrity sha512-eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw==
   dependencies:
     "@babel/runtime" "^7.8.4"
-    private "^0.1.8"
 
 regex-not@^1.0.0, regex-not@^1.0.2:
   version "1.0.2"
@@ -9858,14 +9444,6 @@ regex-not@^1.0.0, regex-not@^1.0.2:
     extend-shallow "^3.0.2"
     safe-regex "^1.1.0"
 
-regexp.prototype.flags@^1.2.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz#7aba89b3c13a64509dabcf3ca8d9fbb9bdf5cb75"
-  integrity sha512-2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ==
-  dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.0-next.1"
-
 regexpp@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f"
@@ -9884,9 +9462,9 @@ regexpu-core@^4.7.0:
     unicode-match-property-value-ecmascript "^1.2.0"
 
 regjsgen@^0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.1.tgz#48f0bf1a5ea205196929c0d9798b42d1ed98443c"
-  integrity sha512-5qxzGZjDs9w4tzT3TPhCJqWdCc3RLYwy9J2NB0nm5Lz+S273lvWcpjaTGHsT1dc6Hhfq41uSEOw8wBmxrKOuyg==
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.2.tgz#92ff295fb1deecbf6ecdab2543d207e91aa33733"
+  integrity sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A==
 
 regjsparser@^0.6.4:
   version "0.6.4"
@@ -10116,7 +9694,7 @@ require-main-filename@^2.0.0:
   resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
   integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
 
-requires-port@1.x.x, requires-port@^1.0.0:
+requires-port@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
   integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=
@@ -10126,13 +9704,6 @@ resize-observer-polyfill@^1.5.1:
   resolved "https://registry.yarnpkg.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz#0e9020dd3d21024458d4ebd27e23e40269810464"
   integrity sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg==
 
-resolve-cwd@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a"
-  integrity sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=
-  dependencies:
-    resolve-from "^3.0.0"
-
 resolve-dir@^1.0.0, resolve-dir@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-1.0.1.tgz#79a40644c362be82f26effe739c9bb5382046f43"
@@ -10168,7 +9739,7 @@ resolve-url@^0.2.1:
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
   integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
 
-resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.3.2, resolve@^1.4.0:
+resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.13.1, resolve@^1.17.0, resolve@^1.3.2, resolve@^1.4.0:
   version "1.17.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz#b25941b54968231cc2d1bb76a79cb7f2c0bf8444"
   integrity sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==
@@ -10203,11 +9774,6 @@ ret@~0.1.10:
   resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
   integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==
 
-retry@^0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b"
-  integrity sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=
-
 reusify@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
@@ -10293,7 +9859,7 @@ safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
   integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
 
-safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@~5.2.0:
+safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@~5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz#b74daec49b1148f88c64b68d49b1e815c1f2f519"
   integrity sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==
@@ -10335,14 +9901,6 @@ sax@~1.2.4:
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
   integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
 
-schema-utils@^0.4.5:
-  version "0.4.7"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.7.tgz#ba74f597d2be2ea880131746ee17d0a093c68187"
-  integrity sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==
-  dependencies:
-    ajv "^6.1.0"
-    ajv-keywords "^3.1.0"
-
 schema-utils@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz#0b79a93204d7b600d4b2850d1f66c2a34951c770"
@@ -10352,12 +9910,13 @@ schema-utils@^1.0.0:
     ajv-errors "^1.0.0"
     ajv-keywords "^3.1.0"
 
-schema-utils@^2.6.5, schema-utils@^2.6.6:
-  version "2.6.6"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.6.6.tgz#299fe6bd4a3365dc23d99fd446caff8f1d6c330c"
-  integrity sha512-wHutF/WPSbIi9x6ctjGGk2Hvl0VOz5l3EKEuKbjPlB30mKZUzb9A5k9yEXRX3pwyqVLPvpfZZEllaFq/M718hA==
+schema-utils@^2.6.5, schema-utils@^2.6.6, schema-utils@^2.7.0:
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.0.tgz#17151f76d8eae67fbbf77960c33c676ad9f4efc7"
+  integrity sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==
   dependencies:
-    ajv "^6.12.0"
+    "@types/json-schema" "^7.0.4"
+    ajv "^6.12.2"
     ajv-keywords "^3.4.1"
 
 screenfull@^5.0.2:
@@ -10380,18 +9939,6 @@ seek-bzip@^1.0.5:
   dependencies:
     commander "~2.8.1"
 
-select-hose@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
-  integrity sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=
-
-selfsigned@^1.10.7:
-  version "1.10.7"
-  resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.7.tgz#da5819fd049d5574f28e88a9bcc6dbc6e6f3906b"
-  integrity sha512-8M3wBCzeWIJnQfl43IKwOmC4H/RAp50S8DF60znzjW5GVqTcSe2vWclt7hmYVPkKPlHWOu5EaWOMZ2Y6W8ZXTA==
-  dependencies:
-    node-forge "0.9.0"
-
 semver-greatest-satisfied-range@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/semver-greatest-satisfied-range/-/semver-greatest-satisfied-range-1.1.0.tgz#13e8c2658ab9691cb0cd71093240280d36f77a5b"
@@ -10421,6 +9968,11 @@ semver@7.0.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
   integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
 
+semver@7.3.2, semver@^7.3.2:
+  version "7.3.2"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938"
+  integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==
+
 semver@^6.0.0, semver@^6.1.2, semver@^6.3.0:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
@@ -10450,31 +10002,12 @@ send@0.16.2:
     range-parser "~1.2.0"
     statuses "~1.4.0"
 
-send@0.17.1:
-  version "0.17.1"
-  resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8"
-  integrity sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==
-  dependencies:
-    debug "2.6.9"
-    depd "~1.1.2"
-    destroy "~1.0.4"
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    etag "~1.8.1"
-    fresh "0.5.2"
-    http-errors "~1.7.2"
-    mime "1.6.0"
-    ms "2.1.1"
-    on-finished "~2.3.0"
-    range-parser "~1.2.1"
-    statuses "~1.5.0"
-
 serialize-javascript@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.2.tgz#ecec53b0e0317bdc95ef76ab7074b7384785fa61"
   integrity sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ==
 
-serve-index@1.9.1, serve-index@^1.9.1:
+serve-index@1.9.1:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239"
   integrity sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=
@@ -10497,16 +10030,6 @@ serve-static@1.13.2:
     parseurl "~1.3.2"
     send "0.16.2"
 
-serve-static@1.14.1:
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9"
-  integrity sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==
-  dependencies:
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    parseurl "~1.3.3"
-    send "0.17.1"
-
 server-destroy@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/server-destroy/-/server-destroy-1.0.1.tgz#f13bf928e42b9c3e79383e61cc3998b5d14e6cdd"
@@ -10517,6 +10040,11 @@ set-blocking@^2.0.0, set-blocking@~2.0.0:
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
   integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
 
+set-immediate-shim@~1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"
+  integrity sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=
+
 set-value@^2.0.0, set-value@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b"
@@ -10557,10 +10085,10 @@ sha.js@^2.4.0, sha.js@^2.4.8:
     inherits "^2.0.1"
     safe-buffer "^5.0.1"
 
-shaka-player@^2.5.11:
-  version "2.5.11"
-  resolved "https://registry.yarnpkg.com/shaka-player/-/shaka-player-2.5.11.tgz#af550a0ee3aadf7be4e64e1a4d615c8d728e0b0f"
-  integrity sha512-SiZd/vCUPeKXNPnfWcBdraskdUYLtm+DITWceCZvRP4eoxxQuRI0MekVJTGqu5d7B2yW9TdQh5ojyRAjbQPFGA==
+shaka-player@^2.5.13:
+  version "2.5.13"
+  resolved "https://registry.yarnpkg.com/shaka-player/-/shaka-player-2.5.13.tgz#f8c493b825c735fc86d619cba8b2eb2f2a382233"
+  integrity sha512-rEh7juGlTvvF10oD7+EukS12EysZXI2fiGvNLqO7GsBQ5R/sFwcTGEB8A6lWlHQXeGVbT+MxZWKMZwFE805G6A==
   dependencies:
     eme-encryption-scheme-polyfill "^2.0.1"
 
@@ -10717,27 +10245,6 @@ socket.io@2.1.1:
     socket.io-client "2.1.1"
     socket.io-parser "~3.2.0"
 
-sockjs-client@1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.4.0.tgz#c9f2568e19c8fd8173b4997ea3420e0bb306c7d5"
-  integrity sha512-5zaLyO8/nri5cua0VtOrFXBPK1jbL4+1cebT/mmKA1E1ZXOvJrII75bPu0l0k843G/+iAbhEqzyKr0w/eCCj7g==
-  dependencies:
-    debug "^3.2.5"
-    eventsource "^1.0.7"
-    faye-websocket "~0.11.1"
-    inherits "^2.0.3"
-    json3 "^3.3.2"
-    url-parse "^1.4.3"
-
-sockjs@0.3.20:
-  version "0.3.20"
-  resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.20.tgz#b26a283ec562ef8b2687b44033a4eeceac75d855"
-  integrity sha512-SpmVOVpdq0DJc0qArhF3E5xsxvaiqGNb73XfgBpK1y3UD5gs8DSo8aCTsuT5pX8rssdc2NDIzANwP9eCAiSdTA==
-  dependencies:
-    faye-websocket "^0.10.0"
-    uuid "^3.4.0"
-    websocket-driver "0.6.5"
-
 sort-keys-length@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/sort-keys-length/-/sort-keys-length-1.0.1.tgz#9cb6f4f4e9e48155a6aa0671edd336ff1479a188"
@@ -10816,9 +10323,9 @@ sparkles@^1.0.0:
   integrity sha512-dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw==
 
 spdx-correct@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.0.tgz#fb83e504445268f154b074e218c87c003cd31df4"
-  integrity sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9"
+  integrity sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==
   dependencies:
     spdx-expression-parse "^3.0.0"
     spdx-license-ids "^3.0.0"
@@ -10829,9 +10336,9 @@ spdx-exceptions@^2.1.0:
   integrity sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==
 
 spdx-expression-parse@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz#99e119b7a5da00e05491c9fa338b7904823b41d0"
-  integrity sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679"
+  integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==
   dependencies:
     spdx-exceptions "^2.1.0"
     spdx-license-ids "^3.0.0"
@@ -10841,29 +10348,6 @@ spdx-license-ids@^3.0.0:
   resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz#3694b5804567a458d3c8045842a6358632f62654"
   integrity sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==
 
-spdy-transport@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/spdy-transport/-/spdy-transport-3.0.0.tgz#00d4863a6400ad75df93361a1608605e5dcdcf31"
-  integrity sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==
-  dependencies:
-    debug "^4.1.0"
-    detect-node "^2.0.4"
-    hpack.js "^2.1.6"
-    obuf "^1.1.2"
-    readable-stream "^3.0.6"
-    wbuf "^1.7.3"
-
-spdy@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/spdy/-/spdy-4.0.2.tgz#b74f466203a3eda452c02492b91fb9e84a27677b"
-  integrity sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==
-  dependencies:
-    debug "^4.1.0"
-    handle-thing "^2.0.0"
-    http-deceiver "^1.2.7"
-    select-hose "^2.0.0"
-    spdy-transport "^3.0.0"
-
 specificity@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/specificity/-/specificity-0.4.1.tgz#aab5e645012db08ba182e151165738d00887b019"
@@ -10950,7 +10434,7 @@ static-extend@^0.1.1:
     define-property "^0.2.5"
     object-copy "^0.1.0"
 
-"statuses@>= 1.4.0 < 2", "statuses@>= 1.5.0 < 2", statuses@~1.5.0:
+"statuses@>= 1.4.0 < 2", "statuses@>= 1.5.0 < 2":
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
   integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=
@@ -11077,7 +10561,7 @@ string-width@^4.1.0, string-width@^4.2.0:
     is-fullwidth-code-point "^3.0.0"
     strip-ansi "^6.0.0"
 
-string.prototype.trimend@^1.0.0:
+string.prototype.trimend@^1.0.0, string.prototype.trimend@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz#85812a6b847ac002270f5808146064c995fb6913"
   integrity sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==
@@ -11103,7 +10587,7 @@ string.prototype.trimright@^2.1.1:
     es-abstract "^1.17.5"
     string.prototype.trimend "^1.0.0"
 
-string.prototype.trimstart@^1.0.0:
+string.prototype.trimstart@^1.0.0, string.prototype.trimstart@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz#14af6d9f34b053f7cfc89b72f8f2ee14b9039a54"
   integrity sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==
@@ -11303,35 +10787,35 @@ stylelint-order@^2.2.1:
     postcss "^7.0.2"
     postcss-sorting "^4.1.0"
 
-stylelint-order@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/stylelint-order/-/stylelint-order-4.0.0.tgz#2a945c2198caac3ff44687d7c8582c81d044b556"
-  integrity sha512-bXV0v+jfB0+JKsqIn3mLglg1Dj2QCYkFHNfL1c+rVMEmruZmW5LUqT/ARBERfBm8SFtCuXpEdatidw/3IkcoiA==
+stylelint-order@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/stylelint-order/-/stylelint-order-4.1.0.tgz#692d05b7d0c235ac66fcf5ea1d9e5f08a76747f6"
+  integrity sha512-sVTikaDvMqg2aJjh4r48jsdfmqLT+nqB1MOsaBnvM3OwLx4S+WXcsxsgk5w18h/OZoxZCxuyXMh61iBHcj9Qiw==
   dependencies:
     lodash "^4.17.15"
-    postcss "^7.0.26"
+    postcss "^7.0.31"
     postcss-sorting "^5.0.1"
 
-stylelint@^13.5.0:
-  version "13.5.0"
-  resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-13.5.0.tgz#9edbf90c8c02c47fd0c4818376e3799145f22cab"
-  integrity sha512-+Jy7ieKAWKTf2tmcAE7jgScxH39Urb87i0bjK/enScFaGWWaFn4kAPwepGOSk2b7CLUDVt/O6kwA0x0p/V7moQ==
+stylelint@^13.6.1:
+  version "13.6.1"
+  resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-13.6.1.tgz#cc1d76338116d55e8ff2be94c4a4386c1239b878"
+  integrity sha512-XyvKyNE7eyrqkuZ85Citd/Uv3ljGiuYHC6UiztTR6sWS9rza8j3UeQv/eGcQS9NZz/imiC4GKdk1EVL3wst5vw==
   dependencies:
     "@stylelint/postcss-css-in-js" "^0.37.1"
     "@stylelint/postcss-markdown" "^0.36.1"
-    autoprefixer "^9.7.6"
+    autoprefixer "^9.8.0"
     balanced-match "^1.0.0"
-    chalk "^4.0.0"
+    chalk "^4.1.0"
     cosmiconfig "^6.0.0"
     debug "^4.1.1"
     execall "^2.0.0"
     file-entry-cache "^5.0.1"
     get-stdin "^8.0.0"
     global-modules "^2.0.0"
-    globby "^11.0.0"
+    globby "^11.0.1"
     globjoin "^0.1.4"
     html-tags "^3.1.0"
-    ignore "^5.1.4"
+    ignore "^5.1.8"
     import-lazy "^4.0.0"
     imurmurhash "^0.1.4"
     known-css-properties "^0.19.0"
@@ -11342,7 +10826,7 @@ stylelint@^13.5.0:
     meow "^7.0.1"
     micromatch "^4.0.2"
     normalize-selector "^0.2.0"
-    postcss "^7.0.30"
+    postcss "^7.0.32"
     postcss-html "^0.36.0"
     postcss-less "^3.1.4"
     postcss-media-query-parser "^0.2.3"
@@ -11350,7 +10834,7 @@ stylelint@^13.5.0:
     postcss-resolve-nested-selector "^0.1.1"
     postcss-safe-parser "^4.0.2"
     postcss-sass "^0.4.4"
-    postcss-scss "^2.0.0"
+    postcss-scss "^2.1.1"
     postcss-selector-parser "^6.0.2"
     postcss-syntax "^0.36.2"
     postcss-value-parser "^4.1.0"
@@ -11363,7 +10847,7 @@ stylelint@^13.5.0:
     sugarss "^2.0.0"
     svg-tags "^1.0.0"
     table "^5.4.6"
-    v8-compile-cache "^2.1.0"
+    v8-compile-cache "^2.1.1"
     write-file-atomic "^3.0.3"
 
 stylelint@^9.1, stylelint@^9.10.1:
@@ -11426,13 +10910,6 @@ sugarss@^2.0.0:
   dependencies:
     postcss "^7.0.2"
 
-supports-color@6.1.0, supports-color@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3"
-  integrity sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==
-  dependencies:
-    has-flag "^3.0.0"
-
 supports-color@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
@@ -11452,6 +10929,13 @@ supports-color@^5.3.0, supports-color@^5.5.0:
   dependencies:
     has-flag "^3.0.0"
 
+supports-color@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3"
+  integrity sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==
+  dependencies:
+    has-flag "^3.0.0"
+
 supports-color@^7.1.0:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz#68e32591df73e25ad1c4b49108a2ec507962bfd1"
@@ -11491,10 +10975,10 @@ svgo@^1.0.0, svgo@^1.3.2:
     unquote "~1.1.1"
     util.promisify "~1.0.0"
 
-swiper@^5.4.1:
-  version "5.4.1"
-  resolved "https://registry.yarnpkg.com/swiper/-/swiper-5.4.1.tgz#6731e000e97f8b6560c11b141ebaf559063af565"
-  integrity sha512-l2EiWe7uOXB2EBMVLtJqn51FW22wF9e24WETT+S+tuFNvSDq1gadc/hyGGsAMqFGKJKIO6q6cqk7ToVaOI+onw==
+swiper@^5.4.5:
+  version "5.4.5"
+  resolved "https://registry.yarnpkg.com/swiper/-/swiper-5.4.5.tgz#a350f654bf68426dbb651793824925512d223c0f"
+  integrity sha512-7QjA0XpdOmiMoClfaZ2lYN6ICHcMm72LXiY+NF4fQLFidigameaofvpjEEiTQuw3xm5eksG5hzkaRsjQX57vtA==
   dependencies:
     dom7 "^2.1.5"
     ssr-window "^2.0.0"
@@ -11579,10 +11063,10 @@ terser-webpack-plugin@^1.4.3:
     webpack-sources "^1.4.0"
     worker-farm "^1.7.0"
 
-terser@^4.0.0, terser@^4.1.2, terser@^4.6.3:
-  version "4.6.13"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-4.6.13.tgz#e879a7364a5e0db52ba4891ecde007422c56a916"
-  integrity sha512-wMvqukYgVpQlymbnNbabVZbtM6PN63AzqexpwJL8tbh/mRT9LE5o+ruVduAGL7D6Fpjl+Q+06U5I9Ul82odAhw==
+terser@>=4, terser@^4.1.2, terser@^4.6.3:
+  version "4.8.0"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.0.tgz#63056343d7c70bb29f3af665865a46fe03a0df17"
+  integrity sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==
   dependencies:
     commander "^2.20.0"
     source-map "~0.6.1"
@@ -11631,16 +11115,18 @@ through2@^3.0.1:
   dependencies:
     readable-stream "2 || 3"
 
+through2@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/through2/-/through2-4.0.2.tgz#a7ce3ac2a7a8b0b966c80e7c49f0484c3b239764"
+  integrity sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw==
+  dependencies:
+    readable-stream "3"
+
 through@^2.3.6, through@^2.3.8, through@~2.3.4:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
   integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
 
-thunky@^1.0.2:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.1.0.tgz#5abaf714a9405db0504732bbccd2cedd9ef9537d"
-  integrity sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==
-
 time-stamp@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-1.1.0.tgz#764a5a11af50561921b133f3b44e618687e0f5c3"
@@ -11802,6 +11288,16 @@ trough@^1.0.0:
   dependencies:
     glob "^7.1.2"
 
+tsconfig-paths@^3.9.0:
+  version "3.9.0"
+  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz#098547a6c4448807e8fcb8eae081064ee9a3c90b"
+  integrity sha512-dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw==
+  dependencies:
+    "@types/json5" "^0.0.29"
+    json5 "^1.0.1"
+    minimist "^1.2.0"
+    strip-bom "^3.0.0"
+
 tslib@^1.10.0, tslib@^1.9.0:
   version "1.11.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.11.1.tgz#eb15d128827fbee2841549e171f45ed338ac7e35"
@@ -11851,14 +11347,6 @@ type-fest@^0.8.1:
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
   integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==
 
-type-is@~1.6.17, type-is@~1.6.18:
-  version "1.6.18"
-  resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
-  integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==
-  dependencies:
-    media-typer "0.3.0"
-    mime-types "~2.1.24"
-
 type@^1.0.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/type/-/type-1.2.0.tgz#848dd7698dafa3e54a6c479e759c4bc3f18847a0"
@@ -11881,18 +11369,10 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
-ua-parser-js@0.7.17:
-  version "0.7.17"
-  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.17.tgz#e9ec5f9498b9ec910e7ae3ac626a805c4d09ecac"
-  integrity sha512-uRdSdu1oA1rncCQL7sCj8vSyZkgtL7faaw9Tc9rZ3mGgraQ7+Pdx7w5mnOSF3gw9ZNG6oc+KXfkon3bKuROm0g==
-
-uglify-es@^3.3.9:
-  version "3.3.9"
-  resolved "https://registry.yarnpkg.com/uglify-es/-/uglify-es-3.3.9.tgz#0c1c4f0700bed8dbc124cdb304d2592ca203e677"
-  integrity sha512-r+MU0rfv4L/0eeW3xZrd16t4NZfK8Ld4SWVglYBb7ez5uXFWHuVRs6xCTrf1yirs9a4j4Y27nn7SRfO6v67XsQ==
-  dependencies:
-    commander "~2.13.0"
-    source-map "~0.6.1"
+ua-parser-js@^0.7.18:
+  version "0.7.21"
+  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.21.tgz#853cf9ce93f642f67174273cc34565ae6f308777"
+  integrity sha512-+O8/qh/Qj8CgC6eYBVBykMrNtp5Gebn4dlGD/kKXVkJNDwyrAwSIqwz8CDf+tsAIWVycKcku6gIXJ0qwx/ZXaQ==
 
 uglify-js@3.4.x:
   version "3.4.10"
@@ -12151,7 +11631,7 @@ unset-value@^1.0.0:
     has-value "^0.3.1"
     isobject "^3.0.0"
 
-upath@^1.1.0, upath@^1.1.1:
+upath@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894"
   integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==
@@ -12187,14 +11667,6 @@ url-parse-lax@^3.0.0:
   dependencies:
     prepend-http "^2.0.0"
 
-url-parse@^1.4.3:
-  version "1.4.7"
-  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.7.tgz#a8a83535e8c00a316e403a5db4ac1b9b853ae278"
-  integrity sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==
-  dependencies:
-    querystringify "^2.1.1"
-    requires-port "^1.0.0"
-
 url-to-options@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/url-to-options/-/url-to-options-1.0.1.tgz#1505a03a289a48cbd7a434efbaeec5055f5633a9"
@@ -12265,25 +11737,20 @@ utils-merge@1.0.1:
   resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
   integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=
 
-uuid@^3.0.1, uuid@^3.3.2, uuid@^3.4.0:
+uuid@^3.0.1, uuid@^3.3.2:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
   integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
 
-v8-compile-cache@2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.0.3.tgz#00f7494d2ae2b688cfe2899df6ed2c54bef91dbe"
-  integrity sha512-CNmdbwQMBjwr9Gsmohvm0pbL954tJrNzf6gWL3K+QMQf00PF7ERGrEiLgjuU3mKreLC2MeGhUsNV9ybTbLgd3w==
+v8-compile-cache@^2.0.3, v8-compile-cache@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.1.1.tgz#54bc3cdd43317bca91e35dcaf305b1a7237de745"
+  integrity sha512-8OQ9CL+VWyt3JStj7HX7/ciTL2V3Rl1Wf5OL+SNTm0yK1KvtReVulksyeRnCANHHuUxHlQig+JJDlUhBt1NQDQ==
 
-v8-compile-cache@^2.0.3, v8-compile-cache@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz#e14de37b31a6d194f5690d67efc4e7f6fc6ab30e"
-  integrity sha512-usZBT3PW+LOjM25wbqIlZwPeJV+3OSz3M1k1Ws8snlW39dZyYL9lOGC5FgPVHfk0jKmjiDV8Z0mIbVQPiwFs7g==
-
-v8flags@^3.0.1:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-3.1.3.tgz#fc9dc23521ca20c5433f81cc4eb9b3033bb105d8"
-  integrity sha512-amh9CCg3ZxkzQ48Mhcb8iX7xpAfYJgePHxWMQCBWECpOSqJUXgY26ncA61UTV0BkPqfhcy6mzwCIoP4ygxpW8w==
+v8flags@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-3.2.0.tgz#b243e3b4dfd731fa774e7492128109a0fe66d656"
+  integrity sha512-mH8etigqMfiGWdeXpaaqGfs6BndypxusHHcv2qSHyZkGEznCd/qAXCWWRzeowtL54147cktFOC4P5y+kl8d8Jg==
   dependencies:
     homedir-polyfill "^1.0.1"
 
@@ -12300,11 +11767,6 @@ value-or-function@^3.0.0:
   resolved "https://registry.yarnpkg.com/value-or-function/-/value-or-function-3.0.0.tgz#1c243a50b595c1be54a754bfece8563b9ff8d813"
   integrity sha1-HCQ6ULWVwb5Up1S/7OhWO5/42BM=
 
-vary@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
-  integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=
-
 vendors@^1.0.0:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.4.tgz#e2b800a53e7a29b93506c3cf41100d16c4c4ad8e"
@@ -12442,105 +11904,29 @@ vm-browserify@^1.0.1:
   resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0"
   integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==
 
-watchpack@^1.6.1:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.6.1.tgz#280da0a8718592174010c078c7585a74cd8cd0e2"
-  integrity sha512-+IF9hfUFOrYOOaKyfaI7h7dquUIOgyEMoQMLA7OP5FxegKA2+XdXThAZ9TU2kucfhDH7rfMHs1oPYziVGWRnZA==
+watchpack-chokidar2@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/watchpack-chokidar2/-/watchpack-chokidar2-2.0.0.tgz#9948a1866cbbd6cb824dea13a7ed691f6c8ddff0"
+  integrity sha512-9TyfOyN/zLUbA288wZ8IsMZ+6cbzvsNyEzSBp6e/zkifi6xxbl8SmQ/CxQq32k8NNqrdVEVUVSEf56L4rQ/ZxA==
   dependencies:
     chokidar "^2.1.8"
+
+watchpack@^1.7.4:
+  version "1.7.4"
+  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.7.4.tgz#6e9da53b3c80bb2d6508188f5b200410866cd30b"
+  integrity sha512-aWAgTW4MoSJzZPAicljkO1hsi1oKj/RRq/OJQh2PKI2UKL04c2Bs+MBOB+BBABHTXJpf9mCwHN7ANCvYsvY2sg==
+  dependencies:
     graceful-fs "^4.1.2"
     neo-async "^2.5.0"
-
-wbuf@^1.1.0, wbuf@^1.7.3:
-  version "1.7.3"
-  resolved "https://registry.yarnpkg.com/wbuf/-/wbuf-1.7.3.tgz#c1d8d149316d3ea852848895cb6a0bfe887b87df"
-  integrity sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==
-  dependencies:
-    minimalistic-assert "^1.0.0"
+  optionalDependencies:
+    chokidar "^3.4.1"
+    watchpack-chokidar2 "^2.0.0"
 
 webcomponents.js@^0.7.24:
   version "0.7.24"
   resolved "https://registry.yarnpkg.com/webcomponents.js/-/webcomponents.js-0.7.24.tgz#2116fbfa1468ec416a7befdaa333e1d118f69c04"
   integrity sha1-IRb7+hRo7EFqe+/aozPh0Rj2nAQ=
 
-webpack-cli@^3.3.10:
-  version "3.3.11"
-  resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.3.11.tgz#3bf21889bf597b5d82c38f215135a411edfdc631"
-  integrity sha512-dXlfuml7xvAFwYUPsrtQAA9e4DOe58gnzSxhgrO/ZM/gyXTBowrsYeubyN4mqGhYdpXMFNyQ6emjJS9M7OBd4g==
-  dependencies:
-    chalk "2.4.2"
-    cross-spawn "6.0.5"
-    enhanced-resolve "4.1.0"
-    findup-sync "3.0.0"
-    global-modules "2.0.0"
-    import-local "2.0.0"
-    interpret "1.2.0"
-    loader-utils "1.2.3"
-    supports-color "6.1.0"
-    v8-compile-cache "2.0.3"
-    yargs "13.2.4"
-
-webpack-concat-plugin@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/webpack-concat-plugin/-/webpack-concat-plugin-3.0.0.tgz#db34ae230794b634061bc2944053ed407619f138"
-  integrity sha512-DLdDbZXyrFR99wyAVC9P06HLjr2XujBmQdSbnQMK2o01H9U2NHsN5W76jeTVeXDq5OLvZf8r/se65ftRo3Prow==
-  dependencies:
-    concat-with-sourcemaps "^1.0.5"
-    globby "^8.0.1"
-    schema-utils "^0.4.5"
-    uglify-es "^3.3.9"
-    upath "^1.1.0"
-
-webpack-dev-middleware@^3.7.2:
-  version "3.7.2"
-  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.7.2.tgz#0019c3db716e3fa5cecbf64f2ab88a74bab331f3"
-  integrity sha512-1xC42LxbYoqLNAhV6YzTYacicgMZQTqRd27Sim9wn5hJrX3I5nxYy1SxSd4+gjUFsz1dQFj+yEe6zEVmSkeJjw==
-  dependencies:
-    memory-fs "^0.4.1"
-    mime "^2.4.4"
-    mkdirp "^0.5.1"
-    range-parser "^1.2.1"
-    webpack-log "^2.0.0"
-
-webpack-dev-server@^3.11.0:
-  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.11.0.tgz#8f154a3bce1bcfd1cc618ef4e703278855e7ff8c"
-  integrity sha512-PUxZ+oSTxogFQgkTtFndEtJIPNmml7ExwufBZ9L2/Xyyd5PnOL5UreWe5ZT7IU25DSdykL9p1MLQzmLh2ljSeg==
-  dependencies:
-    ansi-html "0.0.7"
-    bonjour "^3.5.0"
-    chokidar "^2.1.8"
-    compression "^1.7.4"
-    connect-history-api-fallback "^1.6.0"
-    debug "^4.1.1"
-    del "^4.1.1"
-    express "^4.17.1"
-    html-entities "^1.3.1"
-    http-proxy-middleware "0.19.1"
-    import-local "^2.0.0"
-    internal-ip "^4.3.0"
-    ip "^1.1.5"
-    is-absolute-url "^3.0.3"
-    killable "^1.0.1"
-    loglevel "^1.6.8"
-    opn "^5.5.0"
-    p-retry "^3.0.1"
-    portfinder "^1.0.26"
-    schema-utils "^1.0.0"
-    selfsigned "^1.10.7"
-    semver "^6.3.0"
-    serve-index "^1.9.1"
-    sockjs "0.3.20"
-    sockjs-client "1.4.0"
-    spdy "^4.0.2"
-    strip-ansi "^3.0.1"
-    supports-color "^6.1.0"
-    url "^0.11.0"
-    webpack-dev-middleware "^3.7.2"
-    webpack-log "^2.0.0"
-    ws "^6.2.1"
-    yargs "^13.3.2"
-
 webpack-log@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/webpack-log/-/webpack-log-2.0.0.tgz#5b7928e0637593f119d32f6227c1e0ac31e1b47f"
@@ -12579,10 +11965,10 @@ webpack-stream@^5.2.1:
     vinyl "^2.1.0"
     webpack "^4.26.1"
 
-webpack@^4.26.1, webpack@^4.41.5:
-  version "4.43.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.43.0.tgz#c48547b11d563224c561dad1172c8aa0b8a678e6"
-  integrity sha512-GW1LjnPipFW2Y78OOab8NJlCflB7EFskMih2AHdvjbpKMeDJqEgSx24cXXXiPS65+WSwVyxtDsJH6jGX2czy+g==
+webpack@^4.26.1, webpack@^4.44.0:
+  version "4.44.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.44.0.tgz#3b08f88a89470175f036f4a9496b8a0428668802"
+  integrity sha512-wAuJxK123sqAw31SpkPiPW3iKHgFUiKvO7E7UZjtdExcsRe3fgav4mvoMM7vvpjLHVoJ6a0Mtp2fzkoA13e0Zw==
   dependencies:
     "@webassemblyjs/ast" "1.9.0"
     "@webassemblyjs/helper-module-context" "1.9.0"
@@ -12592,7 +11978,7 @@ webpack@^4.26.1, webpack@^4.41.5:
     ajv "^6.10.2"
     ajv-keywords "^3.4.1"
     chrome-trace-event "^1.0.2"
-    enhanced-resolve "^4.1.0"
+    enhanced-resolve "^4.3.0"
     eslint-scope "^4.0.3"
     json-parse-better-errors "^1.0.2"
     loader-runner "^2.4.0"
@@ -12605,39 +11991,18 @@ webpack@^4.26.1, webpack@^4.41.5:
     schema-utils "^1.0.0"
     tapable "^1.1.3"
     terser-webpack-plugin "^1.4.3"
-    watchpack "^1.6.1"
+    watchpack "^1.7.4"
     webpack-sources "^1.4.1"
 
-websocket-driver@0.6.5:
-  version "0.6.5"
-  resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.6.5.tgz#5cb2556ceb85f4373c6d8238aa691c8454e13a36"
-  integrity sha1-XLJVbOuF9Dc8bYI4qmkchFThOjY=
-  dependencies:
-    websocket-extensions ">=0.1.1"
-
-websocket-driver@>=0.5.1:
-  version "0.7.3"
-  resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.3.tgz#a2d4e0d4f4f116f1e6297eba58b05d430100e9f9"
-  integrity sha512-bpxWlvbbB459Mlipc5GBzzZwhoZgGEZLuqPaR0INBGnPAY1vdBX6hPnoFXiw+3yWxDuHyQjO2oXTMyS8A5haFg==
-  dependencies:
-    http-parser-js ">=0.4.0 <0.4.11"
-    safe-buffer ">=5.1.0"
-    websocket-extensions ">=0.1.1"
-
-websocket-extensions@>=0.1.1:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.3.tgz#5d2ff22977003ec687a4b87073dfbbac146ccf29"
-  integrity sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==
-
 webworkify@^1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/webworkify/-/webworkify-1.5.0.tgz#734ad87a774de6ebdd546e1d3e027da5b8f4a42c"
   integrity sha512-AMcUeyXAhbACL8S2hqqdqOLqvJ8ylmIbNwUIqQujRSouf4+eUFaXbG6F1Rbu+srlJMmxQWsiU7mOJi0nMBfM1g==
 
-whatwg-fetch@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.0.0.tgz#fc804e458cc460009b1a2b966bc8817d2578aefb"
-  integrity sha512-9GSJUgz1D4MfyKU7KRqwOjXCXTqWdFNvEr7eUBYchQiVc744mqK/MzXPNR2WsPkmkOa4ywfg8C2n8h+13Bey1Q==
+whatwg-fetch@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.2.0.tgz#8e134f701f0a4ab5fda82626f113e2b647fd16dc"
+  integrity sha512-SdGPoQMMnzVYThUbSrEvqTlkvC1Ux27NehaJ/GUHBfNrh5Mjg+1/uRyFMwVnxO2MrikMWvWAqUGgQOfVU4hT7w==
 
 which-module@^1.0.0:
   version "1.0.0"
@@ -12663,11 +12028,6 @@ wide-align@^1.1.0:
   dependencies:
     string-width "^1.0.2 || 2"
 
-window-size@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.2.0.tgz#b4315bb4214a3d7058ebeee892e13fa24d98b075"
-  integrity sha1-tDFbtCFKPXBY6+7okuE/ok2YsHU=
-
 word-wrap@~1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
@@ -12697,6 +12057,15 @@ wrap-ansi@^5.1.0:
     string-width "^3.0.0"
     strip-ansi "^5.0.0"
 
+wrap-ansi@^6.2.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53"
+  integrity sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
@@ -12724,13 +12093,6 @@ write@1.0.3:
   dependencies:
     mkdirp "^0.5.1"
 
-ws@^6.2.1:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.1.tgz#442fdf0a47ed64f59b6a5d8ff130f4748ed524fb"
-  integrity sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==
-  dependencies:
-    async-limiter "~1.0.0"
-
 ws@~3.3.1:
   version "3.3.3"
   resolved "https://registry.yarnpkg.com/ws/-/ws-3.3.3.tgz#f1cf84fe2d5e901ebce94efaece785f187a228f2"
@@ -12752,6 +12114,11 @@ x-is-string@^0.1.0:
   resolved "https://registry.yarnpkg.com/x-is-string/-/x-is-string-0.1.0.tgz#474b50865af3a49a9c4657f05acd145458f77d82"
   integrity sha1-R0tQhlrzpJqcRlfwWs0UVFj3fYI=
 
+xmldom@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.3.0.tgz#e625457f4300b5df9c2e1ecb776147ece47f3e5a"
+  integrity sha512-z9s6k3wxE+aZHgXYxSTpGDo7BYOUfJsIRyoZiX6HTjwpwfS2wpQBQKa2fD+ShLyPkqDYo5ud7KitmLZ2Cd6r0g==
+
 xmlhttprequest-ssl@~1.5.4:
   version "1.5.5"
   resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz#c2876b06168aadc40e57d97e81191ac8f4398b3e"
@@ -12796,7 +12163,7 @@ yargs-parser@^10.0.0:
   dependencies:
     camelcase "^4.1.0"
 
-yargs-parser@^13.1.0, yargs-parser@^13.1.2:
+yargs-parser@^13.1.1, yargs-parser@^13.1.2:
   version "13.1.2"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38"
   integrity sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==
@@ -12804,7 +12171,7 @@ yargs-parser@^13.1.0, yargs-parser@^13.1.2:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
-yargs-parser@^18.1.3:
+yargs-parser@^18.1.2, yargs-parser@^18.1.3:
   version "18.1.3"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0"
   integrity sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==
@@ -12812,13 +12179,6 @@ yargs-parser@^18.1.3:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
-yargs-parser@^4.1.0, yargs-parser@^4.2.0:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-4.2.1.tgz#29cceac0dc4f03c6c87b4a9f217dd18c9f74871c"
-  integrity sha1-KczqwNxPA8bIe0qfIX3RjJ90hxw=
-  dependencies:
-    camelcase "^3.0.0"
-
 yargs-parser@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-5.0.0.tgz#275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a"
@@ -12826,61 +12186,21 @@ yargs-parser@^5.0.0:
   dependencies:
     camelcase "^3.0.0"
 
-yargs@13.2.4:
-  version "13.2.4"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.2.4.tgz#0b562b794016eb9651b98bd37acf364aa5d6dc83"
-  integrity sha512-HG/DWAJa1PAnHT9JAhNa8AbAv3FPaiLzioSjCcmuXXhP8MlpHO5vwls4g4j6n30Z74GVQj8Xa62dWVx1QCGklg==
+yargs@13.3.0:
+  version "13.3.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.0.tgz#4c657a55e07e5f2cf947f8a366567c04a0dedc83"
+  integrity sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==
   dependencies:
     cliui "^5.0.0"
     find-up "^3.0.0"
     get-caller-file "^2.0.1"
-    os-locale "^3.1.0"
     require-directory "^2.1.1"
     require-main-filename "^2.0.0"
     set-blocking "^2.0.0"
     string-width "^3.0.0"
     which-module "^2.0.0"
     y18n "^4.0.0"
-    yargs-parser "^13.1.0"
-
-yargs@6.4.0:
-  version "6.4.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-6.4.0.tgz#816e1a866d5598ccf34e5596ddce22d92da490d4"
-  integrity sha1-gW4ahm1VmMzzTlWW3c4i2S2kkNQ=
-  dependencies:
-    camelcase "^3.0.0"
-    cliui "^3.2.0"
-    decamelize "^1.1.1"
-    get-caller-file "^1.0.1"
-    os-locale "^1.4.0"
-    read-pkg-up "^1.0.1"
-    require-directory "^2.1.1"
-    require-main-filename "^1.0.1"
-    set-blocking "^2.0.0"
-    string-width "^1.0.2"
-    which-module "^1.0.0"
-    window-size "^0.2.0"
-    y18n "^3.2.1"
-    yargs-parser "^4.1.0"
-
-yargs@6.6.0:
-  version "6.6.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-6.6.0.tgz#782ec21ef403345f830a808ca3d513af56065208"
-  integrity sha1-eC7CHvQDNF+DCoCMo9UTr1YGUgg=
-  dependencies:
-    camelcase "^3.0.0"
-    cliui "^3.2.0"
-    decamelize "^1.1.1"
-    get-caller-file "^1.0.1"
-    os-locale "^1.4.0"
-    read-pkg-up "^1.0.1"
-    require-directory "^2.1.1"
-    require-main-filename "^1.0.1"
-    set-blocking "^2.0.0"
-    string-width "^1.0.2"
-    which-module "^1.0.0"
-    y18n "^3.2.1"
-    yargs-parser "^4.2.0"
+    yargs-parser "^13.1.1"
 
 yargs@^13.3.2:
   version "13.3.2"
@@ -12898,6 +12218,23 @@ yargs@^13.3.2:
     y18n "^4.0.0"
     yargs-parser "^13.1.2"
 
+yargs@^15.4.1:
+  version "15.4.1"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8"
+  integrity sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==
+  dependencies:
+    cliui "^6.0.0"
+    decamelize "^1.2.0"
+    find-up "^4.1.0"
+    get-caller-file "^2.0.1"
+    require-directory "^2.1.1"
+    require-main-filename "^2.0.0"
+    set-blocking "^2.0.0"
+    string-width "^4.2.0"
+    which-module "^2.0.0"
+    y18n "^4.0.0"
+    yargs-parser "^18.1.2"
+
 yargs@^7.0.0, yargs@^7.1.0:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.0.tgz#6ba318eb16961727f5d284f8ea003e8d6154d0c8"